Merge pull request #6716 from dcampbell24/fix-clippy

Fix clippy warnings.
uutils · Sep 19, 2024 · 9846013 · 9846013
2 parents f75d688 + 55a3064
commit 9846013
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/uu/runcon/src/errors.rs b/src/uu/runcon/src/errors.rs
@@ -121,13 +121,13 @@ impl Display for RunconError {
 impl UError for Error {
     fn code(&self) -> i32 {
         match self {
-            Error::MissingCommand => error_exit_status::ANOTHER_ERROR,
-            Error::SELinuxNotEnabled => error_exit_status::ANOTHER_ERROR,
-            Error::NotUTF8(_) => error_exit_status::ANOTHER_ERROR,
-            Error::CommandLine(e) => e.exit_code(),
-            Error::SELinux { .. } => error_exit_status::ANOTHER_ERROR,
-            Error::Io { .. } => error_exit_status::ANOTHER_ERROR,
-            Error::Io1 { .. } => error_exit_status::ANOTHER_ERROR,
+            Self::MissingCommand => error_exit_status::ANOTHER_ERROR,
+            Self::SELinuxNotEnabled => error_exit_status::ANOTHER_ERROR,
+            Self::NotUTF8(_) => error_exit_status::ANOTHER_ERROR,
+            Self::CommandLine(e) => e.exit_code(),
+            Self::SELinux { .. } => error_exit_status::ANOTHER_ERROR,
+            Self::Io { .. } => error_exit_status::ANOTHER_ERROR,
+            Self::Io1 { .. } => error_exit_status::ANOTHER_ERROR,
         }
     }
 }
diff --git a/src/uu/runcon/src/runcon.rs b/src/uu/runcon/src/runcon.rs
@@ -42,7 +42,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
     let options = match parse_command_line(config, args) {
         Ok(r) => r,
         Err(r) => {
-            return Err(r.into());
+            return Err(r);
         }
     };
 

diff --git a/src/uucore/src/lib/features/proc_info.rs b/src/uucore/src/lib/features/proc_info.rs
@@ -370,7 +370,7 @@ mod tests {
     fn test_pid_entry() {
         let current_pid = current_pid();
 
-        let mut pid_entry = ProcessInformation::try_new(
+        let pid_entry = ProcessInformation::try_new(
             PathBuf::from_str(&format!("/proc/{}", current_pid)).unwrap(),
         )
         .unwrap();