make clippy happy

Author: Emilgardis

clippy.toml

@@ -1,5 +1,4 @@
 disallowed-methods = [
     { path = "std::path::Path::display", reason = "incorrect handling of non-Unicode paths, use path.to_utf8() or debug (`{path:?}`) instead" },
 ]
-# needs clippy 1.61
-# allow-unwrap-in-tests = true
+allow-unwrap-in-tests = true

src/docker/remote.rs

@@ -77,7 +77,10 @@ impl<'a, 'b, 'c> ContainerDataVolume<'a, 'b, 'c> {
             if msg_info.cross_debug
                 && src.is_dir()
                 && !src.to_string_lossy().ends_with("/.")
-                && rel == src.file_name().unwrap()
+                && rel
+                    == src
+                        .file_name()
+                        .expect("filename should be defined as we are a directory")
             {
                 msg_info.warn(format_args!(
                     "source is pointing to a directory instead of its contents: {} -> {}\nThis might be a bug. {}",

src/docker/shared.rs

@@ -612,7 +612,10 @@ impl ChildContainer {
         // relax the no-timeout and lack of output
         // ensure we have atomic ordering
         if self.exists() {
-            let info = self.info.as_mut().unwrap();
+            let info = self
+                .info
+                .as_mut()
+                .expect("since we're loaded and exist, child should not be terminated");
             if is_tty {
                 info.timeout = DEFAULT_TIMEOUT;
             }
@@ -635,7 +638,9 @@ impl ChildContainer {
     // be stopped again.
     pub fn terminate(&mut self) {
         if self.exists.swap(false, Ordering::SeqCst) {
-            let info = self.info.as_mut().unwrap();
+            let info = self.info.as_mut().expect(
+                "since we're loaded and exist, child should not have been terminated already",
+            );
             let mut msg_info = MessageInfo::new(info.color_choice, info.verbosity);
             let container = DockerContainer::new(&info.engine, &info.name);
             container.stop(info.timeout, &mut msg_info).ok();

src/file.rs

@@ -69,7 +69,7 @@ fn fmt_unc(server: &std::ffi::OsStr, volume: &std::ffi::OsStr) -> Result<String>
     if server == "localhost"
         && bytes.len() == 2
         && bytes[1] == b'$'
-        && matches!(bytes[0], b'A'..=b'Z' | b'a'..=b'z')
+        && bytes[0].is_ascii_alphabetic()
     {
         Ok(fmt_disk(bytes[0]))
     } else {
@@ -188,7 +188,7 @@ fn _canonicalize(path: &Path) -> Result<PathBuf> {
     #[cfg(target_os = "windows")]
     {
         // Docker does not support UNC paths, this will try to not use UNC paths
-        dunce::canonicalize(&path).map_err(Into::into)
+        dunce::canonicalize(path).map_err(Into::into)
     }
     #[cfg(not(target_os = "windows"))]
     {

src/lib.rs

@@ -24,7 +24,7 @@
     clippy::semicolon_if_nothing_returned,
     clippy::str_to_string,
     clippy::string_to_string,
-    // needs clippy 1.61 clippy::unwrap_used
+    clippy::unwrap_used
 )]
 
 #[cfg(test)]

src/rustup.rs

@@ -99,7 +99,7 @@ cross will not attempt to configure the toolchain further so that it can run you
         }
         return Err(cmd
             .status_result(msg_info, output.status, Some(&output))
-            .unwrap_err()
+            .expect_err("we know the command failed")
             .to_section_report());
     }
     let out = output.stdout()?;

src/shell.rs

@@ -70,9 +70,10 @@ macro_rules! status {
 }
 
 /// the requested verbosity of output.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
 pub enum Verbosity {
     Quiet,
+    #[default]
     Normal,
     Verbose(u8),
 }
@@ -105,12 +106,6 @@ impl Verbosity {
     }
 }
 
-impl Default for Verbosity {
-    fn default() -> Verbosity {
-        Verbosity::Normal
-    }
-}
-
 /// Whether messages should use color output
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum ColorChoice {