Simplify more

src/agent/onefuzz-task/Cargo.toml

@@ -68,6 +68,7 @@ azure_storage_blobs = { version = "0.12", default-features = false, features = [
 ] }
 
 flexi_logger = "0.25"
+cascade = "1.0.1"
 
 [dev-dependencies]
 pretty_assertions = "1.3"

src/agent/onefuzz-task/src/tasks/fuzz/libfuzzer/generic.rs

@@ -1,10 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-use std::path::PathBuf;
-
 use anyhow::Result;
 use async_trait::async_trait;
+use cascade::cascade;
 use onefuzz::libfuzzer::LibFuzzer;
 
 use crate::tasks::fuzz::libfuzzer::common;
@@ -50,7 +49,8 @@ impl common::LibFuzzerType for GenericLibFuzzer {
         // The .local file is an empty file that tells DLL resolution to consider the same directory,
         // even for system (or KnownDLL) files.
         // See: https://learn.microsoft.com/en-us/windows/win32/dlls/dynamic-link-library-redirection#how-to-redirect-dlls-for-unpackaged-apps
-        let dotlocal_file = add_dotlocal_extension(target_exe);
+        let dotlocal_file = cascade! {target_exe; ..push(".local");};
+
         if let Err(e) = tokio::fs::write(dotlocal_file, &[]).await {
             // ignore already-exists error, report anything else
             if e.kind() != std::io::ErrorKind::AlreadyExists {
@@ -64,35 +64,5 @@ impl common::LibFuzzerType for GenericLibFuzzer {
     }
 }
 
-fn add_dotlocal_extension(mut path: PathBuf) -> PathBuf {
-    path.push(".local");
-    path
-}
-
 pub type Config = common::Config<GenericLibFuzzer>;
 pub type LibFuzzerFuzzTask = common::LibFuzzerFuzzTask<GenericLibFuzzer>;
-
-#[cfg(test)]
-mod test {
-    use std::path::PathBuf;
-
-    use super::add_dotlocal_extension;
-
-    #[test]
-    fn dotlocal_with_extension() {
-        let path = PathBuf::from("executable.exe");
-        assert_eq!(
-            PathBuf::from("executable.exe.local"),
-            add_dotlocal_extension(path)
-        );
-    }
-
-    #[test]
-    fn dotlocal_without_extension() {
-        let path = PathBuf::from("executable");
-        assert_eq!(
-            PathBuf::from("executable.local"),
-            add_dotlocal_extension(path)
-        );
-    }
-}