Merge pull request #1971 from kinnison/kinnison/clippy_some_things

Kinnison/clippy some things

Author: kinnison

src/cli/common.rs

@@ -251,10 +251,11 @@ pub fn self_update_permitted(explicit: bool) -> Result<SelfUpdatePermission> {
                 }
             }
             Err(env::VarError::NotPresent) => {}
-            Err(e) => Err(format!(
-                "Could not interrogate SNAP environment variable: {}",
-                e
-            ))?,
+            Err(e) => {
+                return Err(
+                    format!("Could not interrogate SNAP environment variable: {}", e).into(),
+                )
+            }
         }
         let current_exe = env::current_exe()?;
         let current_exe_dir = current_exe.parent().expect("Rustup isn't in a directory‽");
@@ -271,7 +272,7 @@ pub fn self_update_permitted(explicit: bool) -> Result<SelfUpdatePermission> {
                         return Ok(SelfUpdatePermission::Skip);
                     }
                 }
-                _ => Err(e)?,
+                _ => return Err(e.into()),
             }
         }
         Ok(SelfUpdatePermission::Permit)

src/cli/rustup_mode.rs

@@ -864,8 +864,8 @@ fn show(cfg: &Cfg) -> Result<()> {
 fn show_active_toolchain(cfg: &Cfg) -> Result<()> {
     let cwd = utils::current_dir()?;
     if let Some((toolchain, reason)) = cfg.find_override_toolchain_or_default(&cwd)? {
-        if reason.is_some() {
-            println!("{} ({})", toolchain.name(), reason.unwrap());
+        if let Some(reason) = reason {
+            println!("{} ({})", toolchain.name(), reason);
         } else {
             println!("{} (default)", toolchain.name());
         }

src/config.rs

@@ -24,11 +24,9 @@ pub enum OverrideReason {
 impl Display for OverrideReason {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> std::result::Result<(), fmt::Error> {
         match self {
-            OverrideReason::Environment => write!(f, "environment override by RUSTUP_TOOLCHAIN"),
-            OverrideReason::OverrideDB(path) => {
-                write!(f, "directory override for '{}'", path.display())
-            }
-            OverrideReason::ToolchainFile(path) => write!(f, "overridden by '{}'", path.display()),
+            Self::Environment => write!(f, "environment override by RUSTUP_TOOLCHAIN"),
+            Self::OverrideDB(path) => write!(f, "directory override for '{}'", path.display()),
+            Self::ToolchainFile(path) => write!(f, "overridden by '{}'", path.display()),
         }
     }
 }

src/diskio/threaded.rs

@@ -20,7 +20,7 @@ enum Task {
 
 impl Default for Task {
     fn default() -> Self {
-        Task::Sentinel
+        Self::Sentinel
     }
 }
 
@@ -43,7 +43,7 @@ impl<'a> Threaded<'a> {
             .thread_stack_size(1_048_576)
             .build();
         let (tx, rx) = channel();
-        Threaded {
+        Self {
             n_files: Arc::new(AtomicUsize::new(0)),
             pool,
             notify_handler,
@@ -66,7 +66,7 @@ impl<'a> Threaded<'a> {
             .thread_stack_size(1_048_576)
             .build();
         let (tx, rx) = channel();
-        Threaded {
+        Self {
             n_files: Arc::new(AtomicUsize::new(0)),
             pool,
             notify_handler,

src/dist/manifest.rs

@@ -285,14 +285,14 @@ impl Package {
 impl PackageTargets {
     pub fn get<'a>(&'a self, target: &TargetTriple) -> Option<&'a TargetedPackage> {
         match self {
-            PackageTargets::Wildcard(tpkg) => Some(tpkg),
-            PackageTargets::Targeted(tpkgs) => tpkgs.get(target),
+            Self::Wildcard(tpkg) => Some(tpkg),
+            Self::Targeted(tpkgs) => tpkgs.get(target),
         }
     }
     pub fn get_mut<'a>(&'a mut self, target: &TargetTriple) -> Option<&'a mut TargetedPackage> {
         match self {
-            PackageTargets::Wildcard(tpkg) => Some(tpkg),
-            PackageTargets::Targeted(tpkgs) => tpkgs.get_mut(target),
+            Self::Wildcard(tpkg) => Some(tpkg),
+            Self::Targeted(tpkgs) => tpkgs.get_mut(target),
         }
     }
 }

src/utils/raw.rs

@@ -277,8 +277,8 @@ impl error::Error for CommandError {
 impl fmt::Display for CommandError {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
-            CommandError::Io(e) => write!(f, "Io: {}", e),
-            CommandError::Status(s) => write!(f, "Status: {}", s),
+            Self::Io(e) => write!(f, "Io: {}", e),
+            Self::Status(s) => write!(f, "Status: {}", s),
         }
     }
 }

src/utils/utils.rs

@@ -601,10 +601,13 @@ impl<'a> FileReaderWithProgress<'a> {
     pub fn new_file(path: &Path, notify_handler: &'a dyn Fn(Notification<'_>)) -> Result<Self> {
         let fh = match std::fs::File::open(path) {
             Ok(fh) => fh,
-            Err(_) => Err(ErrorKind::ReadingFile {
-                name: "downloaded",
-                path: path.to_path_buf(),
-            })?,
+            Err(_) => {
+                return Err(ErrorKind::ReadingFile {
+                    name: "downloaded",
+                    path: path.to_path_buf(),
+                }
+                .into())
+            }
         };
 
         // Inform the tracker of the file size