Merge pull request #2625 from kinnison/cleanups

kinnison · web-flow · commit 0722f876d613 · 2021-01-02T10:52:24.000Z
Cleanups
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -66,6 +66,7 @@ xz2 = "0.1.3"
 
 [dependencies.retry]
 default-features = false
+features = ["random"]
 version = "1"
 
 [dependencies.rs_tracing]
diff --git a/src/cli/rustup_mode.rs b/src/cli/rustup_mode.rs
@@ -97,8 +97,9 @@ pub fn main() -> Result<utils::ExitCode> {
             return Ok(utils::ExitCode(0));
         }
 
-        Err(e) => match &e {
-            clap::Error { kind, message, .. } => {
+        Err(e) => {
+            {
+                let clap::Error { kind, message, .. } = &e;
                 if [
                     InvalidSubcommand,
                     UnknownArgument,
@@ -109,9 +110,9 @@ pub fn main() -> Result<utils::ExitCode> {
                     writeln!(process().stdout().lock(), "{}", message)?;
                     return Ok(utils::ExitCode(1));
                 }
-                Err(e)
             }
-        },
+            Err(e)
+        }
     }?;
     let verbose = matches.is_present("verbose");
     let quiet = matches.is_present("quiet");
@@ -898,7 +899,7 @@ fn check_updates(cfg: &Cfg) -> Result<utils::ExitCode> {
     let available_version = get_available_rustup_version()?;
 
     let _ = t.attr(term2::Attr::Bold);
-    write!(t, "{} - ", "rustup")?;
+    write!(t, "rustup - ")?;
 
     if current_version != available_version {
         let _ = t.fg(term2::color::YELLOW);
@@ -935,21 +936,18 @@ fn update(cfg: &mut Cfg, m: &ArgMatches<'_>) -> Result<utils::ExitCode> {
 
             if toolchain_has_triple {
                 let host_arch = TargetTriple::from_host_or_build();
-                match ToolchainDesc::from_str(name) {
-                    Ok(toolchain_desc) => {
-                        let target_triple = toolchain_desc.target;
-                        if host_arch.ne(&target_triple) {
-                            warn!(
-                                "toolchain '{}' may not be able to run on this system.",
-                                name
-                            );
-                            warn!(
-                                "If you meant to build software to target that platform, perhaps try `rustup target add {}` instead?",
-                                target_triple.to_string()
-                            );
-                        }
+                if let Ok(toolchain_desc) = ToolchainDesc::from_str(name) {
+                    let target_triple = toolchain_desc.target;
+                    if host_arch.ne(&target_triple) {
+                        warn!(
+                            "toolchain '{}' may not be able to run on this system.",
+                            name
+                        );
+                        warn!(
+                            "If you meant to build software to target that platform, perhaps try `rustup target add {}` instead?",
+                            target_triple.to_string()
+                        );
                     }
-                    _ => (),
                 }
             }
 
diff --git a/src/dist/component/package.rs b/src/dist/component/package.rs
@@ -5,7 +5,6 @@
 use std::collections::{HashMap, HashSet};
 use std::fmt;
 use std::io::{self, ErrorKind as IOErrorKind, Read};
-use std::iter::FromIterator;
 use std::mem;
 use std::path::{Path, PathBuf};
 
@@ -273,7 +272,7 @@ fn trigger_children(
             .or_insert_with(|| unreachable!());
         result += pending.len();
         for pending_item in pending.into_iter() {
-            for mut item in Vec::from_iter(io_executor.execute(pending_item)) {
+            for mut item in io_executor.execute(pending_item).collect::<Vec<_>>() {
                 // TODO capture metrics
                 budget.reclaim(&item);
                 filter_result(&mut item).chain_err(|| ErrorKind::ExtractingPackage)?;
@@ -319,11 +318,11 @@ fn unpack_without_first_dir<'a, R: Read>(
         // drain completed results to keep memory pressure low and respond
         // rapidly to completed events even if we couldn't submit work (because
         // our unpacked item is pending dequeue)
-        for mut item in Vec::from_iter(io_executor.completed()) {
+        for mut item in io_executor.completed().collect::<Vec<_>>() {
             // TODO capture metrics
             budget.reclaim(&item);
             filter_result(&mut item).chain_err(|| ErrorKind::ExtractingPackage)?;
-            trigger_children(&mut *io_executor, &mut directories, &mut budget, item)?;
+            trigger_children(&*io_executor, &mut directories, &mut budget, item)?;
         }
 
         let mut entry = entry.chain_err(|| ErrorKind::ExtractingPackage)?;
@@ -369,7 +368,7 @@ fn unpack_without_first_dir<'a, R: Read>(
             io_executor: &dyn Executor,
             mut directories: &mut HashMap<PathBuf, DirStatus>,
         ) -> Result<()> {
-            for mut item in Vec::from_iter(io_executor.completed()) {
+            for mut item in io_executor.completed().collect::<Vec<_>>() {
                 // TODO capture metrics
                 budget.reclaim(&item);
                 filter_result(&mut item).chain_err(|| ErrorKind::ExtractingPackage)?;
@@ -457,22 +456,22 @@ fn unpack_without_first_dir<'a, R: Read>(
             }
         };
 
-        for mut item in Vec::from_iter(io_executor.execute(item)) {
+        for mut item in io_executor.execute(item).collect::<Vec<_>>() {
             // TODO capture metrics
             budget.reclaim(&item);
             filter_result(&mut item).chain_err(|| ErrorKind::ExtractingPackage)?;
-            trigger_children(&mut *io_executor, &mut directories, &mut budget, item)?;
+            trigger_children(&*io_executor, &mut directories, &mut budget, item)?;
         }
     }
 
     loop {
         let mut triggered = 0;
-        for mut item in Vec::from_iter(io_executor.join()) {
+        for mut item in io_executor.join().collect::<Vec<_>>() {
             // handle final IOs
             // TODO capture metrics
             budget.reclaim(&item);
             filter_result(&mut item).chain_err(|| ErrorKind::ExtractingPackage)?;
-            triggered += trigger_children(&mut *io_executor, &mut directories, &mut budget, item)?;
+            triggered += trigger_children(&*io_executor, &mut directories, &mut budget, item)?;
         }
         if triggered == 0 {
             // None of the IO submitted before the prior join triggered any new
diff --git a/src/dist/dist.rs b/src/dist/dist.rs
@@ -107,7 +107,7 @@ impl FromStr for ParsedToolchainDesc {
 
         let d = TOOLCHAIN_CHANNEL_RE.captures(desc).map(|c| {
             fn fn_map(s: &str) -> Option<String> {
-                if s == "" {
+                if s.is_empty() {
                     None
                 } else {
                     Some(s.to_owned())
@@ -858,7 +858,7 @@ pub fn dl_v2_manifest<'a>(
     }
 }
 
-fn dl_v1_manifest<'a>(download: DownloadCfg<'a>, toolchain: &ToolchainDesc) -> Result<Vec<String>> {
+fn dl_v1_manifest(download: DownloadCfg<'_>, toolchain: &ToolchainDesc) -> Result<Vec<String>> {
     let root_url = toolchain.package_dir(download.dist_root);
 
     if !["nightly", "beta", "stable"].contains(&&*toolchain.channel) {
diff --git a/src/dist/notifications.rs b/src/dist/notifications.rs
@@ -186,7 +186,7 @@ impl<'a> Display for Notification<'a> {
                         if component.target.as_ref() != Some(&toolchain.target) {
                             component.name(manifest)
                         } else {
-                            component.short_name(manifest).to_owned()
+                            component.short_name(manifest)
                         }
                     })
                     .collect::<Vec<_>>()
diff --git a/src/dist/triple.rs b/src/dist/triple.rs
@@ -77,7 +77,7 @@ impl PartialTargetTriple {
         }
         RE.captures(&name).map(|c| {
             fn fn_map(s: &str) -> Option<String> {
-                if s == "" {
+                if s.is_empty() {
                     None
                 } else {
                     Some(s.to_owned())
diff --git a/src/errors.rs b/src/errors.rs
@@ -423,9 +423,9 @@ fn component_unavailable_msg(cs: &[Component], manifest: &Manifest, toolchain: &
     let mut buf = vec![];
 
     if cs.len() == 1 {
-        let _ = write!(
+        let _ = writeln!(
             buf,
-            "component {} is unavailable for download for channel '{}'\n",
+            "component {} is unavailable for download for channel '{}'",
             &cs[0].description(manifest),
             toolchain,
         );
diff --git a/src/utils/units.rs b/src/utils/units.rs
@@ -83,11 +83,11 @@ mod tests {
 
         // Test Bytes
         assert_eq!(
-            format!("{}", Size::new(1 as usize, Unit::B, UnitMode::Norm)),
+            format!("{}", Size::new(1, Unit::B, UnitMode::Norm)),
             "  1 B"
         );
         assert_eq!(
-            format!("{}", Size::new(1024 as usize, Unit::B, UnitMode::Norm)),
+            format!("{}", Size::new(1024, Unit::B, UnitMode::Norm)),
             "  1.0 KiB"
         );
         assert_eq!(
@@ -101,11 +101,11 @@ mod tests {
 
         // Test Bytes at given rate
         assert_eq!(
-            format!("{}", Size::new(1 as usize, Unit::B, UnitMode::Rate)),
+            format!("{}", Size::new(1, Unit::B, UnitMode::Rate)),
             "  1 B/s"
         );
         assert_eq!(
-            format!("{}", Size::new(1024 as usize, Unit::B, UnitMode::Rate)),
+            format!("{}", Size::new(1024, Unit::B, UnitMode::Rate)),
             "  1.0 KiB/s"
         );
         assert_eq!(
@@ -119,11 +119,11 @@ mod tests {
 
         //Test I/O Operations
         assert_eq!(
-            format!("{}", Size::new(1 as usize, Unit::IO, UnitMode::Norm)),
+            format!("{}", Size::new(1, Unit::IO, UnitMode::Norm)),
             "  1 IO-ops"
         );
         assert_eq!(
-            format!("{}", Size::new(1000 as usize, Unit::IO, UnitMode::Norm)),
+            format!("{}", Size::new(1000, Unit::IO, UnitMode::Norm)),
             "  1.0 kilo-IO-ops"
         );
         assert_eq!(
@@ -137,11 +137,11 @@ mod tests {
 
         //Test I/O Operations at given rate
         assert_eq!(
-            format!("{}", Size::new(1 as usize, Unit::IO, UnitMode::Rate)),
+            format!("{}", Size::new(1, Unit::IO, UnitMode::Rate)),
             "  1 IOPS"
         );
         assert_eq!(
-            format!("{}", Size::new(1000 as usize, Unit::IO, UnitMode::Rate)),
+            format!("{}", Size::new(1000, Unit::IO, UnitMode::Rate)),
             "  1.0 kilo-IOPS"
         );
         assert_eq!(
diff --git a/tests/cli-paths.rs b/tests/cli-paths.rs
@@ -53,10 +53,7 @@ export PATH="$HOME/apple/bin"
             let mut rcs = files.iter();
             let env = rcs.next().unwrap();
             let envfile = fs::read_to_string(&env).unwrap();
-            let (_, envfile_export) = envfile.split_at(match envfile.find("export PATH") {
-                Some(idx) => idx,
-                None => 0,
-            });
+            let (_, envfile_export) = envfile.split_at(envfile.find("export PATH").unwrap_or(0));
             assert_eq!(&envfile_export[..DEFAULT_EXPORT.len()], DEFAULT_EXPORT);
 
             for rc in rcs {

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ impl FromStr for ParsedToolchainDesc {`
`107`	`107`
`108`	`108`	`let d = TOOLCHAIN_CHANNEL_RE.captures(desc).map(\|c\| {`
`109`	`109`	`fn fn_map(s: &str) -> Option<String> {`
`110`		`- if s == "" {`
	`110`	`+ if s.is_empty() {`
`111`	`111`	`None`
`112`	`112`	`} else {`
`113`	`113`	`Some(s.to_owned())`
`@@ -858,7 +858,7 @@ pub fn dl_v2_manifest<'a>(`
`858`	`858`	`}`
`859`	`859`	`}`
`860`	`860`
`861`		`-fn dl_v1_manifest<'a>(download: DownloadCfg<'a>, toolchain: &ToolchainDesc) -> Result<Vec<String>> {`
	`861`	`+fn dl_v1_manifest(download: DownloadCfg<'_>, toolchain: &ToolchainDesc) -> Result<Vec<String>> {`
`862`	`862`	`let root_url = toolchain.package_dir(download.dist_root);`
`863`	`863`
`864`	`864`	`if !["nightly", "beta", "stable"].contains(&&*toolchain.channel) {`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ impl<'a> Display for Notification<'a> {`
`186`	`186`	`if component.target.as_ref() != Some(&toolchain.target) {`
`187`	`187`	`component.name(manifest)`
`188`	`188`	`} else {`
`189`		`- component.short_name(manifest).to_owned()`
	`189`	`+ component.short_name(manifest)`
`190`	`190`	`}`
`191`	`191`	`})`
`192`	`192`	`.collect::<Vec<_>>()`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ impl PartialTargetTriple {`
`77`	`77`	`}`
`78`	`78`	`RE.captures(&name).map(\|c\| {`
`79`	`79`	`fn fn_map(s: &str) -> Option<String> {`
`80`		`- if s == "" {`
	`80`	`+ if s.is_empty() {`
`81`	`81`	`None`
`82`	`82`	`} else {`
`83`	`83`	`Some(s.to_owned())`