Merge #1130

1130: Fix clippy lints on latest nightly. r=Emilgardis a=Alexhuszagh Co-authored-by: Alex Huszagh <[email protected]>
cross-rs · Nov 13, 2022 · 5108b9f · 5108b9f
2 parents 13980dc + 0512e46
commit 5108b9f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/cross_toml.rs b/src/cross_toml.rs
@@ -251,7 +251,7 @@ impl CrossToml {
         }
 
         // Builds maps of objects
-        let mut self_map = to_map(&self)?;
+        let mut self_map = to_map(self)?;
         let other_map = to_map(other)?;
 
         merge_objects(&mut self_map, &other_map).ok_or_else(|| eyre::eyre!("could not merge"))?;

diff --git a/src/docker/remote.rs b/src/docker/remote.rs
@@ -112,7 +112,7 @@ impl<'a, 'b, 'c> ContainerDataVolume<'a, 'b, 'c> {
             let src_path = src.join(file);
             let dst_path = temppath.join(file);
             file::create_dir_all(dst_path.parent().expect("must have parent"))?;
-            fs::copy(&src_path, &dst_path)?;
+            fs::copy(src_path, &dst_path)?;
         }
         // if copying from a src directory to dst directory with docker, to
         // copy the contents from `src` into `dst`, `src` must end with `/.`
@@ -261,7 +261,7 @@ impl<'a, 'b, 'c> ContainerDataVolume<'a, 'b, 'c> {
         // SAFETY: safe, single-threaded execution.
         let tempdir = unsafe { temp::TempDir::new()? };
         let temppath = tempdir.path();
-        file::create_dir_all(&temppath.join(rustlib))?;
+        file::create_dir_all(temppath.join(rustlib))?;
         let mut had_symlinks = copy_dir(
             &dirs.get_sysroot().join("lib"),
             &temppath.join("lib"),
@@ -295,7 +295,7 @@ impl<'a, 'b, 'c> ContainerDataVolume<'a, 'b, 'c> {
         // SAFETY: safe, single-threaded execution.
         let tempdir = unsafe { temp::TempDir::new()? };
         let temppath = tempdir.path();
-        file::create_dir_all(&temppath.join(rustlib))?;
+        file::create_dir_all(temppath.join(rustlib))?;
         let had_symlinks = copy_dir(
             &dirs.get_sysroot().join(rustlib),
             &temppath.join(rustlib),

diff --git a/src/docker/shared.rs b/src/docker/shared.rs
@@ -293,7 +293,7 @@ impl ToolchainDirectories {
         let default_nix_store = PathBuf::from("/nix/store");
         let nix_store = match nix_store {
             Some(store) if store.exists() => {
-                let path = file::canonicalize(&store)?;
+                let path = file::canonicalize(store)?;
                 Some(path)
             }
             Some(store) => {
@@ -819,7 +819,7 @@ fn create_target_dir(path: &Path) -> Result<()> {
         fs::OpenOptions::new()
             .write(true)
             .create_new(true)
-            .open(&path.join("CACHEDIR.TAG"))?
+            .open(path.join("CACHEDIR.TAG"))?
             .write_all(CACHEDIR_TAG.as_bytes())?;
     }
     Ok(())