Merge pull request #71 from Nemo157/nixup

Upgrade nix dependency to v0.25

Author: pietroalbini

Cargo.toml

@@ -42,7 +42,7 @@ thiserror = "1.0.20"
 git2 = "0.14.0"
 
 [target.'cfg(unix)'.dependencies]
-nix = "0.20.0"
+nix = "0.25.0"
 
 [target.'cfg(windows)'.dependencies]
 windows-sys = {version = "0.36.1", features = ["Win32_Foundation", "Win32_System_Threading"]}

src/cmd/mod.rs

@@ -189,6 +189,7 @@ impl<'a, B: Runnable> Runnable for &'a B {
 ///
 /// [std]: https://doc.rust-lang.org/std/process/struct.Command.html
 #[must_use = "call `.run()` to run the command"]
+#[allow(clippy::type_complexity)]
 pub struct Command<'w, 'pl> {
     workspace: Option<&'w Workspace>,
     sandbox: Option<SandboxBuilder>,
@@ -383,7 +384,7 @@ impl<'w, 'pl> Command<'w, 'pl> {
             };
 
             builder = builder
-                .mount(&source_dir, &*container_dirs::WORK_DIR, MountKind::ReadOnly)
+                .mount(&source_dir, &container_dirs::WORK_DIR, MountKind::ReadOnly)
                 .env("SOURCE_DIR", container_dirs::WORK_DIR.to_str().unwrap())
                 .workdir(container_dirs::WORK_DIR.to_str().unwrap())
                 .cmd(cmd);
@@ -402,12 +403,12 @@ impl<'w, 'pl> Command<'w, 'pl> {
             builder = builder
                 .mount(
                     &workspace.cargo_home(),
-                    &*container_dirs::CARGO_HOME,
+                    &container_dirs::CARGO_HOME,
                     MountKind::ReadOnly,
                 )
                 .mount(
                     &workspace.rustup_home(),
-                    &*container_dirs::RUSTUP_HOME,
+                    &container_dirs::RUSTUP_HOME,
                     MountKind::ReadOnly,
                 )
                 .env("CARGO_HOME", container_dirs::CARGO_HOME.to_str().unwrap())
@@ -549,6 +550,7 @@ impl OutputKind {
     }
 }
 
+#[allow(clippy::type_complexity)]
 async fn log_command(
     mut cmd: AsyncCommand,
     mut process_lines: Option<&mut dyn FnMut(&str, &mut ProcessLinesActions)>,

src/cmd/sandbox.rs

@@ -281,7 +281,7 @@ impl SandboxBuilder {
         }
 
         let out = Command::new(workspace, "docker")
-            .args(&*args)
+            .args(&args)
             .run_capture()?;
         Ok(Container {
             id: out.stdout_lines()[0].clone(),
@@ -290,6 +290,7 @@ impl SandboxBuilder {
     }
 
     #[allow(clippy::too_many_arguments)]
+    #[allow(clippy::type_complexity)]
     pub(super) fn run(
         self,
         workspace: &Workspace,
@@ -365,6 +366,7 @@ impl Container<'_> {
         Ok(data.pop().unwrap())
     }
 
+    #[allow(clippy::type_complexity)]
     fn run(
         &self,
         timeout: Option<Duration>,

src/native/unix.rs

@@ -16,11 +16,7 @@ pub(crate) fn kill_process(id: u32) -> Result<(), KillFailedError> {
         Ok(()) => Ok(()),
         Err(err) => Err(KillFailedError {
             pid: id,
-            errno: if let nix::Error::Sys(errno) = err {
-                Some(errno)
-            } else {
-                None
-            },
+            errno: Some(err),
         }),
     }
 }

tests/buildtest/runner.rs

@@ -25,7 +25,7 @@ impl Runner {
         );
         Ok(Runner {
             crate_name: if std::env::var("RUSTWIDE_TEST_INSIDE_DOCKER").is_ok() {
-                format!("{}-inside-docker", crate_name.to_string())
+                format!("{}-inside-docker", crate_name)
             } else {
                 crate_name.to_string()
             },

tests/integration/purge_caches.rs

@@ -59,15 +59,14 @@ fn should_compare(base: &Path, path: &Path) -> bool {
     };
 
     let components = components.iter().map(|c| c.as_str()).collect::<Vec<_>>();
-    match components.as_slice() {
+    !matches!(
+        components.as_slice(),
         // The indexes could be updated during the build. The index is not considered a cache
         // though, so it's fine to ignore it during the comparison.
-        ["cargo-home", "registry", "index", _, ".git", ..] => false,
-        ["cargo-home", "registry", "index", _, ".cargo-index-lock"] => false,
-        ["cargo-home", "registry", "index", _, ".last-updated"] => false,
-
-        _ => true,
-    }
+        ["cargo-home", "registry", "index", _, ".git", ..]
+            | ["cargo-home", "registry", "index", _, ".cargo-index-lock"]
+            | ["cargo-home", "registry", "index", _, ".last-updated"]
+    )
 }
 
 #[derive(Debug, PartialEq, Eq)]