Mark ClientToolchains::put_toolchain as synchronous

Xanewok · Xanewok · commit 77828ad56c67 · 2021-03-25T03:22:38.000+01:00
It seems entirely synchronous, as it doesn't hit any await points and
additionally seems to be trigger-happy with mutex locks in inner calls,
so better be safe and prevent the future reader from thinking that this
function is async-safe.
diff --git a/src/dist/cache.rs b/src/dist/cache.rs
@@ -176,7 +176,7 @@ mod client {
             Ok(Some(file))
         }
         // If the toolchain doesn't already exist, create it and insert into the cache
-        pub async fn put_toolchain(
+        pub fn put_toolchain(
             &self,
             compiler_path: PathBuf,
             weak_key: String,
@@ -323,7 +323,7 @@ mod client {
                     "/my/compiler".into(),
                     "weak_key".to_owned(),
                     PanicToolchainPackager::new(),
-                ).wait()
+                )
                 .unwrap();
             assert!(newpath.unwrap() == ("/my/compiler/in_archive".to_string(), ct1));
         }
@@ -368,23 +368,23 @@ mod client {
                     "/my/compiler".into(),
                     "weak_key".to_owned(),
                     PanicToolchainPackager::new(),
-                ).wait()
+                )
                 .unwrap();
             assert!(newpath.unwrap() == ("/my/compiler/in_archive".to_string(), ct1.clone()));
             let (_tc, newpath) = client_toolchains
                 .put_toolchain(
                     "/my/compiler2".into(),
                     "weak_key2".to_owned(),
                     PanicToolchainPackager::new(),
-                ).wait()
+                )
                 .unwrap();
             assert!(newpath.unwrap() == ("/my/compiler2/in_archive".to_string(), ct1.clone()));
             let (_tc, newpath) = client_toolchains
                 .put_toolchain(
                     "/my/compiler3".into(),
                     "weak_key2".to_owned(),
                     PanicToolchainPackager::new(),
-                ).wait()
+                )
                 .unwrap();
             assert!(newpath.unwrap() == ("/my/compiler/in_archive".to_string(), ct1));
         }
@@ -410,7 +410,7 @@ mod client {
                     "/my/compiler".into(),
                     "weak_key".to_owned(),
                     PanicToolchainPackager::new()
-                ).wait()
+                )
                 .is_err());
         }
 
diff --git a/src/dist/http.rs b/src/dist/http.rs
@@ -1346,7 +1346,7 @@ mod client {
             let pool = self.pool.clone();
 
             pool.spawn_with_handle(async move {
-                    tc_cache.put_toolchain(compiler_path, weak_key, toolchain_packager).await
+                    tc_cache.put_toolchain(compiler_path, weak_key, toolchain_packager)
                 })?
                 .await
         }

Original file line number	Diff line number	Diff line change
`@@ -1346,7 +1346,7 @@ mod client {`
`1346`	`1346`	`let pool = self.pool.clone();`
`1347`	`1347`
`1348`	`1348`	`pool.spawn_with_handle(async move {`
`1349`		`- tc_cache.put_toolchain(compiler_path, weak_key, toolchain_packager).await`
	`1349`	`+ tc_cache.put_toolchain(compiler_path, weak_key, toolchain_packager)`
`1350`	`1350`	`})?`
`1351`	`1351`	`.await`
`1352`	`1352`	`}`