Make clippy happy

Author: 0xPoe

download/tests/read-proxy-env.rs

@@ -63,7 +63,7 @@ fn socks_proxy_request() {
         }
     });
 
-    let env_proxy = |url: &Url| for_url(&url).to_url();
+    let env_proxy = |url: &Url| for_url(url).to_url();
     let url = Url::parse("http://192.168.0.1/").unwrap();
 
     let client = Client::builder()

src/cli/common.rs

@@ -4,7 +4,7 @@ use std::fs;
 use std::io::{BufRead, ErrorKind, Write};
 use std::path::Path;
 use std::sync::Arc;
-use std::{cmp, env, iter};
+use std::{cmp, env};
 
 use anyhow::{anyhow, Context, Result};
 use git_testament::{git_testament, render_testament};
@@ -229,7 +229,7 @@ fn show_channel_updates(cfg: &Cfg, toolchains: Vec<(String, Result<UpdateStatus>
 
     for (name, banner, width, color, version, previous_version) in data {
         let padding = max_width - width;
-        let padding: String = iter::repeat(' ').take(padding).collect();
+        let padding: String = " ".repeat(padding);
         let _ = write!(t, "  {}", padding);
         let _ = t.attr(term2::Attr::Bold);
         if let Some(color) = color {
@@ -356,7 +356,7 @@ where
 
 pub fn list_targets(toolchain: &Toolchain<'_>) -> Result<utils::ExitCode> {
     let mut t = term2::stdout();
-    let distributable = DistributableToolchain::new_for_components(&toolchain)?;
+    let distributable = DistributableToolchain::new_for_components(toolchain)?;
     let components = distributable.list_components()?;
     for component in components {
         if component.component.short_name_in_manifest() == "rust-std" {
@@ -380,7 +380,7 @@ pub fn list_targets(toolchain: &Toolchain<'_>) -> Result<utils::ExitCode> {
 
 pub fn list_installed_targets(toolchain: &Toolchain<'_>) -> Result<utils::ExitCode> {
     let mut t = term2::stdout();
-    let distributable = DistributableToolchain::new_for_components(&toolchain)?;
+    let distributable = DistributableToolchain::new_for_components(toolchain)?;
     let components = distributable.list_components()?;
     for component in components {
         if component.component.short_name_in_manifest() == "rust-std" {
@@ -399,7 +399,7 @@ pub fn list_installed_targets(toolchain: &Toolchain<'_>) -> Result<utils::ExitCo
 
 pub fn list_components(toolchain: &Toolchain<'_>) -> Result<utils::ExitCode> {
     let mut t = term2::stdout();
-    let distributable = DistributableToolchain::new_for_components(&toolchain)?;
+    let distributable = DistributableToolchain::new_for_components(toolchain)?;
     let components = distributable.list_components()?;
     for component in components {
         let name = component.name;
@@ -417,7 +417,7 @@ pub fn list_components(toolchain: &Toolchain<'_>) -> Result<utils::ExitCode> {
 
 pub fn list_installed_components(toolchain: &Toolchain<'_>) -> Result<utils::ExitCode> {
     let mut t = term2::stdout();
-    let distributable = DistributableToolchain::new_for_components(&toolchain)?;
+    let distributable = DistributableToolchain::new_for_components(toolchain)?;
     let components = distributable.list_components()?;
     for component in components {
         if component.installed {

src/cli/proxy_mode.rs

@@ -35,7 +35,7 @@ pub fn main(arg0: &str) -> Result<ExitCode> {
 
         let cfg = set_globals(false, true)?;
         cfg.check_metadata_version()?;
-        direct_proxy(&cfg, &arg0, toolchain, &cmd_args)?
+        direct_proxy(&cfg, arg0, toolchain, &cmd_args)?
     };
 
     process::exit(c)

src/cli/rustup_mode.rs

@@ -1,6 +1,5 @@
 use std::fmt;
 use std::io::Write;
-use std::iter;
 use std::path::{Path, PathBuf};
 use std::process::Command;
 use std::str::FromStr;
@@ -892,7 +891,7 @@ fn check_updates(cfg: &Cfg) -> Result<utils::ExitCode> {
     for channel in channels {
         match channel {
             (ref name, Ok(ref toolchain)) => {
-                let distributable = DistributableToolchain::new(&toolchain)?;
+                let distributable = DistributableToolchain::new(toolchain)?;
                 let current_version = distributable.show_version()?;
                 let dist_version = distributable.show_dist_version()?;
                 let _ = t.attr(term2::Attr::Bold);
@@ -1200,7 +1199,7 @@ fn show(cfg: &Cfg) -> Result<utils::ExitCode> {
     {
         t.attr(term2::Attr::Bold)?;
         writeln!(t, "{}", s)?;
-        writeln!(t, "{}", iter::repeat("-").take(s.len()).collect::<String>())?;
+        writeln!(t, "{}", "-".repeat(s.len()))?;
         writeln!(t)?;
         t.reset()?;
         Ok(())
@@ -1465,7 +1464,7 @@ fn override_remove(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<utils::ExitCode> {
     for path in paths {
         if cfg
             .settings_file
-            .with_mut(|s| Ok(s.remove_override(&Path::new(&path), cfg.notify_handler.as_ref())))?
+            .with_mut(|s| Ok(s.remove_override(Path::new(&path), cfg.notify_handler.as_ref())))?
         {
             info!("override toolchain for '{}' removed", path);
         } else {
@@ -1582,7 +1581,7 @@ fn set_default_host_triple(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<utils::ExitC
 }
 
 fn set_profile(cfg: &mut Cfg, m: &ArgMatches<'_>) -> Result<utils::ExitCode> {
-    cfg.set_profile(&m.value_of("profile-name").unwrap())?;
+    cfg.set_profile(m.value_of("profile-name").unwrap())?;
     Ok(utils::ExitCode(0))
 }
 
@@ -1596,7 +1595,7 @@ fn set_auto_self_update(cfg: &mut Cfg, m: &ArgMatches<'_>) -> Result<utils::Exit
             .ok_or(CLIError::NoExeName)?;
         warn!("{} is built with the no-self-update feature: setting auto-self-update will not have any effect.",arg0);
     }
-    cfg.set_auto_self_update(&m.value_of("auto-self-update-mode").unwrap())?;
+    cfg.set_auto_self_update(m.value_of("auto-self-update-mode").unwrap())?;
     Ok(utils::ExitCode(0))
 }
 

src/cli/self_update.rs

@@ -549,7 +549,7 @@ fn do_pre_install_options_sanity_checks(opts: &InstallOpts<'_>) -> Result<()> {
         let toolchain_to_use = match &opts.default_toolchain {
             None => "stable",
             Some(s) if s == "none" => "stable",
-            Some(s) => &s,
+            Some(s) => s,
         };
         let partial_channel = dist::PartialToolchainDesc::from_str(toolchain_to_use)?;
         let resolved = partial_channel.resolve(&host_triple)?.to_string();
@@ -793,7 +793,7 @@ fn maybe_install_rust(
         let toolchain_str = toolchain.name().to_owned();
         toolchain.cfg().set_default(&toolchain_str)?;
         writeln!(process().stdout())?;
-        common::show_channel_update(&toolchain.cfg(), &toolchain_str, Ok(status))?;
+        common::show_channel_update(toolchain.cfg(), &toolchain_str, Ok(status))?;
     }
     Ok(())
 }

src/cli/self_update/unix.rs

@@ -58,7 +58,7 @@ pub fn do_remove_from_path() -> Result<()> {
 
         // Check more files for cleanup than normally are updated.
         for rc in sh.rcfiles().iter().filter(|rc| rc.is_file()) {
-            let file = utils::read_file("rcfile", &rc)?;
+            let file = utils::read_file("rcfile", rc)?;
             let file_bytes = file.into_bytes();
             // FIXME: This is whitespace sensitive where it should not be.
             if let Some(idx) = file_bytes
@@ -69,7 +69,7 @@ pub fn do_remove_from_path() -> Result<()> {
                 let mut new_bytes = file_bytes[..idx].to_vec();
                 new_bytes.extend(&file_bytes[idx + source_bytes.len()..]);
                 let new_file = String::from_utf8(new_bytes).unwrap();
-                utils::write_file("rcfile", &rc, &new_file)?;
+                utils::write_file("rcfile", rc, &new_file)?;
             }
         }
     }
@@ -91,7 +91,7 @@ pub fn do_add_to_path() -> Result<()> {
                 _ => &source_cmd,
             };
 
-            utils::append_file("rcfile", &rc, &cmd_to_write)
+            utils::append_file("rcfile", &rc, cmd_to_write)
                 .with_context(|| format!("could not amend shell profile: '{}'", rc.display()))?;
         }
     }

src/cli/topical_doc.rs

@@ -63,7 +63,7 @@ pub fn local_path(root: &Path, topic: &str) -> Result<PathBuf> {
     }
 
     let doc = DocData {
-        topic: &topic,
+        topic,
         subtopic,
         root,
     };
@@ -135,15 +135,15 @@ pub fn local_path(root: &Path, topic: &str) -> Result<PathBuf> {
             Some(f) => f,
             None => {
                 let parent = work_path.parent().unwrap();
-                search_path(&doc, &parent, &keywords_top)?
+                search_path(&doc, parent, &keywords_top)?
             }
         },
         _ => match index_html(&doc, &work_path) {
             Some(f) => f,
             None => {
                 // len > 2, guaranteed to have a parent, safe to unwrap
                 let parent = work_path.parent().unwrap();
-                search_path(&doc, &parent, &keywords_mod)?
+                search_path(&doc, parent, &keywords_mod)?
             }
         },
     };

src/config.rs

@@ -173,8 +173,8 @@ impl PgpPublicKey {
     pub fn key(&self) -> &SignedPublicKey {
         match self {
             Self::Builtin => &*BUILTIN_PGP_KEY,
-            Self::FromEnvironment(_, k) => &k,
-            Self::FromConfiguration(_, k) => &k,
+            Self::FromEnvironment(_, k) => k,
+            Self::FromConfiguration(_, k) => k,
         }
     }
 
@@ -678,7 +678,7 @@ impl Cfg {
                     if !all_toolchains.iter().any(|s| s == toolchain_name) {
                         // The given name is not resolvable as a toolchain, so
                         // instead check it's plausible for installation later
-                        dist::validate_channel_name(&toolchain_name)?;
+                        dist::validate_channel_name(toolchain_name)?;
                     }
                 }
 
@@ -992,7 +992,7 @@ impl Cfg {
             .with(|s| {
                 Ok(s.default_host_triple
                     .as_ref()
-                    .map(|s| dist::TargetTriple::new(&s)))
+                    .map(|s| dist::TargetTriple::new(s)))
             })?
             .unwrap_or_else(dist::TargetTriple::from_host_or_build))
     }

src/diskio/mod.rs

@@ -108,7 +108,7 @@ impl Deref for FileBuffer {
 
     fn deref(&self) -> &Self::Target {
         match self {
-            FileBuffer::Immediate(ref vec) => &vec,
+            FileBuffer::Immediate(ref vec) => vec,
             FileBuffer::Threaded(PoolReference::Owned(owned, _)) => owned,
             FileBuffer::Threaded(PoolReference::Mut(mutable, _)) => mutable,
         }

src/dist/component/transaction.rs

@@ -99,7 +99,7 @@ impl<'a> Transaction<'a> {
             &self.prefix,
             component,
             relpath,
-            &self.temp_cfg,
+            self.temp_cfg,
             self.notify_handler(),
         )?;
         self.change(item);
@@ -114,7 +114,7 @@ impl<'a> Transaction<'a> {
             &self.prefix,
             component,
             relpath,
-            &self.temp_cfg,
+            self.temp_cfg,
             self.notify_handler(),
         )?;
         self.change(item);
@@ -142,7 +142,7 @@ impl<'a> Transaction<'a> {
     /// This is used for arbitrarily manipulating a file.
     pub fn modify_file(&mut self, relpath: PathBuf) -> Result<()> {
         assert!(relpath.is_relative());
-        let item = ChangedItem::modify_file(&self.prefix, relpath, &self.temp_cfg)?;
+        let item = ChangedItem::modify_file(&self.prefix, relpath, self.temp_cfg)?;
         self.change(item);
         Ok(())
     }
@@ -217,7 +217,7 @@ impl<'a> ChangedItem<'a> {
             AddedFile(path) => utils::remove_file("component", &prefix.abs_path(path))?,
             AddedDir(path) => utils::remove_dir("component", &prefix.abs_path(path), notify)?,
             RemovedFile(path, tmp) | ModifiedFile(path, Some(tmp)) => {
-                utils::rename_file("component", &tmp, &prefix.abs_path(path), notify)?
+                utils::rename_file("component", tmp, &prefix.abs_path(path), notify)?
             }
             RemovedDir(path, tmp) => {
                 utils::rename_dir("component", &tmp.join("bk"), &prefix.abs_path(path), notify)?

src/dist/dist.rs

@@ -87,7 +87,7 @@ fn components_missing_msg(cs: &[Component], manifest: &ManifestV2, toolchain: &s
 
 #[derive(Debug, ThisError)]
 enum DistError {
-    #[error("{}", components_missing_msg(&.0, &.1, &.2))]
+    #[error("{}", components_missing_msg(.0, .1, .2))]
     ToolchainComponentsMissing(Vec<Component>, ManifestV2, String),
     #[error("no release found for '{0}'")]
     MissingReleaseForToolchain(String),
@@ -491,7 +491,7 @@ impl ToolchainDesc {
 
 // A little convenience for just parsing a channel name or archived channel name
 pub fn validate_channel_name(name: &str) -> Result<()> {
-    let toolchain = PartialToolchainDesc::from_str(&name)?;
+    let toolchain = PartialToolchainDesc::from_str(name)?;
     if toolchain.has_triple() {
         Err(anyhow!(format!("target triple in channel name '{}'", name)))
     } else {
@@ -949,9 +949,9 @@ fn try_update_from_dist_<'a>(
     let result = manifestation.update_v1(
         &manifest,
         update_hash,
-        &download.temp_cfg,
+        download.temp_cfg,
         &download.notify_handler,
-        &download.pgp_keys,
+        download.pgp_keys,
     );
     // inspect, determine what context to add, then process afterwards.
     let mut download_not_exists = false;

src/dist/download.rs

@@ -43,7 +43,7 @@ impl<'a> DownloadCfg<'a> {
     pub fn download(&self, url: &Url, hash: &str) -> Result<File> {
         utils::ensure_dir_exists(
             "Download Directory",
-            &self.download_dir,
+            self.download_dir,
             &self.notify_handler,
         )?;
         let target_file = self.download_dir.join(Path::new(hash));
@@ -74,7 +74,7 @@ impl<'a> DownloadCfg<'a> {
         let mut hasher = Sha256::new();
 
         if let Err(e) = utils::download_file_with_resume(
-            &url,
+            url,
             &partial_file_path,
             Some(&mut hasher),
             true,
@@ -158,14 +158,14 @@ impl<'a> DownloadCfg<'a> {
             .download_signature(url)
             .with_context(|| format!("failed to download signature file {}", url))?;
 
-        let file_path: &Path = &file;
+        let file_path: &Path = file;
         let content = std::fs::File::open(file_path).with_context(|| RustupError::ReadingFile {
             name: "channel data",
             path: PathBuf::from(file_path),
         })?;
 
         let sig_result =
-            crate::dist::signatures::verify_signature(content, &signature, &self.pgp_keys)?;
+            crate::dist::signatures::verify_signature(content, &signature, self.pgp_keys)?;
         if let Some(keyidx) = sig_result {
             let key = &self.pgp_keys[keyidx];
             Ok(key)
@@ -229,7 +229,7 @@ impl<'a> DownloadCfg<'a> {
 
         // No signatures for tarballs for now.
         if !url_str.ends_with(".tar.gz") && !url_str.ends_with(".tar.xz") {
-            match self.check_signature(&url_str, &file) {
+            match self.check_signature(url_str, &file) {
                 Ok(key) => (self.notify_handler)(Notification::SignatureValid(url_str, key)),
                 Err(_) => (self.notify_handler)(Notification::SignatureInvalid(url_str)),
             }
@@ -244,7 +244,7 @@ fn file_hash(path: &Path, notify_handler: &dyn Fn(Notification<'_>)) -> Result<S
     let notification_converter = |notification: crate::utils::Notification<'_>| {
         notify_handler(notification.into());
     };
-    let mut downloaded = utils::FileReaderWithProgress::new_file(&path, &notification_converter)?;
+    let mut downloaded = utils::FileReaderWithProgress::new_file(path, &notification_converter)?;
     use std::io::Read;
     let mut buf = vec![0; 32768];
     while let Ok(n) = downloaded.read(&mut buf) {

src/dist/manifest.rs

@@ -166,7 +166,7 @@ impl Manifest {
 
         for (k, v) in pkg_table {
             if let toml::Value::Table(t) = v {
-                result.insert(k, Package::from_toml(t, &path)?);
+                result.insert(k, Package::from_toml(t, path)?);
             }
         }
 
@@ -372,13 +372,13 @@ impl Package {
 
         if let Some(toml::Value::Table(t)) = target_table.remove("*") {
             Ok(PackageTargets::Wildcard(TargetedPackage::from_toml(
-                t, &path,
+                t, path,
             )?))
         } else {
             let mut result = HashMap::new();
             for (k, v) in target_table {
                 if let toml::Value::Table(t) = v {
-                    result.insert(TargetTriple::new(&k), TargetedPackage::from_toml(t, &path)?);
+                    result.insert(TargetTriple::new(&k), TargetedPackage::from_toml(t, path)?);
                 }
             }
             Ok(PackageTargets::Targeted(result))