Skip to content

Bump tempfile from 3.19.1 to 3.20.0 #9700

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
agadgil-progress merged 2 commits into from
Jun 12, 2025
Merged

Bump tempfile from 3.19.1 to 3.20.0 #9700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
533f705
Bump tempfile from 3.19.1 to 3.20.0
dependabot[bot] Jun 9, 2025
28b7ca1
Fixed deprecated `Tempdir::into_path` API
agadgil-progress Jun 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion components/common/src/templating.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ mod test {

#[tokio::test]
async fn render_package_install() {
let root = TempDir::new().expect("create temp dir").into_path();
let root = TempDir::new().expect("create temp dir").keep();
env::set_var(fs::FS_ROOT_ENVVAR, &root);
let pg_id = PackageIdent::new("testing", "test", Some("1.0.0"), Some("20170712000000"));

Expand Down
2 changes: 1 addition & 1 deletion components/common/src/templating/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1132,7 +1132,7 @@ mod test {

#[tokio::test]
async fn test_compile_recursive_config_dir() {
let root = TempDir::new().expect("create temp dir").into_path();
let root = TempDir::new().expect("create temp dir").keep();

// Setup a dummy package directory with a config file inside
// a directory structure
Expand Down
4 changes: 2 additions & 2 deletions components/core/src/package/install.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1285,7 +1285,7 @@ mod test {
ignored\n");

let mut expected = BTreeMap::new();
let fs_root_path = fs_root.into_path();
let fs_root_path = fs_root.keep();
expected.insert("FOO".to_string(), "bar".to_string());
expected.insert("JAVA_HOME".to_string(), "/my/java/home".to_string());
expected.insert(
Expand Down Expand Up @@ -1339,7 +1339,7 @@ mod test {
"PATH=/should/be/ignored\nJAVA_HOME=/my/java/home\nFOO=bar\n");

let mut expected = BTreeMap::new();
let fs_root_path = fs_root.into_path();
let fs_root_path = fs_root.keep();
let mut paths = vec![fs::fs_rooted_path(&pkg_prefix_for(&pkg_install).join("bin"),
&fs_root_path),
fs::fs_rooted_path(&pkg_prefix_for(&other_pkg_install).join("sbin"),
Expand Down
14 changes: 7 additions & 7 deletions components/hab/src/command/studio/enter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ mod tests {
#[test]
fn cache_ssl_cert_file_caches_file() -> std::io::Result<()> {
let cert_name = "ssl-test-cert.pem";
let cert_cache_dir = TempDir::new()?.into_path();
let cert_cache_dir = TempDir::new()?.keep();
let ssl_cert_dir = TempDir::new()?;
let ssl_cert_filepath = ssl_cert_dir.path().join(cert_name);
File::create(&ssl_cert_filepath)?;
Expand All @@ -375,7 +375,7 @@ mod tests {
fn cache_ssl_cert_file_replaces_already_cached() -> std::io::Result<()> {
let cert_name = "ssl-test-cert.pem";

let cert_cache_dir = TempDir::new()?.into_path();
let cert_cache_dir = TempDir::new()?.keep();
let cached_cert = cert_cache_dir.join(cert_name);
File::create(&cached_cert)?;

Expand All @@ -393,7 +393,7 @@ mod tests {
}
#[test]
fn cache_ssl_cert_file_invalid_file() -> std::io::Result<()> {
let cert_cache_dir = TempDir::new()?.into_path();
let cert_cache_dir = TempDir::new()?.keep();

let non_existant_file_name = "i_shouldnt_exist";
let non_existant_file = TempDir::new()?.path().join(non_existant_file_name);
Expand All @@ -405,8 +405,8 @@ mod tests {

#[test]
fn cache_ssl_cert_file_cert_file_is_dir() -> std::io::Result<()> {
let cert_cache_dir = TempDir::new()?.into_path();
let ssl_cert_dir = TempDir::new()?.into_path();
let cert_cache_dir = TempDir::new()?.keep();
let ssl_cert_dir = TempDir::new()?.keep();

assert!(cache_ssl_cert_file(ssl_cert_dir.to_str().unwrap(), &cert_cache_dir).is_err());

Expand All @@ -415,7 +415,7 @@ mod tests {

#[test]
fn cache_ssl_cert_file_cert_file_is_cached_file() -> std::io::Result<()> {
let cached_cert_dir = TempDir::new()?.into_path();
let cached_cert_dir = TempDir::new()?.keep();
let cached_cert = cached_cert_dir.join("ssl-cert-file.pem");
File::create(&cached_cert)?;

Expand All @@ -426,7 +426,7 @@ mod tests {

#[test]
fn cache_ssl_cert_file_is_empty_string() -> std::io::Result<()> {
let cached_cert_dir = TempDir::new()?.into_path();
let cached_cert_dir = TempDir::new()?.keep();

assert!(cache_ssl_cert_file("", &cached_cert_dir).is_err());

Expand Down
4 changes: 2 additions & 2 deletions components/sup/src/manager/file_watcher.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,9 +180,9 @@ mod tests {
fn _send_initial_event(with_relative_paths: bool) -> Result<()> {
let tempdir = tempdir()?;
let td_dir = if with_relative_paths {
fs::make_relative_to_tempdir(&tempdir.into_path())?.join("enclosing_dir")
fs::make_relative_to_tempdir(&tempdir.keep())?.join("enclosing_dir")
} else {
tempdir.into_path().join("enclosing_dir")
tempdir.keep().join("enclosing_dir")
};
let td_file = td_dir.join("empty.txt");

Expand Down
4 changes: 2 additions & 2 deletions components/sup/src/manager/service/hooks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -959,7 +959,7 @@ mod tests {
var.set(&script);

let service_group = service_group();
let tmp_root = rendered_hooks_path().into_path();
let tmp_root = rendered_hooks_path().keep();
let hooks_path = tmp_root.clone().join("hooks");
fs::create_dir_all(&hooks_path).unwrap();
fs::create_dir_all(svc_logs_path(service_group.service())).unwrap();
Expand Down Expand Up @@ -1005,7 +1005,7 @@ mod tests {
var.set(&script);

let service_group = service_group();
let tmp_root = rendered_hooks_path().into_path();
let tmp_root = rendered_hooks_path().keep();
let hooks_path = tmp_root.clone().join("hooks");
fs::create_dir_all(&hooks_path).unwrap();
fs::create_dir_all(svc_logs_path(service_group.service())).unwrap();
Expand Down