Merge pull request #2744 from hi-rustin/rustin-patch-clippy

Make clippy happy

Author: rbtcollins

src/bin/rustup-init.rs

@@ -94,12 +94,7 @@ fn run_rustup_inner() -> Result<utils::ExitCode> {
             }
         }
         Some(n) => {
-            if TOOLS
-                .iter()
-                .chain(DUP_TOOLS.iter())
-                .find(|&&name| name == n)
-                .is_some()
-            {
+            if TOOLS.iter().chain(DUP_TOOLS.iter()).any(|&name| name == n) {
                 proxy_mode::main()
             } else {
                 Err(anyhow!(format!(

src/cli/common.rs

@@ -164,12 +164,12 @@ pub fn set_globals(verbose: bool, quiet: bool) -> Result<Cfg> {
         ..Default::default()
     });
 
-    Ok(Cfg::from_env(Arc::new(move |n: Notification<'_>| {
+    Cfg::from_env(Arc::new(move |n: Notification<'_>| {
         if download_tracker.borrow_mut().handle_notification(&n) {
             return;
         }
         console_notifier.borrow_mut().handle(n);
-    }))?)
+    }))
 }
 
 pub fn show_channel_update(cfg: &Cfg, name: &str, updated: Result<UpdateStatus>) -> Result<()> {

src/cli/proxy_mode.rs

@@ -60,5 +60,5 @@ fn direct_proxy(
         None => cfg.create_command_for_dir(&utils::current_dir()?, arg0)?,
         Some(tc) => cfg.create_command_for_toolchain(tc, false, arg0)?,
     };
-    Ok(run_command_for_dir(cmd, arg0, args)?)
+    run_command_for_dir(cmd, arg0, args)
 }

src/cli/rustup_mode.rs

@@ -863,7 +863,7 @@ fn default_(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<utils::ExitCode> {
     } else {
         let default_toolchain: Result<String> = cfg
             .get_default()?
-            .ok_or(anyhow!("no default toolchain configured"));
+            .ok_or_else(|| anyhow!("no default toolchain configured"));
         writeln!(process().stdout(), "{} (default)", default_toolchain?)?;
     }
 
@@ -1116,7 +1116,7 @@ fn show(cfg: &Cfg) -> Result<utils::ExitCode> {
         }
         let default_name: Result<String> = cfg
             .get_default()?
-            .ok_or(anyhow!("no default toolchain configured"));
+            .ok_or_else(|| anyhow!("no default toolchain configured"));
         let default_name = default_name?;
         for it in installed_toolchains {
             if default_name == it {

src/config.rs

@@ -25,13 +25,13 @@ use crate::toolchain::{DistributableToolchain, Toolchain, UpdateStatus};
 use crate::utils::utils;
 
 #[derive(Debug, ThisError)]
-enum ConfigError {
+enum OverrideFileConfigError {
     #[error("empty toolchain override file detected. Please remove it, or else specify the desired toolchain properties in the file")]
-    EmptyOverrideFile,
+    Empty,
     #[error("missing toolchain properties in toolchain override file")]
-    InvalidOverrideFile,
+    Invalid,
     #[error("error parsing override file")]
-    ParsingOverrideFile,
+    Parsing,
 }
 
 #[derive(Debug, Default, Deserialize, PartialEq, Eq)]
@@ -677,22 +677,22 @@ impl Cfg {
         let contents = contents.as_ref();
 
         match (contents.lines().count(), parse_mode) {
-            (0, _) => Err(anyhow!(ConfigError::EmptyOverrideFile)),
+            (0, _) => Err(anyhow!(OverrideFileConfigError::Empty)),
             (1, ParseMode::Both) => {
                 let channel = contents.trim();
 
                 if channel.is_empty() {
-                    Err(anyhow!(ConfigError::EmptyOverrideFile))
+                    Err(anyhow!(OverrideFileConfigError::Empty))
                 } else {
                     Ok(channel.into())
                 }
             }
             _ => {
                 let override_file = toml::from_str::<OverrideFile>(contents)
-                    .context(ConfigError::ParsingOverrideFile)?;
+                    .context(OverrideFileConfigError::Parsing)?;
 
                 if override_file.is_empty() {
-                    Err(anyhow!(ConfigError::InvalidOverrideFile))
+                    Err(anyhow!(OverrideFileConfigError::Invalid))
                 } else {
                     Ok(override_file)
                 }
@@ -1162,8 +1162,8 @@ components = [ "rustfmt" ]
 
         let result = Cfg::parse_override_file(contents, ParseMode::Both);
         assert!(matches!(
-            result.unwrap_err().downcast::<ConfigError>(),
-            Ok(ConfigError::InvalidOverrideFile)
+            result.unwrap_err().downcast::<OverrideFileConfigError>(),
+            Ok(OverrideFileConfigError::Invalid)
         ));
     }
 
@@ -1173,8 +1173,8 @@ components = [ "rustfmt" ]
 
         let result = Cfg::parse_override_file(contents, ParseMode::Both);
         assert!(matches!(
-            result.unwrap_err().downcast::<ConfigError>(),
-            Ok(ConfigError::EmptyOverrideFile)
+            result.unwrap_err().downcast::<OverrideFileConfigError>(),
+            Ok(OverrideFileConfigError::Empty)
         ));
     }
 
@@ -1184,8 +1184,8 @@ components = [ "rustfmt" ]
 
         let result = Cfg::parse_override_file(contents, ParseMode::Both);
         assert!(matches!(
-            result.unwrap_err().downcast::<ConfigError>(),
-            Ok(ConfigError::EmptyOverrideFile)
+            result.unwrap_err().downcast::<OverrideFileConfigError>(),
+            Ok(OverrideFileConfigError::Empty)
         ));
     }
 
@@ -1197,8 +1197,8 @@ channel = nightly
 
         let result = Cfg::parse_override_file(contents, ParseMode::Both);
         assert!(matches!(
-            result.unwrap_err().downcast::<ConfigError>(),
-            Ok(ConfigError::ParsingOverrideFile)
+            result.unwrap_err().downcast::<OverrideFileConfigError>(),
+            Ok(OverrideFileConfigError::Parsing)
         ));
     }
 }

src/diskio/test.rs

@@ -59,7 +59,7 @@ fn test_incremental_file(io_threads: &str) -> Result<()> {
                 break;
             }
         }
-        assert_eq!(true, file_finished);
+        assert!(file_finished);
         for _ in io_executor.join().collect::<Vec<_>>() {
             // no more work should be outstanding
             unreachable!();

src/dist/dist.rs

@@ -914,10 +914,11 @@ fn try_update_from_dist_<'a>(
     let mut download_not_exists = false;
     match &result {
         Ok(_) => (),
-        Err(e) => match e.downcast_ref::<RustupError>() {
-            Some(RustupError::DownloadNotExists { .. }) => download_not_exists = true,
-            _ => (),
-        },
+        Err(e) => {
+            if let Some(RustupError::DownloadNotExists { .. }) = e.downcast_ref::<RustupError>() {
+                download_not_exists = true
+            }
+        }
     }
     if download_not_exists {
         result.with_context(|| {
@@ -951,14 +952,9 @@ pub fn dl_v2_manifest<'a>(
             Ok(Some((manifest, manifest_hash)))
         }
         Err(any) => {
-            match any.downcast_ref::<RustupError>() {
-                Some(e) => {
-                    // Checksum failed - issue warning to try again later
-                    if let RustupError::ChecksumFailed { .. } = e {
-                        (download.notify_handler)(Notification::ManifestChecksumFailedHack);
-                    }
-                }
-                None => (),
+            if let Some(RustupError::ChecksumFailed { .. }) = any.downcast_ref::<RustupError>() {
+                // Checksum failed - issue warning to try again later
+                (download.notify_handler)(Notification::ManifestChecksumFailedHack);
             }
             Err(any)
         }

src/utils/utils.rs

@@ -112,16 +112,14 @@ pub fn filter_file<F: FnMut(&str) -> bool>(
     dest: &Path,
     filter: F,
 ) -> Result<usize> {
-    raw::filter_file(src, dest, filter)
-        .with_context(|| {
-            format!(
-                "could not copy {} file from '{}' to '{}'",
-                name,
-                src.display(),
-                dest.display()
-            )
-        })
-        .into()
+    raw::filter_file(src, dest, filter).with_context(|| {
+        format!(
+            "could not copy {} file from '{}' to '{}'",
+            name,
+            src.display(),
+            dest.display()
+        )
+    })
 }
 
 pub fn canonicalize_path<'a, N>(path: &'a Path, notify_handler: &dyn Fn(N)) -> PathBuf
@@ -366,7 +364,7 @@ where
 {
     notify_handler(Notification::RemovingDirectory(name, path).into());
     raw::remove_dir(path).with_context(|| RustupError::RemovingDirectory {
-        name: name,
+        name,
         path: PathBuf::from(path),
     })
 }

tests/dist.rs

@@ -478,7 +478,7 @@ fn make_manifest_url(dist_server: &Url, toolchain: &ToolchainDesc) -> Result<Url
         dist_server, toolchain.channel
     );
 
-    Ok(Url::parse(&url).map_err(|e| anyhow!(format!("{:?}", e)))?)
+    Url::parse(&url).map_err(|e| anyhow!(format!("{:?}", e)))
 }
 
 fn uninstall(

tests/dist_manifest.rs

@@ -26,7 +26,7 @@ fn parse_smoke_test() {
     let rust_target_pkg = rust_pkg
         .get_target(Some(&x86_64_unknown_linux_gnu))
         .unwrap();
-    assert_eq!(rust_target_pkg.available(), true);
+    assert!(rust_target_pkg.available());
     assert_eq!(rust_target_pkg.bins[0].1.url, "example.com");
     assert_eq!(rust_target_pkg.bins[0].1.hash, "...");