Clean up lint errors.

bicarlsen · ctron · commit bc84a175d649 · 2025-07-30T07:09:31.000Z
diff --git a/src/cmd/config.rs b/src/cmd/config.rs
@@ -28,7 +28,7 @@ impl Config {
         match self.command {
             Command::Show => {
                 let (cfg, _working_directory) = config::load(config).await?;
-                println!("{:#?}", cfg);
+                println!("{cfg:#?}");
             }
             Command::GenerateSchema { output } => {
                 let schema = schemars::schema_for!(Configuration);
diff --git a/src/common/mod.rs b/src/common/mod.rs
@@ -207,7 +207,7 @@ pub fn check_target_not_found_err(err: anyhow::Error, target: &str) -> anyhow::E
         None => return err,
     };
     match io_err.kind() {
-        std::io::ErrorKind::NotFound => err.context(format!("'{}' not found", target)),
+        std::io::ErrorKind::NotFound => err.context(format!("'{target}' not found")),
         _ => err,
     }
 }
diff --git a/src/hooks.rs b/src/hooks.rs
@@ -35,14 +35,14 @@ pub fn spawn_hooks(cfg: Arc<RtcBuild>, stage: PipelineStage) -> HookHandles {
             tokio::spawn(async move {
                 let status = command
                     .spawn()
-                    .with_context(|| format!("error spawning hook call for {}", command_name))?
+                    .with_context(|| format!("error spawning hook call for {command_name}"))?
                     .wait()
                     .await
-                    .with_context(|| format!("error calling hook to {}", command_name))?;
+                    .with_context(|| format!("error calling hook to {command_name}"))?;
                 if !status.success() {
-                    bail!("hook call to {} returned a bad status", command_name);
+                    bail!("hook call to {command_name} returned a bad status");
                 }
-                tracing::info!("finished hook {}", command_name);
+                tracing::info!("finished hook {command_name}");
                 Ok(())
             })
         })
