Auto merge of #671 - est31:master, r=Mark-Simulacrum

Add more exceptions to the list I would also love #667 to be merged, but this probably has to happen after this PR as this PR fixes clippy.
rust-lang · Oct 29, 2022 · 53db254 · 53db254
2 parents 060cf48 + 02280c6
commit 53db254
Show file tree

Hide file tree

Showing 38 changed files with 116 additions and 126 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,11 +1,7 @@
 [package]
 name = "crater"
 version = "0.1.0"
-authors = [
-    "Brian Anderson <banderson@mozilla.com>",
-    "Pietro Albini <pietro@pietroalbini.org>",
-]
-edition = "2018"
+edition = "2021"
 
 build = "build.rs"
 

diff --git a/build.rs b/build.rs
@@ -15,9 +15,9 @@ fn get_git_sha() -> Option<String> {
         let symbolic = cmd(&["git", "rev-parse", "--symbolic", "HEAD"]).unwrap();
         let symbolic_full = cmd(&["git", "rev-parse", "--symbolic-full-name", "HEAD"]).unwrap();
 
-        println!("cargo:rerun-if-changed=.git/{}", symbolic);
+        println!("cargo:rerun-if-changed=.git/{symbolic}");
         if symbolic != symbolic_full {
-            println!("cargo:rerun-if-changed=.git/{}", symbolic_full);
+            println!("cargo:rerun-if-changed=.git/{symbolic_full}");
         }
 
         Some(sha)
@@ -31,5 +31,5 @@ fn main() {
     let sha = format!("{:?}", get_git_sha());
 
     let output = std::env::var("OUT_DIR").unwrap();
-    ::std::fs::write(format!("{}/sha", output), sha.as_bytes()).unwrap();
+    ::std::fs::write(format!("{output}/sha"), sha.as_bytes()).unwrap();
 }
diff --git a/config.toml b/config.toml
@@ -149,6 +149,11 @@ crokey = { skip-tests = true } # compiler error checks in tests
 "wischli/rpaillier" = { skip-tests = true } # flaky tests
 "AntonChernev/suffix-tree-search" = { skip-tests = true } # flaky tests
 "0xpr03/yayd" = { skip-tests = true } # network in tests
+"gclark916/vulkano_examples" = { skip = true } # spurious proc macro error
+"gclark916/vulkano_tri1" = { skip = true } # spurious proc macro error
+"Ayrx/binja-rs-hello-world" = { skip = true } # shared directory messed up by first build
+"Ninja3047/load-symbols" = { skip = true } # shared directory messed up by first build
+"etke/bff" = { skip = true } # shared directory messed up by first build
 "APTy/icmp" = { skip-tests = true } # network in tests
 "GothAck/rs-async-debug" = { skip-tests = true } # compiler error checks in tests
 "hank-der-hafenarbeiter/imperative-rs" = { skip-tests = true } # compiler error checks in tests

diff --git a/local-crates/beta-faulty-deps/Cargo.toml b/local-crates/beta-faulty-deps/Cargo.toml
@@ -1,8 +1,7 @@
 [package]
 name = "beta-faulty-deps"
 version = "0.1.0"
-authors = ["Giacomo Pasini <g.pasini98@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 error_code = {git = "https://github.com/rust-lang/crater", rev = "f190933e896443e285e3bb6962fb87d7439b8d65"}

diff --git a/local-crates/clippy-warn/Cargo.toml b/local-crates/clippy-warn/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "clippy-warn"
 version = "0.1.0"
-authors = ["Dylan MacKenzie <ecstaticmorse@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/local-crates/docs-rs-features/Cargo.toml b/local-crates/docs-rs-features/Cargo.toml
@@ -1,8 +1,7 @@
 [package]
 name = "docs-rs-features"
 version = "0.1.0"
-authors = ["Joshua Nelson <jyn514@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/local-crates/error-code/Cargo.toml b/local-crates/error-code/Cargo.toml
@@ -1,8 +1,7 @@
 [package]
 name = "error_code"
 version = "0.1.0"
-authors = ["Giacomo Pasini <g.pasini98@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 

diff --git a/local-crates/faulty-deps/Cargo.toml b/local-crates/faulty-deps/Cargo.toml
@@ -1,8 +1,7 @@
 [package]
 name = "faulty-deps"
 version = "0.1.0"
-authors = ["Giacomo Pasini <g.pasini98@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 error_code = {git = "https://github.com/rust-lang/crater", rev = "c3f462bdab37a93c24b2b172b90564749e892cbc"}

diff --git a/local-crates/outdated-lockfile/Cargo.toml b/local-crates/outdated-lockfile/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "outdated-lockfile"
 version = "0.1.0"
-authors = ["Pietro Albini <pietro@pietroalbini.org>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/local-crates/yanked-deps/Cargo.toml b/local-crates/yanked-deps/Cargo.toml
@@ -1,8 +1,7 @@
 [package]
 name = "yanked-deps"
 version = "0.1.0"
-authors = ["Pietro Albini <pietro@pietroalbini.org>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 ring = "0.2"
diff --git a/src/actions/experiments/create.rs b/src/actions/experiments/create.rs
@@ -185,7 +185,7 @@ mod tests {
             let crates: Vec<Crate> = db
                 .query(
                     "SELECT crate FROM experiment_crates WHERE experiment = ?1 AND skipped = 0",
-                    &[&ex],
+                    [&ex],
                     |row| {
                         let krate: String = row.get("crate")?;
                         Ok(krate.parse().unwrap())

diff --git a/src/actions/experiments/edit.rs b/src/actions/experiments/edit.rs
@@ -57,7 +57,7 @@ impl Action for EditExperiment {
                     }
 
                     let changes = t.execute(
-                        &format!("UPDATE experiments SET {} = ?1 WHERE name = ?2;", col),
+                        &format!("UPDATE experiments SET {col} = ?1 WHERE name = ?2;"),
                         &[&ex.toolchains[i].to_string(), &self.name],
                     )?;
                     assert_eq!(changes, 1);
@@ -251,7 +251,7 @@ mod tests {
             let crates: Vec<Crate> = db
                 .query(
                     "SELECT crate FROM experiment_crates WHERE experiment = ?1 AND skipped = 0",
-                    &[&ex],
+                    [&ex],
                     |row| {
                         let krate: String = row.get("crate")?;
                         Ok(krate.parse().unwrap())

diff --git a/src/agent/api.rs b/src/agent/api.rs
@@ -51,7 +51,7 @@ impl ResponseExt for ::reqwest::blocking::Response {
         let status = self.status();
         let result: ApiResponse<T> = self
             .json()
-            .with_context(|_| format!("failed to parse API response (status code {})", status,))?;
+            .with_context(|_| format!("failed to parse API response (status code {status})",))?;
         match result {
             ApiResponse::Success { result } => Ok(result),
             ApiResponse::SlowDown => Err(AgentApiError::ServerUnavailable.into()),
@@ -78,7 +78,7 @@ impl AgentApi {
     }
 
     fn build_request(&self, method: Method, url: &str) -> RequestBuilder {
-        utils::http::prepare_sync(method, &format!("{}/agent-api/{}", self.url, url)).header(
+        utils::http::prepare_sync(method, &format!("{}/agent-api/{url}", self.url)).header(
             AUTHORIZATION,
             (CraterToken {
                 token: self.token.clone(),
@@ -101,7 +101,7 @@ impl AgentApi {
                         // We retry these errors. Ideally it's something the
                         // server would handle, but that's (unfortunately) hard
                         // in practice.
-                        format!("{:?}", err).contains("database is locked")
+                        format!("{err:?}").contains("database is locked")
                     };
 
                     if retry {

diff --git a/src/crates/mod.rs b/src/crates/mod.rs
@@ -35,12 +35,12 @@ impl Crate {
             Crate::Registry(ref details) => format!("reg/{}/{}", details.name, details.version),
             Crate::GitHub(ref repo) => {
                 if let Some(ref sha) = repo.sha {
-                    format!("gh/{}/{}/{}", repo.org, repo.name, sha)
+                    format!("gh/{}/{}/{sha}", repo.org, repo.name)
                 } else {
                     format!("gh/{}/{}", repo.org, repo.name)
                 }
             }
-            Crate::Local(ref name) => format!("local/{}", name),
+            Crate::Local(ref name) => format!("local/{name}"),
             Crate::Path(ref path) => {
                 format!("path/{}", utf8_percent_encode(path, NON_ALPHANUMERIC))
             }
@@ -132,11 +132,11 @@ impl fmt::Display for Crate {
                 Crate::Registry(ref krate) => format!("{}-{}", krate.name, krate.version),
                 Crate::GitHub(ref repo) =>
                     if let Some(ref sha) = repo.sha {
-                        format!("{}/{}/{}", repo.org, repo.name, sha)
+                        format!("{}/{}/{sha}", repo.org, repo.name)
                     } else {
                         format!("{}/{}", repo.org, repo.name)
                     },
-                Crate::Local(ref name) => format!("{} (local)", name),
+                Crate::Local(ref name) => format!("{name} (local)"),
                 Crate::Path(ref path) => format!("{}", utf8_percent_encode(path, NON_ALPHANUMERIC)),
                 Crate::Git(ref repo) =>
                     if let Some(ref sha) = repo.sha {

diff --git a/src/db/migrations.rs b/src/db/migrations.rs
@@ -153,8 +153,8 @@ fn migrations() -> Vec<(&'static str, MigrationKind)> {
                     if let Ok(parsed) = serde_json::from_str(&legacy) {
                         Ok(match parsed {
                             LegacyToolchain::Dist(name) => name,
-                            LegacyToolchain::TryBuild { sha } => format!("try#{}", sha),
-                            LegacyToolchain::Master { sha } => format!("master#{}", sha),
+                            LegacyToolchain::TryBuild { sha } => format!("try#{sha}"),
+                            LegacyToolchain::Master { sha } => format!("master#{sha}"),
                         })
                     } else {
                         Ok(legacy)
@@ -178,7 +178,7 @@ fn migrations() -> Vec<(&'static str, MigrationKind)> {
                 [],
             )?;
             t.execute(
-                &format!("UPDATE results SET toolchain = {}(toolchain);", fn_name),
+                &format!("UPDATE results SET toolchain = {fn_name}(toolchain);"),
                 [],
             )?;
             t.execute("PRAGMA foreign_keys = ON;", [])?;
@@ -352,17 +352,11 @@ fn migrations() -> Vec<(&'static str, MigrationKind)> {
 
             t.execute("PRAGMA foreign_keys = OFF;", [])?;
             t.execute(
-                &format!("UPDATE experiment_crates SET crate = {}(crate);", fn_name),
-                [],
-            )?;
-            t.execute(
-                &format!("UPDATE results SET crate = {}(crate);", fn_name),
-                [],
-            )?;
-            t.execute(
-                &format!("UPDATE crates SET crate = {}(crate);", fn_name),
+                &format!("UPDATE experiment_crates SET crate = {fn_name}(crate);"),
                 [],
             )?;
+            t.execute(&format!("UPDATE results SET crate = {fn_name}(crate);"), [])?;
+            t.execute(&format!("UPDATE crates SET crate = {fn_name}(crate);"), [])?;
             t.execute("PRAGMA foreign_keys = ON;", [])?;
 
             Ok(())
@@ -406,7 +400,7 @@ pub fn execute(db: &mut Connection) -> Fallible<()> {
                 MigrationKind::SQL(sql) => t.execute_batch(sql),
                 MigrationKind::Code(code) => code(&t),
             }
-            .with_context(|_| format!("error running migration: {}", name))?;
+            .with_context(|_| format!("error running migration: {name}"))?;
 
             t.execute("INSERT INTO migrations (name) VALUES (?1)", [&name])?;
             t.commit()?;

diff --git a/src/experiments.rs b/src/experiments.rs
@@ -97,9 +97,9 @@ impl fmt::Display for CrateSelect {
             CrateSelect::Full => write!(f, "full"),
             CrateSelect::Demo => write!(f, "demo"),
             CrateSelect::Dummy => write!(f, "dummy"),
-            CrateSelect::Top(n) => write!(f, "top-{}", n),
+            CrateSelect::Top(n) => write!(f, "top-{n}"),
             CrateSelect::Local => write!(f, "local"),
-            CrateSelect::Random(n) => write!(f, "random-{}", n),
+            CrateSelect::Random(n) => write!(f, "random-{n}"),
             CrateSelect::List(list) => {
                 let mut first = true;
                 write!(f, "list:")?;
@@ -109,7 +109,7 @@ impl fmt::Display for CrateSelect {
                         write!(f, ",")?;
                     }
 
-                    write!(f, "{}", krate)?;
+                    write!(f, "{krate}")?;
                     first = false;
                 }
 
@@ -178,7 +178,7 @@ pub enum Assignee {
 impl fmt::Display for Assignee {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
-            Assignee::Agent(ref name) => write!(f, "agent:{}", name),
+            Assignee::Agent(ref name) => write!(f, "agent:{name}"),
             Assignee::Distributed => write!(f, "distributed"),
             Assignee::CLI => write!(f, "cli"),
         }

diff --git a/src/report/archives.rs b/src/report/archives.rs
@@ -50,7 +50,7 @@ fn iterate<'a, DB: ReadResults + 'a>(
                     let log = db
                         .load_log(ex, tc, krate)
                         .and_then(|c| c.ok_or_else(|| err_msg("missing logs")))
-                        .with_context(|_| format!("failed to read log of {} on {}", krate, tc));
+                        .with_context(|_| format!("failed to read log of {krate} on {tc}"));
 
                     let log_bytes: EncodedLog = match log {
                         Ok(l) => l,
@@ -163,15 +163,15 @@ pub fn write_logs_archives<DB: ReadResults, W: ReportWriter>(
     for (comparison, archive) in by_comparison.drain(..) {
         let data = archive.into_inner()?.finish()?;
         dest.write_bytes(
-            &format!("logs-archives/{}.tar.gz", comparison),
+            format!("logs-archives/{comparison}.tar.gz"),
             data,
             &"application/gzip".parse().unwrap(),
             EncodingType::Plain,
         )?;
 
         archives.push(Archive {
-            name: format!("{} crates", comparison),
-            path: format!("logs-archives/{}.tar.gz", comparison),
+            name: format!("{comparison} crates"),
+            path: format!("logs-archives/{comparison}.tar.gz"),
         });
     }
 

diff --git a/src/report/html.rs b/src/report/html.rs
@@ -123,7 +123,7 @@ fn write_report<W: ReportWriter>(
                         result_names.len() - 1
                     });
                 runs[pos] = Some(BuildTestResultHTML {
-                    res: *idx as usize,
+                    res: *idx,
                     log: run.log.clone(),
                 });
             }

diff --git a/src/report/markdown.rs b/src/report/markdown.rs
@@ -66,7 +66,7 @@ fn write_crate(
     let prefix = if is_child { "  * " } else { "* " };
     let status_warning = krate
         .status
-        .map(|status| format!(" ({})", status))
+        .map(|status| format!(" ({status})"))
         .unwrap_or_default();
 
     if let ReportConfig::Complete(toolchain) = comparison.report_config() {
@@ -106,7 +106,7 @@ fn render_markdown(context: &ResultsContext) -> Fallible<String> {
     writeln!(rendered, "# Crater report for {}\n\n", context.ex.name)?;
 
     for (comparison, results) in context.categories.iter() {
-        writeln!(rendered, "\n### {}", comparison)?;
+        writeln!(rendered, "\n### {comparison}")?;
         match results {
             ReportCratesMD::Plain(crates) => {
                 for krate in crates {