address clippy lint issues in main.rs + toolchains.rs

Author: chrissimpkins

src/main.rs

@@ -163,7 +163,7 @@ enum Bound {
 #[fail(display = "will never happen")]
 struct BoundParseError {}
 
-const YYYY_MM_DD: &'static str = "%Y-%m-%d";
+const YYYY_MM_DD: &str = "%Y-%m-%d";
 
 impl FromStr for Bound {
     type Err = BoundParseError;
@@ -344,7 +344,7 @@ impl CommandTemplate {
     }
 
     fn command(&self) -> Command {
-        assert!(self.0.len() > 0);
+        assert!(!self.0.is_empty());
         let mut cmd = Command::new(&self.0[0]);
         for arg in &self.0[1..] {
             cmd.arg(arg);
@@ -353,7 +353,7 @@ impl CommandTemplate {
     }
 
     fn string(&self) -> String {
-        assert!(self.0.len() > 0);
+        assert!(!self.0.is_empty());
         let mut s = self.0[0].to_string();
         for arg in &self.0[1..] {
             s.push_str(" ");
@@ -509,7 +509,7 @@ fn install(cfg: &Config, client: &Client, bound: &Bound) -> Result<(), Error> {
             let sha = cfg.repo_access.commit(sha)?.sha;
             let mut t = Toolchain {
                 spec: ToolchainSpec::Ci {
-                    commit: sha.clone(),
+                    commit: sha,
                     alt: cfg.args.alt,
                 },
                 host: cfg.args.host.clone(),
@@ -522,7 +522,7 @@ fn install(cfg: &Config, client: &Client, bound: &Bound) -> Result<(), Error> {
         }
         Bound::Date(date) => {
             let mut t = Toolchain {
-                spec: ToolchainSpec::Nightly { date: date },
+                spec: ToolchainSpec::Nightly { date },
                 host: cfg.args.host.clone(),
                 std_targets: vec![cfg.args.host.clone(), cfg.target.clone()],
             };
@@ -779,7 +779,7 @@ fn install_and_test(
 }
 
 fn bisect_to_regression(
-    toolchains: &Vec<Toolchain>,
+    toolchains: &[Toolchain],
     cfg: &Config,
     client: &Client,
     dl_spec: &DownloadParams) -> Result<usize, InstallError>
@@ -922,7 +922,7 @@ fn toolchains_between(cfg: &Config, a: ToolchainSpec, b: ToolchainSpec) -> Vec<T
             let mut date = a;
             while date <= b {
                 let mut t = Toolchain {
-                    spec: ToolchainSpec::Nightly { date: date },
+                    spec: ToolchainSpec::Nightly { date },
                     host: cfg.args.host.clone(),
                     std_targets: vec![cfg.args.host.clone(), cfg.target.clone()],
                 };
@@ -1017,7 +1017,7 @@ fn bisect_ci_in_commits(
         .map(|commit| {
             let mut t = Toolchain {
                 spec: ToolchainSpec::Ci {
-                    commit: commit.sha.clone(),
+                    commit: commit.sha,
                     alt: cfg.args.alt,
                 },
                 host: cfg.args.host.clone(),

src/toolchains.rs

@@ -30,7 +30,7 @@ use crate::{Config, CommandTemplate};
 
 pub type GitDate = Date<Utc>;
 
-const YYYY_MM_DD: &'static str = "%Y-%m-%d";
+const YYYY_MM_DD: &str = "%Y-%m-%d";
 
 pub(crate) const NIGHTLY_SERVER: &str = "https://static.rust-lang.org/dist";
 const CI_SERVER: &str = "https://s3-us-west-1.amazonaws.com/rust-lang-ci2";
@@ -70,7 +70,7 @@ impl fmt::Display for Toolchain {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self.spec {
             ToolchainSpec::Ci { ref commit, alt } => {
-                let alt_s = if alt { format!("-alt") } else { String::new() };
+                let alt_s = if alt { "-alt".to_string() } else { String::new() };
                 write!(f, "{}{}", commit, alt_s)
             }
             ToolchainSpec::Nightly { ref date } => write!(f, "nightly-{}", date.format(YYYY_MM_DD)),
@@ -82,7 +82,7 @@ impl Toolchain {
     pub(crate) fn rustup_name(&self) -> String {
         match self.spec {
             ToolchainSpec::Ci { ref commit, alt } => {
-                let alt_s = if alt { format!("-alt") } else { String::new() };
+                let alt_s = if alt { "-alt".to_string() } else { String::new() };
                 format!("bisector-ci-{}{}-{}", commit, alt_s, self.host)
             }
             // N.B. We need to call this with a nonstandard name so that rustup utilizes the
@@ -152,7 +152,7 @@ impl Toolchain {
                 let cmd = CommandTemplate::new(
                     ["rustc", "--print", "sysroot"]
                         .iter()
-                        .map(|s| s.to_string()),
+                        .map(|s| (*s).to_string()),
                 );
                 let stdout = cmd.output()?.stdout;
                 let output = String::from_utf8_lossy(&stdout);
@@ -166,7 +166,7 @@ impl Toolchain {
             let cmd = CommandTemplate::new(
                 ["rustup", "toolchain", "link"]
                     .iter()
-                    .map(|s| s.to_string())
+                    .map(|s| (*s).to_string())
                     .chain(iter::once(self.rustup_name()))
                     .chain(iter::once(nightly_path)),
             );
@@ -203,7 +203,7 @@ impl Toolchain {
             match e {
                 DownloadError::NotFound(url) => {
                     return Err(InstallError::NotFound {
-                        url: url,
+                        url,
                         spec: self.spec.clone(),
                     })
                 }
@@ -390,7 +390,7 @@ impl fmt::Display for ToolchainSpec {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match *self {
             ToolchainSpec::Ci { ref commit, alt } => {
-                let alt_s = if alt { format!("-alt") } else { String::new() };
+                let alt_s = if alt { "-alt".to_string() } else { String::new() };
                 write!(f, "{}{}", commit, alt_s)
             }
             ToolchainSpec::Nightly { ref date } => write!(f, "nightly-{}", date),
@@ -425,7 +425,7 @@ impl DownloadParams {
 
     pub(crate) fn from_cfg_with_url_prefix(cfg: &Config, url_prefix: String) -> Self {
         DownloadParams {
-            url_prefix: url_prefix,
+            url_prefix,
             tmp_dir: cfg.rustup_tmp_path.clone(),
             install_dir: cfg.toolchains_path.clone(),
             install_cargo: cfg.args.with_cargo,