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

Make clippy happy

Author: kinnison

download/src/lib.rs

@@ -162,7 +162,7 @@ pub mod curl {
         EASY.with(|handle| {
             let mut handle = handle.borrow_mut();
 
-            handle.url(&url.to_string())?;
+            handle.url(url.as_ref())?;
             handle.follow_location(true)?;
 
             if resume_from > 0 {

src/cli/rustup_mode.rs

@@ -1671,7 +1671,7 @@ fn output_completion_script(shell: Shell, command: CompletionCommand) -> Result<
         }
         CompletionCommand::Cargo => {
             if let Shell::Zsh = shell {
-                writeln!(&mut term2::stdout(), "#compdef cargo")?;
+                writeln!(term2::stdout(), "#compdef cargo")?;
             }
 
             let script = match shell {
@@ -1687,7 +1687,7 @@ fn output_completion_script(shell: Shell, command: CompletionCommand) -> Result<
             };
 
             writeln!(
-                &mut term2::stdout(),
+                term2::stdout(),
                 "if command -v rustc >/dev/null 2>&1; then\n\
                     \tsource \"$(rustc --print sysroot)\"{}\n\
                  fi",

src/config.rs

@@ -203,7 +203,7 @@ impl PgpPublicKey {
             .with_policy(&p, None)?
             .primary_userid()
             .map(|u| u.userid().to_string())
-            .unwrap_or("<No User ID>".into());
+            .unwrap_or_else(|_| "<No User ID>".into());
         ret.push(format!("  {:?}/{} - {}", algo, keyid, uid0));
         ret.push(format!("  Fingerprint: {}", fpr));
         Ok(ret)

src/diskio/immediate.rs

@@ -204,7 +204,7 @@ impl IncrementalFileWriter {
     fn write(&mut self, chunk: Vec<u8>) -> std::result::Result<bool, io::Error> {
         let mut state = self.state.lock().unwrap();
         if let Some(ref mut state) = *state {
-            if let Some(ref mut file) = (&mut self.file).as_mut() {
+            if let Some(ref mut file) = self.file.as_mut() {
                 // Length 0 vector is used for clean EOF signalling.
                 if chunk.is_empty() {
                     trace_scoped!("close", "name:": self.path_display);

src/diskio/test.rs

@@ -50,7 +50,7 @@ fn test_incremental_file(io_threads: &str) -> Result<()> {
             for work in io_executor.completed().collect::<Vec<_>>() {
                 match work {
                     super::CompletedIo::Chunk(size) => written += size,
-                    super::CompletedIo::Item(item) => unreachable!(format!("{:?}", item)),
+                    super::CompletedIo::Item(item) => unreachable!("{:?}", item),
                 }
             }
             if written == 20 {
@@ -117,7 +117,7 @@ fn test_complete_file(io_threads: &str) -> Result<()> {
         for work in io_executor.execute(item).collect::<Vec<_>>() {
             // The file might complete immediately
             match work {
-                super::CompletedIo::Chunk(size) => unreachable!(format!("{:?}", size)),
+                super::CompletedIo::Chunk(size) => unreachable!("{:?}", size),
                 super::CompletedIo::Item(item) => {
                     check_item(item);
                     finished = true;
@@ -128,7 +128,7 @@ fn test_complete_file(io_threads: &str) -> Result<()> {
             loop {
                 for work in io_executor.completed().collect::<Vec<_>>() {
                     match work {
-                        super::CompletedIo::Chunk(size) => unreachable!(format!("{:?}", size)),
+                        super::CompletedIo::Chunk(size) => unreachable!("{:?}", size),
                         super::CompletedIo::Item(item) => {
                             check_item(item);
                             finished = true;

src/dist/dist.rs

@@ -88,7 +88,7 @@ fn components_missing_msg(cs: &[Component], manifest: &ManifestV2, toolchain: &s
 #[derive(Debug, ThisError)]
 enum DistError {
     #[error("{}", components_missing_msg(.0, .1, .2))]
-    ToolchainComponentsMissing(Vec<Component>, ManifestV2, String),
+    ToolchainComponentsMissing(Vec<Component>, Box<ManifestV2>, String),
     #[error("no release found for '{0}'")]
     MissingReleaseForToolchain(String),
 }
@@ -822,7 +822,7 @@ fn try_update_from_dist_<'a>(
             let rust_package = m.get_package("rust")?;
             let rust_target_package = rust_package.get_target(Some(&toolchain.target.clone()))?;
 
-            for component in components.iter().copied() {
+            for component in components {
                 let mut component =
                     Component::new(component.to_string(), Some(toolchain.target.clone()), false);
                 if let Some(renamed) = m.rename_component(&component) {
@@ -878,7 +878,7 @@ fn try_update_from_dist_<'a>(
                         toolchain,
                     }) => Err(anyhow!(DistError::ToolchainComponentsMissing(
                         components.to_owned(),
-                        manifest.to_owned(),
+                        Box::new(manifest.to_owned()),
                         toolchain.to_owned(),
                     ))),
                     Some(_) | None => Err(err),

src/dist/download.rs

@@ -52,7 +52,7 @@ impl<'a> DownloadCfg<'a> {
             let cached_result = file_hash(&target_file, self.notify_handler)?;
             if hash == cached_result {
                 (self.notify_handler)(Notification::FileAlreadyDownloaded);
-                (self.notify_handler)(Notification::ChecksumValid(&url.to_string()));
+                (self.notify_handler)(Notification::ChecksumValid(url.as_ref()));
                 return Ok(File { path: target_file });
             } else {
                 (self.notify_handler)(Notification::CachedFileChecksumFailed);
@@ -93,7 +93,7 @@ impl<'a> DownloadCfg<'a> {
         if hash != actual_hash {
             // Incorrect hash
             if partial_file_existed {
-                self.clean(&[hash.to_string() + &".partial".to_string()])?;
+                self.clean(&[hash.to_string() + ".partial"])?;
                 Err(anyhow!(RustupError::BrokenPartialFile))
             } else {
                 Err(RustupError::ChecksumFailed {
@@ -104,7 +104,7 @@ impl<'a> DownloadCfg<'a> {
                 .into())
             }
         } else {
-            (self.notify_handler)(Notification::ChecksumValid(&url.to_string()));
+            (self.notify_handler)(Notification::ChecksumValid(url.as_ref()));
 
             utils::rename_file(
                 "downloaded",

src/dist/signatures.rs

@@ -56,20 +56,13 @@ impl VerificationHelper for Helper<'_> {
         for layer in structure.into_iter() {
             match layer {
                 MessageLayer::SignatureGroup { results } => {
-                    for result in results {
-                        match result {
-                            Ok(GoodChecksum { ka, .. }) => {
-                                // A good signature!  Find the index
-                                // of the singer key and return
-                                // success.
-                                self.index = self.certs.iter().position(|c| c.cert() == ka.cert());
-                                assert!(self.index.is_some());
-                                return Ok(());
-                            }
-                            _ => {
-                                // We ignore any errors.
-                            }
-                        }
+                    // We ignore any errors for now.
+                    for GoodChecksum { ka, .. } in results.into_iter().flatten() {
+                        // A good signature!  Find the index
+                        // of the signer key and return
+                        // success.
+                        self.index = self.certs.iter().position(|c| c.cert() == ka.cert());
+                        assert!(self.index.is_some());
                     }
                 }
                 MessageLayer::Compression { .. } => {

src/utils/raw.rs

@@ -79,7 +79,7 @@ pub(crate) fn filter_file<F: FnMut(&str) -> bool>(
     for result in io::BufRead::lines(&mut reader) {
         let line = result?;
         if filter(&line) {
-            writeln!(&mut writer, "{}", &line)?;
+            writeln!(writer, "{}", &line)?;
         } else {
             removed += 1;
         }
@@ -97,7 +97,7 @@ pub fn append_file(dest: &Path, line: &str) -> io::Result<()> {
         .create(true)
         .open(dest)?;
 
-    writeln!(&mut dest_file, "{}", line)?;
+    writeln!(dest_file, "{}", line)?;
 
     dest_file.sync_data()?;
 

src/utils/utils.rs

@@ -536,7 +536,7 @@ pub(crate) fn format_path_for_display(path: &str) -> String {
     }
 }
 
-pub(crate) fn toolchain_sort<T: AsRef<str>>(v: &mut Vec<T>) {
+pub(crate) fn toolchain_sort<T: AsRef<str>>(v: &mut [T]) {
     use semver::{Identifier, Version};
 
     fn special_version(ord: u64, s: &str) -> Version {
@@ -557,7 +557,7 @@ pub(crate) fn toolchain_sort<T: AsRef<str>>(v: &mut Vec<T>) {
         } else if s.starts_with("nightly") {
             special_version(2, s)
         } else {
-            Version::parse(&s.replace("_", "-")).unwrap_or_else(|_| special_version(3, s))
+            Version::parse(&s.replace('_', "-")).unwrap_or_else(|_| special_version(3, s))
         }
     }