diff --git a/src/main.rs b/src/main.rs
@@ -78,7 +78,7 @@ fn init_color(cli: &Trunk) -> bool {
     #[cfg(windows)]
     if colored {
         if let Err(err) = nu_ansi_term::enable_ansi_support() {
-            eprintln!("error enabling ANSI support: {:?}", err);
+            eprintln!("error enabling ANSI support: {err:?}");
         }
     }
 
diff --git a/src/pipelines/html.rs b/src/pipelines/html.rs
@@ -250,14 +250,11 @@ impl HtmlPipeline {
     /// Prepare the document for final output.
     fn finalize_html(&self, target_html: &mut Document) -> Result<()> {
         // Write public_url to base element.
-        target_html.select_mut(
-            &format!("html head base[{}]", PUBLIC_URL_MARKER_ATTR),
-            |el| {
-                el.remove_attribute(PUBLIC_URL_MARKER_ATTR);
-                el.set_attribute("href", &self.cfg.public_url)?;
-                Ok(())
-            },
-        )?;
+        target_html.select_mut(&format!("html head base[{PUBLIC_URL_MARKER_ATTR}]"), |el| {
+            el.remove_attribute(PUBLIC_URL_MARKER_ATTR);
+            el.set_attribute("href", &self.cfg.public_url)?;
+            Ok(())
+        })?;
 
         // Inject the WebSocket autoloader.
         if self.cfg.inject_autoloader {
diff --git a/src/pipelines/mod.rs b/src/pipelines/mod.rs
@@ -371,12 +371,12 @@ pub enum PipelineStage {
 
 /// Create the CSS selector for selecting a trunk link by ID.
 fn trunk_id_selector(id: usize) -> String {
-    format!(r#"link[{}="{}"]"#, TRUNK_ID, id)
+    format!(r#"link[{TRUNK_ID}="{id}"]"#)
 }
 
 /// Create the CSS selector for selecting a trunk script by ID.
 fn trunk_script_id_selector(id: usize) -> String {
-    format!(r#"script[{}="{}"]"#, TRUNK_ID, id)
+    format!(r#"script[{TRUNK_ID}="{id}"]"#)
 }
 
 /// A Display impl that writes out a hashmap of attributes into an html tag.
@@ -448,7 +448,7 @@ impl fmt::Display for AttrWriter<'_> {
             if !attr.is_empty() {
                 if attr.need_escape {
                     let encoded = htmlescape::encode_attribute(attr);
-                    write!(f, "=\"{}\"", encoded)?;
+                    write!(f, "=\"{encoded}\"")?;
                 } else {
                     write!(f, "=\"{}\"", attr.value)?;
                 }
diff --git a/src/pipelines/rust/mod.rs b/src/pipelines/rust/mod.rs
@@ -216,7 +216,7 @@ impl RustApp {
             Some(cargo_profile) => {
                 let cargo_profile = &cargo_profile.value;
                 if let Some(config_cargo_profile) = &cfg.cargo_profile {
-                    log::warn!("Cargo profile from configuration ({config_cargo_profile}) will be overridden with HTML file's more specific setting ({})", cargo_profile);
+                    log::warn!("Cargo profile from configuration ({config_cargo_profile}) will be overridden with HTML file's more specific setting ({cargo_profile})");
                 }
                 Some(cargo_profile.clone())
             }
@@ -563,7 +563,7 @@ impl RustApp {
             .context("error creating wasm-bindgen output dir")?;
 
         // Build up args for calling wasm-bindgen.
-        let arg_out_path = format!("--out-dir={}", bindgen_out);
+        let arg_out_path = format!("--out-dir={bindgen_out}");
         let arg_out_name = format!("--out-name={}", &self.name);
         let target_wasm = wasm_path.to_string_lossy().to_string();
         let target_type = format!("--target={}", self.wasm_bindgen_target);
@@ -607,21 +607,20 @@ impl RustApp {
             apply_data_target_path(format!("{hashed_name}_bg.wasm"), &self.target_path);
 
         let js_name = format!("{}.js", self.name);
-        let hashed_js_name =
-            apply_data_target_path(format!("{}.js", hashed_name), &self.target_path);
+        let hashed_js_name = apply_data_target_path(format!("{hashed_name}.js"), &self.target_path);
         let ts_name = format!("{}.d.ts", self.name);
         let hashed_ts_name =
-            apply_data_target_path(format!("{}.d.ts", hashed_name), &self.target_path);
+            apply_data_target_path(format!("{hashed_name}.d.ts"), &self.target_path);
 
         let js_loader_path = bindgen_out.join(&js_name);
         let js_loader_path_dist = self.cfg.staging_dist.join(&hashed_js_name);
         let wasm_name = format!("{}_bg.wasm", self.name);
         let wasm_path = bindgen_out.join(&wasm_name);
         let wasm_path_dist = self.cfg.staging_dist.join(&hashed_wasm_name);
 
-        let hashed_loader_name = self.loader_shim.then(|| {
-            apply_data_target_path(format!("{}_loader.js", hashed_name), &self.target_path)
-        });
+        let hashed_loader_name = self
+            .loader_shim
+            .then(|| apply_data_target_path(format!("{hashed_name}_loader.js"), &self.target_path));
         let loader_shim_path = hashed_loader_name
             .as_ref()
             .map(|m| self.cfg.staging_dist.join(m));
diff --git a/src/proxy.rs b/src/proxy.rs
@@ -569,7 +569,7 @@ mod tests {
                     have_outbound_req
                         .headers()
                         .get(key.clone())
-                        .unwrap_or_else(|| panic!("Expected header value for {}", key)),
+                        .unwrap_or_else(|| panic!("Expected header value for {key}")),
                     &HeaderValue::from_static("localhost")
                 );
                 continue;
diff --git a/src/serve/mod.rs b/src/serve/mod.rs
@@ -396,10 +396,10 @@ fn router(state: Arc<State>, cfg: Arc<RtcServe>) -> Result<Router> {
     };
     for (key, value) in &state.headers {
         let name = HeaderName::from_bytes(key.as_bytes())
-            .with_context(|| format!("invalid header {:?}", key))?;
+            .with_context(|| format!("invalid header {key:?}"))?;
         let value: HeaderValue = value
             .parse()
-            .with_context(|| format!("invalid header value {:?} for header {}", value, name))?;
+            .with_context(|| format!("invalid header value {value:?} for header {name}"))?;
         serve_dir = serve_dir.layer(SetResponseHeaderLayer::overriding(name, value))
     }
 
@@ -446,10 +446,10 @@ fn router(state: Arc<State>, cfg: Arc<RtcServe>) -> Result<Router> {
         let mut request_headers = HeaderMap::new();
         for (key, value) in &proxy.request_headers {
             let name = HeaderName::from_bytes(key.as_bytes())
-                .with_context(|| format!("invalid header {:?}", key))?;
+                .with_context(|| format!("invalid header {key:?}"))?;
             let value: HeaderValue = value
                 .parse()
-                .with_context(|| format!("invalid header value {:?} for header {}", value, name))?;
+                .with_context(|| format!("invalid header value {value:?} for header {name}"))?;
             request_headers.insert(name, value);
         }
 
@@ -524,7 +524,7 @@ async fn html_address_middleware(
 
                     // turn into a string literal, or replace with "current host" on the client side
                     let host = host
-                        .and_then(|uri| uri.to_str().map(|s| format!("'{}'", s)).ok())
+                        .and_then(|uri| uri.to_str().map(|s| format!("'{s}'")).ok())
                         .unwrap_or_else(|| "window.location.host".into());
 
                     let mut data_str = data_str
diff --git a/src/tools.rs b/src/tools.rs
@@ -191,26 +191,26 @@ impl Application {
             Application::Sass => text
                 .split_whitespace()
                 .next()
-                .with_context(|| format!("missing or malformed version output: {}", text))?
+                .with_context(|| format!("missing or malformed version output: {text}"))?
                 .to_owned(),
             Application::TailwindCss | Application::TailwindCssExtra => {
                 let caps = regex_tailwind
                     .captures(text)
-                    .with_context(|| format!("missing or malformed version output: {}", text))?;
+                    .with_context(|| format!("missing or malformed version output: {text}"))?;
                 caps.get(1)
                     .map(|m| m.as_str().to_owned())
-                    .with_context(|| format!("missing capture group in version output: {}", text))?
+                    .with_context(|| format!("missing capture group in version output: {text}"))?
             }
             Application::WasmBindgen => text
                 .split(' ')
                 .nth(1)
-                .with_context(|| format!("missing or malformed version output: {}", text))?
+                .with_context(|| format!("missing or malformed version output: {text}"))?
                 .to_owned(),
             Application::WasmOpt => format!(
                 "version_{}",
                 text.split(' ')
                     .nth(2)
-                    .with_context(|| format!("missing or malformed version output: {}", text))?
+                    .with_context(|| format!("missing or malformed version output: {text}"))?
             ),
         };
         Ok(formatted_version)

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ impl Config {`
`28`	`28`	`match self.command {`
`29`	`29`	`Command::Show => {`
`30`	`30`	`let (cfg, _working_directory) = config::load(config).await?;`
`31`		`- println!("{:#?}", cfg);`
	`31`	`+ println!("{cfg:#?}");`
`32`	`32`	`}`
`33`	`33`	`Command::GenerateSchema { output } => {`
`34`	`34`	`let schema = schemars::schema_for!(Configuration);`
Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ pub fn check_target_not_found_err(err: anyhow::Error, target: &str) -> anyhow::E`
`207`	`207`	`None => return err,`
`208`	`208`	`};`
`209`	`209`	`match io_err.kind() {`
`210`		`- std::io::ErrorKind::NotFound => err.context(format!("'{}' not found", target)),`
	`210`	`+ std::io::ErrorKind::NotFound => err.context(format!("'{target}' not found")),`
`211`	`211`	`_ => err,`
`212`	`212`	`}`
`213`	`213`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ fn init_color(cli: &Trunk) -> bool {`
`78`	`78`	`#[cfg(windows)]`
`79`	`79`	`if colored {`
`80`	`80`	`if let Err(err) = nu_ansi_term::enable_ansi_support() {`
`81`		`- eprintln!("error enabling ANSI support: {:?}", err);`
	`81`	`+ eprintln!("error enabling ANSI support: {err:?}");`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`