fix clippy warnings

Author: syphar

build.rs

@@ -91,7 +91,7 @@ fn write_git_version(out_dir: &Path) -> Result<()> {
 
     std::fs::write(
         out_dir.join("git_version"),
-        format!("({} {})", git_hash, build_date),
+        format!("({git_hash} {build_date})"),
     )?;
 
     Ok(())

crates/font-awesome-as-a-crate/build.rs

@@ -30,7 +30,7 @@ fn write_fontawesome_sprite() {
             file.read_to_string(&mut data)
                 .expect("fontawesome file read");
             // if this assert goes off, add more hashes here and in the format! below
-            assert!(!data.contains("###"), "file {} breaks raw string", filename);
+            assert!(!data.contains("###"), "file {filename} breaks raw string");
             dest_file
                 .write_all(
                     format!(

crates/metadata/lib.rs

@@ -280,18 +280,18 @@ impl Metadata {
             cargo_args.push("--config".into());
             let rustflags =
                 toml::to_string(&self.rustc_args).expect("serializing a string should never fail");
-            cargo_args.push(format!("build.rustflags={}", rustflags));
+            cargo_args.push(format!("build.rustflags={rustflags}"));
             cargo_args.push("-Zhost-config".into());
             cargo_args.push("-Ztarget-applies-to-host".into());
             cargo_args.push("--config".into());
-            cargo_args.push(format!("host.rustflags={}", rustflags));
+            cargo_args.push(format!("host.rustflags={rustflags}"));
         }
 
         if !all_rustdoc_args.is_empty() {
             cargo_args.push("--config".into());
             let rustdocflags =
                 toml::to_string(&all_rustdoc_args).expect("serializing a string should never fail");
-            cargo_args.push(format!("build.rustdocflags={}", rustdocflags));
+            cargo_args.push(format!("build.rustdocflags={rustdocflags}"));
         }
 
         cargo_args.extend(additional_args.iter().map(|s| s.to_owned()));
@@ -645,7 +645,7 @@ mod test_targets {
             other_targets: others,
             ..
         } = metadata.targets(false);
-        assert!(others.is_empty(), "{:?}", others);
+        assert!(others.is_empty(), "{others:?}");
     }
 }
 

src/bin/cratesfyi.rs

@@ -52,15 +52,15 @@ fn main() {
     };
 
     if let Err(err) = CommandLine::parse().handle_args() {
-        let mut msg = format!("Error: {}", err);
+        let mut msg = format!("Error: {err}");
         for cause in err.chain() {
-            write!(msg, "\n\nCaused by:\n    {}", cause).unwrap();
+            write!(msg, "\n\nCaused by:\n    {cause}").unwrap();
         }
-        eprintln!("{}", msg);
+        eprintln!("{msg}");
 
         let backtrace = err.backtrace().to_string();
         if !backtrace.is_empty() {
-            eprintln!("\nStack backtrace:\n{}", backtrace);
+            eprintln!("\nStack backtrace:\n{backtrace}");
         }
 
         // we need to drop the sentry guard here so all unsent
@@ -254,7 +254,7 @@ impl PrioritySubcommand {
                 if let Some(priority) = remove_crate_priority(&mut *ctx.conn()?, &pattern)
                     .context("Could not remove pattern's priority")?
                 {
-                    println!("Removed pattern with priority {}", priority);
+                    println!("Removed pattern with priority {priority}");
                 } else {
                     println!("Pattern did not exist and so was not removed");
                 }

src/build_queue.rs

@@ -300,7 +300,7 @@ impl BuildQueue {
         for change in &changes {
             if let Some((ref krate, ..)) = change.deleted() {
                 match delete_crate(&mut conn, &self.storage, &self.config, krate)
-                    .with_context(|| format!("failed to delete crate {}", krate))
+                    .with_context(|| format!("failed to delete crate {krate}"))
                 {
                     Ok(_) => info!(
                         "crate {} was deleted from the index and the database",

src/cdn.rs

@@ -415,12 +415,12 @@ pub(crate) fn queue_crate_invalidation(
     if let Some(distribution_id) = config.cloudfront_distribution_id_web.as_ref() {
         add(
             distribution_id,
-            &[&format!("/{}*", name), &format!("/crate/{}*", name)],
+            &[&format!("/{name}*"), &format!("/crate/{name}*")],
         )
         .context("error enqueueing web CDN invalidation")?;
     }
     if let Some(distribution_id) = config.cloudfront_distribution_id_static.as_ref() {
-        add(distribution_id, &[&format!("/rustdoc/{}*", name)])
+        add(distribution_id, &[&format!("/rustdoc/{name}*")])
             .context("error enqueueing static CDN invalidation")?;
     }
 

src/config.rs

@@ -209,7 +209,7 @@ where
         Ok(content) => Ok(content
             .parse::<T>()
             .map(Some)
-            .with_context(|| format!("failed to parse configuration variable {}", var))?),
+            .with_context(|| format!("failed to parse configuration variable {var}"))?),
         Err(VarError::NotPresent) => {
             trace!("optional configuration variable {} is not set", var);
             Ok(None)

src/db/add_package.rs

@@ -669,8 +669,8 @@ mod test {
 
             let new_owners: Vec<CrateOwner> = (1..5)
                 .map(|i| CrateOwner {
-                    login: format!("login{}", i),
-                    avatar: format!("avatar{}", i),
+                    login: format!("login{i}"),
+                    avatar: format!("avatar{i}"),
                 })
                 .collect();
 

src/db/delete.rs

@@ -36,7 +36,7 @@ pub fn delete_crate(
     for prefix in paths {
         // delete the whole rustdoc/source folder for this crate.
         // it will include existing archives.
-        let remote_folder = format!("{}/{}/", prefix, name);
+        let remote_folder = format!("{prefix}/{name}/");
         storage.delete_prefix(&remote_folder)?;
 
         // remove existing local archive index files.
@@ -67,7 +67,7 @@ pub fn delete_version(ctx: &dyn Context, name: &str, version: &str) -> Result<()
     };
 
     for prefix in paths {
-        storage.delete_prefix(&format!("{}/{}/{}/", prefix, name, version))?;
+        storage.delete_prefix(&format!("{prefix}/{name}/{version}/"))?;
     }
 
     let local_archive_cache = &ctx.config()?.local_archive_cache_path;
@@ -81,13 +81,10 @@ pub fn delete_version(ctx: &dyn Context, name: &str, version: &str) -> Result<()
         storage.delete_prefix(&archive_filename)?;
 
         // delete eventually existing local indexes
-        let local_index_file = local_archive_cache.join(format!("{}.index", archive_filename));
+        let local_index_file = local_archive_cache.join(format!("{archive_filename}.index"));
         if local_index_file.exists() {
             fs::remove_file(&local_index_file).with_context(|| {
-                format!(
-                    "error when trying to remove local index: {:?}",
-                    local_index_file
-                )
+                format!("error when trying to remove local index: {local_index_file:?}")
             })?;
         }
     }
@@ -119,7 +116,7 @@ fn delete_version_from_database(conn: &mut Client, name: &str, version: &str) ->
     let mut transaction = conn.transaction()?;
     for &(table, column) in METADATA {
         transaction.execute(
-            format!("DELETE FROM {} WHERE {} IN (SELECT id FROM releases WHERE crate_id = $1 AND version = $2)", table, column).as_str(),
+            format!("DELETE FROM {table} WHERE {column} IN (SELECT id FROM releases WHERE crate_id = $1 AND version = $2)").as_str(),
             &[&crate_id, &version],
         )?;
     }
@@ -146,7 +143,7 @@ fn delete_version_from_database(conn: &mut Client, name: &str, version: &str) ->
     for prefix in paths {
         transaction.execute(
             "DELETE FROM files WHERE path LIKE $1;",
-            &[&format!("{}/{}/{}/%", prefix, name, version)],
+            &[&format!("{prefix}/{name}/{version}/%")],
         )?;
     }
 
@@ -165,8 +162,7 @@ fn delete_crate_from_database(conn: &mut Client, name: &str, crate_id: i32) -> R
     for &(table, column) in METADATA {
         transaction.execute(
             format!(
-                "DELETE FROM {} WHERE {} IN (SELECT id FROM releases WHERE crate_id = $1)",
-                table, column
+                "DELETE FROM {table} WHERE {column} IN (SELECT id FROM releases WHERE crate_id = $1)"
             )
             .as_str(),
             &[&crate_id],
@@ -246,7 +242,7 @@ mod tests {
                 assert!(env.storage().rustdoc_file_exists(
                     pkg,
                     version,
-                    &format!("{}/index.html", pkg),
+                    &format!("{pkg}/index.html"),
                     archive_storage
                 )?);
             }
@@ -372,7 +368,7 @@ mod tests {
                 assert!(!env.storage().exists(&rustdoc_archive)?);
 
                 // local and remote index are gone too
-                let archive_index = format!("{}.index", rustdoc_archive);
+                let archive_index = format!("{rustdoc_archive}.index");
                 assert!(!env.storage().exists(&archive_index)?);
                 assert!(!env
                     .config()

src/docbuilder/rustwide_builder.rs

@@ -230,7 +230,7 @@ impl RustwideBuilder {
 
         let mut build_dir = self
             .workspace
-            .build_dir(&format!("essential-files-{}", rustc_version));
+            .build_dir(&format!("essential-files-{rustc_version}"));
         build_dir.purge().map_err(FailureError::compat)?;
 
         // This is an empty library crate that is supposed to always build.
@@ -361,7 +361,7 @@ impl RustwideBuilder {
             }
         }
 
-        let mut build_dir = self.workspace.build_dir(&format!("{}-{}", name, version));
+        let mut build_dir = self.workspace.build_dir(&format!("{name}-{version}"));
         build_dir.purge().map_err(FailureError::compat)?;
 
         let krate = match kind {
@@ -490,7 +490,7 @@ impl RustwideBuilder {
                         .api()
                         .get_release_data(name, version)
                         .with_context(|| {
-                            format!("could not fetch releases-data for {}-{}", name, version)
+                            format!("could not fetch releases-data for {name}-{version}")
                         }) {
                         Ok(data) => data,
                         Err(err) => {
@@ -523,7 +523,7 @@ impl RustwideBuilder {
                     }
 
                     let build_id = add_build_into_database(&mut conn, release_id, &res.result)?;
-                    let build_log_path = format!("build-logs/{}/{}.txt", build_id, default_target);
+                    let build_log_path = format!("build-logs/{build_id}/{default_target}.txt");
                     self.storage.store_one(build_log_path, res.build_log)?;
 
                     // Some crates.io crate data is mutable, so we proactively update it during a release
@@ -539,7 +539,7 @@ impl RustwideBuilder {
                         // we're doing this in the end so eventual problems in the build
                         // won't lead to non-existing docs.
                         for prefix in &["rustdoc", "sources"] {
-                            let prefix = format!("{}/{}/{}/", prefix, name, version);
+                            let prefix = format!("{prefix}/{name}/{version}/");
                             debug!("cleaning old storage folder {}", prefix);
                             self.storage.delete_prefix(&prefix)?;
                         }
@@ -741,15 +741,14 @@ impl RustwideBuilder {
             //
             // FIXME: host-only crates like proc-macros should probably not have this passed? but #1417 should make it OK
             format!(
-                r#"--config=doc.extern-map.registries.crates-io="https://docs.rs/{{pkg_name}}/{{version}}/{}""#,
-                target
+                r#"--config=doc.extern-map.registries.crates-io="https://docs.rs/{{pkg_name}}/{{version}}/{target}""#
             ),
             // Enables the unstable rustdoc-scrape-examples feature. We are "soft launching" this feature on
             // docs.rs, but once it's stable we can remove this flag.
             "-Zrustdoc-scrape-examples".into(),
         ];
         if let Some(cpu_limit) = self.config.build_cpu_limit {
-            cargo_args.push(format!("-j{}", cpu_limit));
+            cargo_args.push(format!("-j{cpu_limit}"));
         }
         // Cargo has a series of frightening bugs around cross-compiling proc-macros:
         // - Passing `--target` causes RUSTDOCFLAGS to fail to be passed 🤦
@@ -879,8 +878,8 @@ mod tests {
             let default_target = "x86_64-unknown-linux-gnu";
 
             let storage = env.storage();
-            let old_rustdoc_file = format!("rustdoc/{}/{}/some_doc_file", crate_, version);
-            let old_source_file = format!("sources/{}/{}/some_source_file", crate_, version);
+            let old_rustdoc_file = format!("rustdoc/{crate_}/{version}/some_doc_file");
+            let old_source_file = format!("sources/{crate_}/{version}/some_source_file");
             storage.store_one(&old_rustdoc_file, Vec::new())?;
             storage.store_one(&old_source_file, Vec::new())?;
 
@@ -938,28 +937,23 @@ mod tests {
             assert!(storage.exists(&source_archive)?, "{}", source_archive);
 
             // default target was built and is accessible
-            assert!(storage.exists_in_archive(&doc_archive, &format!("{}/index.html", crate_path))?);
-            assert_success(&format!("/{}/{}/{}", crate_, version, crate_path), web)?;
+            assert!(storage.exists_in_archive(&doc_archive, &format!("{crate_path}/index.html"))?);
+            assert_success(&format!("/{crate_}/{version}/{crate_path}"), web)?;
 
             // source is also packaged
             assert!(storage.exists_in_archive(&source_archive, "src/lib.rs")?);
-            assert_success(
-                &format!("/crate/{}/{}/source/src/lib.rs", crate_, version),
-                web,
-            )?;
+            assert_success(&format!("/crate/{crate_}/{version}/source/src/lib.rs"), web)?;
 
             assert!(!storage.exists_in_archive(
                 &doc_archive,
-                &format!("{}/{}/index.html", default_target, crate_path),
+                &format!("{default_target}/{crate_path}/index.html"),
             )?);
 
-            let default_target_url = format!(
-                "/{}/{}/{}/{}/index.html",
-                crate_, version, default_target, crate_path
-            );
+            let default_target_url =
+                format!("/{crate_}/{version}/{default_target}/{crate_path}/index.html");
             assert_redirect(
                 &default_target_url,
-                &format!("/{}/{}/{}/index.html", crate_, version, crate_path),
+                &format!("/{crate_}/{version}/{crate_path}/index.html"),
                 web,
             )?;
 
@@ -985,13 +979,11 @@ mod tests {
                     }
                     let target_docs_present = storage.exists_in_archive(
                         &doc_archive,
-                        &format!("{}/{}/index.html", target, crate_path),
+                        &format!("{target}/{crate_path}/index.html"),
                     )?;
 
-                    let target_url = format!(
-                        "/{}/{}/{}/{}/index.html",
-                        crate_, version, target, crate_path
-                    );
+                    let target_url =
+                        format!("/{crate_}/{version}/{target}/{crate_path}/index.html");
 
                     assert!(target_docs_present);
                     assert_success(&target_url, web)?;
@@ -1011,8 +1003,8 @@ mod tests {
             let version = "0.2.3";
 
             let storage = env.storage();
-            let old_rustdoc_file = format!("rustdoc/{}/{}/some_doc_file", crate_, version);
-            let old_source_file = format!("sources/{}/{}/some_source_file", crate_, version);
+            let old_rustdoc_file = format!("rustdoc/{crate_}/{version}/some_doc_file");
+            let old_source_file = format!("sources/{crate_}/{version}/some_source_file");
             storage.store_one(&old_rustdoc_file, Vec::new())?;
             storage.store_one(&old_source_file, Vec::new())?;
 
@@ -1104,16 +1096,11 @@ mod tests {
 
             let target = "x86_64-unknown-linux-gnu";
             let crate_path = crate_.replace('-', "_");
-            let target_docs_present = storage.exists_in_archive(
-                &doc_archive,
-                &format!("{}/{}/index.html", target, crate_path),
-            )?;
+            let target_docs_present = storage
+                .exists_in_archive(&doc_archive, &format!("{target}/{crate_path}/index.html"))?;
 
             let web = env.frontend();
-            let target_url = format!(
-                "/{}/{}/{}/{}/index.html",
-                crate_, version, target, crate_path
-            );
+            let target_url = format!("/{crate_}/{version}/{target}/{crate_path}/index.html");
 
             assert!(target_docs_present);
             assert_success(&target_url, web)?;