Merge pull request #2760 from lann/tempdir-file

Replace tempdir with tempfile

Author: lann

Cargo.lock

@@ -18,7 +18,7 @@ spin-factors-test = { path = "../factors-test" }
 tokio = { version = "1", features = ["macros", "rt"] }
 spin-factor-key-value-spin = { path = "../factor-key-value-spin" }
 spin-factor-key-value-redis = { path = "../factor-key-value-redis" }
-tempdir = "0.3"
+tempfile = "3.12.0"
 
 
 [lints]

crates/factor-key-value/Cargo.toml

@@ -101,7 +101,7 @@ async fn custom_spin_key_value_works() -> anyhow::Result<()> {
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 1)]
 async fn custom_spin_key_value_works_with_absolute_path() -> anyhow::Result<()> {
-    let tmp_dir = tempdir::TempDir::new("example")?;
+    let tmp_dir = tempfile::TempDir::with_prefix("example")?;
     let db_path = tmp_dir.path().join("foo/custom.db");
     // Check that the db does not exist yet - it will exist by the end of the test
     assert!(!db_path.exists());
@@ -132,7 +132,7 @@ async fn custom_spin_key_value_works_with_absolute_path() -> anyhow::Result<()>
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 1)]
 async fn custom_spin_key_value_works_with_relative_path() -> anyhow::Result<()> {
-    let tmp_dir = tempdir::TempDir::new("example")?;
+    let tmp_dir = tempfile::TempDir::with_prefix("example")?;
     let db_path = tmp_dir.path().join("custom.db");
     // Check that the db does not exist yet - it will exist by the end of the test
     assert!(!db_path.exists());
@@ -176,7 +176,7 @@ async fn custom_redis_key_value_works() -> anyhow::Result<()> {
 
 #[tokio::test]
 async fn misconfigured_spin_key_value_fails() -> anyhow::Result<()> {
-    let tmp_dir = tempdir::TempDir::new("example")?;
+    let tmp_dir = tempfile::TempDir::with_prefix("example")?;
     let runtime_config = toml::toml! {
         [key_value_store.custom]
         type = "spin"
@@ -198,7 +198,7 @@ async fn misconfigured_spin_key_value_fails() -> anyhow::Result<()> {
 // TODO(rylev): consider removing this test as it is really only a consequence of
 // toml deserialization and not a feature of the key-value store.
 async fn multiple_custom_key_value_uses_second_store() -> anyhow::Result<()> {
-    let tmp_dir = tempdir::TempDir::new("example")?;
+    let tmp_dir = tempfile::TempDir::with_prefix("example")?;
     let db_path = tmp_dir.path().join("custom.db");
     // Check that the db does not exist yet - it will exist by the end of the test
     assert!(!db_path.exists());

crates/factor-key-value/tests/factor_test.rs

@@ -312,7 +312,7 @@ impl<T: Trigger> TriggerAppBuilder<T> {
         let use_gpu = true;
         let state_dir = match options.state_dir {
             // Make sure `--state-dir=""` unsets the state dir
-            Some(s) if s.trim().is_empty() => None,
+            Some("") => None,
             Some(s) => Some(PathBuf::from(s)),
             // Default to `.spin/` in the local app dir
             None => options.local_app_dir.map(|d| Path::new(d).join(".spin")),

crates/trigger/src/cli.rs

@@ -53,10 +53,7 @@ pub trait Trigger: Sized + Send {
     }
 
     /// Run this trigger.
-    fn run(
-        self,
-        trigger_app: TriggerApp<Self>,
-    ) -> impl Future<Output = anyhow::Result<()>> + Send;
+    fn run(self, trigger_app: TriggerApp<Self>) -> impl Future<Output = anyhow::Result<()>> + Send;
 
     /// Returns a list of host requirements supported by this trigger specifically.
     ///

crates/trigger/src/lib.rs

@@ -422,11 +422,7 @@ Caused by:
                     )
                 };
                 ensure_success("/hello", 200, "I'm a teapot")?;
-                ensure_success(
-                    "/hello/wildcards/should/be/handled",
-                    200,
-                    "I'm a teapot",
-                )?;
+                ensure_success("/hello/wildcards/should/be/handled", 200, "I'm a teapot")?;
                 ensure_success("/thisshouldfail", 404, "")?;
                 ensure_success("/hello/test-placement", 200, "text for test")?;
                 Ok(())