Address clippy reported issues

In recent versions of Rust variables can be referenced directory in
format! strings. Do just that, instead of passing them in as "extra"
arguments to make clippy happy.

Author: d-e-s-o

src/index.rs

@@ -42,7 +42,7 @@ fn parse_port(url: &str) -> Result<u16> {
     .nth(2)
     .ok_or_else(|| anyhow!("provided URL {} has unexpected format", url))?;
   let addr =
-    SocketAddr::from_str(addr).with_context(|| format!("failed to parse address {}", addr))?;
+    SocketAddr::from_str(addr).with_context(|| format!("failed to parse address {addr}"))?;
   Ok(addr.port())
 }
 
@@ -299,11 +299,8 @@ impl Index {
     match result {
       Ok(file) => {
         let mut config = from_reader::<_, Config>(&file).context("failed to parse config.json")?;
-        let dl = format!(
-          "http://{}/api/v1/crates/{{crate}}/{{version}}/download",
-          addr
-        );
-        let api = format!("http://{}", addr);
+        let dl = format!("http://{addr}/api/v1/crates/{{crate}}/{{version}}/download");
+        let api = format!("http://{addr}");
         if config.dl != dl || config.api.as_ref() != Some(&api) {
           config.dl = dl;
           config.api = Some(api);
@@ -326,11 +323,8 @@ impl Index {
       Err(err) if err.kind() == ErrorKind::NotFound => {
         let file = File::create(&path).context("failed to create config.json")?;
         let config = Config {
-          dl: format!(
-            "http://{}/api/v1/crates/{{crate}}/{{version}}/download",
-            addr
-          ),
-          api: Some(format!("http://{}", addr)),
+          dl: format!("http://{addr}/api/v1/crates/{{crate}}/{{version}}/download"),
+          api: Some(format!("http://{addr}")),
         };
         to_writer_pretty(&file, &config).context("failed to write config.json")?;
 

src/main.rs

@@ -64,7 +64,7 @@ fn run() -> Result<()> {
 fn main() {
   let exit_code = run()
     .map(|_| 0)
-    .map_err(|e| eprintln!("{:?}", e))
+    .map_err(|e| eprintln!("{e:?}"))
     .unwrap_or(1);
 
   // We exit the process the hard way next, so make sure to flush

src/publish.rs

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2023 The cargo-http-registry Developers
+// Copyright (C) 2020-2025 The cargo-http-registry Developers
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 use std::collections::BTreeMap;
@@ -176,7 +176,7 @@ impl From<(MetaData, &[u8])> for Entry {
 
 /// Craft the file name for a crate named `name` in version `version`.
 pub fn crate_file_name(name: &str, version: &str) -> String {
-  format!("{}-{}.crate", name, version)
+  format!("{name}-{version}.crate")
 }
 
 /// Extract and parse a `u32` value from a `Bytes` object.
@@ -305,15 +305,15 @@ pub fn publish_crate(mut body: Bytes, index: &mut Index) -> Result<()> {
       crate_meta_path.display(),
     )
   })?;
-  index
-    .add(&crate_relative_path)
-    .with_context(|| format!(
+  index.add(&crate_relative_path).with_context(|| {
+    format!(
       "failed to add {} to git repository (full path: {})",
       crate_relative_path.display(),
       crate_path.display(),
-    ))?;
+    )
+  })?;
   index
-    .commit(&format!("Add {} in version {}", crate_name, crate_vers))
+    .commit(&format!("Add {crate_name} in version {crate_vers}"))
     .context("failed to commit changes to index")?;
 
   if !body.is_empty() {

src/serve.rs

@@ -1,4 +1,4 @@
-// Copyright (C) 2021-2023 The cargo-http-registry Developers
+// Copyright (C) 2021-2025 The cargo-http-registry Developers
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 use std::future::Future;
@@ -148,7 +148,7 @@ pub fn serve(root: &Path, addr: SocketAddr) -> Result<(impl Future<Output = ()>,
     // happen outside of a tokio runtime. Boy.
     let result = warp::serve(routes)
       .try_bind_ephemeral(addr)
-      .with_context(|| format!("failed to bind to {}", addr));
+      .with_context(|| format!("failed to bind to {addr}"));
 
     match result {
       Ok(result) => break result,

tests/end-to-end.rs

@@ -99,15 +99,13 @@ token = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
     Locator::Socket(addr) => {
       format!(
         r#"
-[registries.{registry}]
+[registries.{REGISTRY}]
 index = "http://{addr}/git"
 token = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 
 [net]
 git-fetch-with-cli = true
 "#,
-        registry = REGISTRY,
-        addr = addr,
       )
     },
   };
@@ -317,7 +315,7 @@ async fn test_publish_and_consume(registry_locator: Locator) {
   cargo_init(&home, ["--bin", my_bin.to_str().unwrap()])
     .await
     .unwrap();
-  let data = format!(r#"my-lib = {{version = "*", registry = "{}"}}"#, REGISTRY);
+  let data = format!(r#"my-lib = {{version = "*", registry = "{REGISTRY}"}}"#);
   append(&cargo_toml, data).unwrap();
 
   let data = "#[allow(unused_imports)] use my_lib::foo;\n";