[meta] use camino-tempfile-ext in tests (#2337)

Author: sunshowers

Cargo.lock

@@ -23,6 +23,7 @@ bstr = { version = "1.12.0", default-features = false, features = ["std"] }
 bytes = "1.10.1"
 camino = "1.1.9"
 camino-tempfile = "1.1.1"
+camino-tempfile-ext = "0.3.0"
 cargo_metadata = "0.19.2"
 # We specify default-no-update here because if users just run:
 #

Cargo.toml

@@ -50,6 +50,7 @@ sha2.workspace = true
 whoami.workspace = true
 
 [dev-dependencies]
+camino-tempfile-ext.workspace = true
 cfg-if.workspace = true
 cp_r.workspace = true
 datatest-stable.workspace = true

integration-tests/Cargo.toml

@@ -3,16 +3,16 @@
 
 use crate::helpers::bind_insta_settings;
 use camino::Utf8Path;
-use camino_tempfile::Utf8TempDir;
+use camino_tempfile_ext::prelude::*;
 use integration_tests::nextest_cli::CargoNextestCli;
 use nextest_metadata::NextestExitCode;
 
 pub(crate) fn custom_invalid(path: &Utf8Path, contents: String) -> datatest_stable::Result<()> {
     let (_guard, insta_prefix) = bind_insta_settings(path, "snapshots/custom-invalid");
 
     let dir = Utf8TempDir::with_prefix("nextest-custom-target-")?;
-    let json_path = dir.path().join(path.file_name().unwrap());
-    std::fs::write(&json_path, contents)?;
+    let json_path = dir.child(path.file_name().unwrap());
+    json_path.write_str(&contents)?;
 
     let output = CargoNextestCli::for_test()
         .args([

integration-tests/tests/datatest/custom_target.rs

@@ -135,6 +135,7 @@ self_update = { workspace = true, optional = true, default-features = true }
 
 
 [dev-dependencies]
+camino-tempfile-ext.workspace = true
 color-eyre.workspace = true
 fixture-data.workspace = true
 indoc.workspace = true

nextest-runner/Cargo.toml

@@ -273,7 +273,7 @@ mod tests {
 
         let workspace_dir = tempdir().unwrap();
 
-        let graph = temp_workspace(workspace_dir.path(), config_contents);
+        let graph = temp_workspace(&workspace_dir, config_contents);
 
         let pcx = ParseContext::new(&graph);
 
@@ -423,9 +423,8 @@ mod tests {
         ; "invalid on-missing type")]
     fn parse_invalid(config_contents: &str, expected_message: &str) {
         let workspace_dir = tempdir().unwrap();
-        let workspace_path: &Utf8Path = workspace_dir.path();
 
-        let graph = temp_workspace(workspace_path, config_contents);
+        let graph = temp_workspace(&workspace_dir, config_contents);
 
         let pcx = ParseContext::new(&graph);
 

nextest-runner/src/config/archive.rs

@@ -1090,7 +1090,7 @@ mod tests {
 
         let workspace_dir = tempdir().unwrap();
 
-        let graph = temp_workspace(workspace_dir.path(), config_contents);
+        let graph = temp_workspace(&workspace_dir, config_contents);
         let workspace_root = graph.workspace().root();
         let tool_path = workspace_root.join(".config/tool.toml");
         std::fs::write(&tool_path, tool_config_contents).unwrap();

nextest-runner/src/config/config_impl.rs

@@ -176,7 +176,7 @@ mod tests {
     ) {
         let workspace_dir = tempdir().unwrap();
 
-        let graph = temp_workspace(workspace_dir.path(), config_contents);
+        let graph = temp_workspace(&workspace_dir, config_contents);
 
         let pcx = ParseContext::new(&graph);
 

nextest-runner/src/config/leak_timeout.rs

@@ -238,7 +238,7 @@ mod tests {
     )]
     fn parse_fail_fast(config_contents: &str, expected: MaxFail) {
         let workspace_dir = tempdir().unwrap();
-        let graph = temp_workspace(workspace_dir.path(), config_contents);
+        let graph = temp_workspace(&workspace_dir, config_contents);
 
         let pcx = ParseContext::new(&graph);
 
@@ -333,7 +333,7 @@ mod tests {
     )]
     fn invalid_fail_fast(config_contents: &str, error_str: &str) {
         let workspace_dir = tempdir().unwrap();
-        let graph = temp_workspace(workspace_dir.path(), config_contents);
+        let graph = temp_workspace(&workspace_dir, config_contents);
         let pcx = ParseContext::new(&graph);
 
         let error = NextestConfig::from_sources(

nextest-runner/src/config/max_fail.rs

@@ -886,7 +886,6 @@ impl<'de> Deserialize<'de> for PlatformStrings {
 mod tests {
     use super::*;
     use crate::config::{LeakTimeoutResult, NextestConfig, test_helpers::*};
-    use camino::Utf8Path;
     use camino_tempfile::tempdir;
     use indoc::indoc;
     use std::{num::NonZeroUsize, time::Duration};
@@ -942,7 +941,7 @@ mod tests {
 
         let workspace_dir = tempdir().unwrap();
 
-        let graph = temp_workspace(workspace_dir.path(), config_contents);
+        let graph = temp_workspace(&workspace_dir, config_contents);
         let package_id = graph.workspace().iter().next().unwrap().id();
 
         let pcx = ParseContext::new(&graph);
@@ -1219,9 +1218,8 @@ mod tests {
         expected_reports: &[MietteJsonReport],
     ) {
         let workspace_dir = tempdir().unwrap();
-        let workspace_path: &Utf8Path = workspace_dir.path();
 
-        let graph = temp_workspace(workspace_path, config_contents);
+        let graph = temp_workspace(&workspace_dir, config_contents);
         let pcx = ParseContext::new(&graph);
 
         let err = NextestConfig::from_sources(
@@ -1285,7 +1283,7 @@ mod tests {
 
         let workspace_dir = tempdir().unwrap();
 
-        let graph = temp_workspace(workspace_dir.path(), config_contents);
+        let graph = temp_workspace(&workspace_dir, config_contents);
         let package_id = graph.workspace().iter().next().unwrap().id();
         let pcx = ParseContext::new(&graph);