Merge pull request #994 from pkgw/clippy

Fix everything for Rust 1.67's Clippy

Author: pkgw

build.rs

@@ -9,5 +9,5 @@ fn main() {
     // they want to spawn off executables.
 
     let target = env::var("TARGET").unwrap();
-    println!("cargo:rustc-env=TARGET={}", target);
+    println!("cargo:rustc-env=TARGET={target}");
 }

crates/bridge_core/src/lib.rs

@@ -349,7 +349,7 @@ impl<'a> CoreBridgeState<'a> {
         // `lipsum.ltd.tex` under the name `lipsum.ltd`.
 
         for e in format.extensions() {
-            let ext = format!("{}.{}", name, e);
+            let ext = format!("{name}.{e}");
 
             if let FileFormat::Format = format {
                 match io.input_open_format(&ext, self.status) {

crates/bridge_graphite2/build.rs

@@ -55,5 +55,5 @@ fn main() {
         ""
     };
 
-    println!("cargo:define_static={}", define_static_flag);
+    println!("cargo:define_static={define_static_flag}");
 }

crates/bundles/src/cache.rs

@@ -461,7 +461,7 @@ impl<CB: CacheBackend> CachingBundle<CB> {
         // line-based manifest format. Be paranoid and refuse to record such
         // filenames.
         if !name.contains(|c| c == '\n' || c == '\r') {
-            writeln!(man, "{} {} {}", name, length, digest_text)?;
+            writeln!(man, "{name} {length} {digest_text}")?;
         }
 
         self.contents.insert(

crates/bundles/src/lib.rs

@@ -117,10 +117,7 @@ pub fn get_fallback_bundle_url(format_version: u32) -> String {
     if format_version < 32 {
         "https://relay.fullyjustified.net/default_bundle.tar".to_owned()
     } else {
-        format!(
-            "https://relay.fullyjustified.net/default_bundle_v{}.tar",
-            format_version
-        )
+        format!("https://relay.fullyjustified.net/default_bundle_v{format_version}.tar")
     }
 }
 

crates/dep_support/src/lib.rs

@@ -223,7 +223,7 @@ impl<'a, T: Spec> Dependency<'a, T> {
                                 // graphite2 is not available on Debian. So
                                 // let's jump through the hoops of testing
                                 // whether the static archive seems findable.
-                                let libname = format!("lib{}.a", libbase);
+                                let libname = format!("lib{libbase}.a");
                                 state
                                     .libs
                                     .link_paths
@@ -233,11 +233,11 @@ impl<'a, T: Spec> Dependency<'a, T> {
                         };
 
                         let mode = if do_static { "static=" } else { "" };
-                        println!("cargo:rustc-link-lib={}{}", mode, libbase);
+                        println!("cargo:rustc-link-lib={mode}{libbase}");
                     }
 
                     for fw in &state.libs.frameworks {
-                        println!("cargo:rustc-link-lib=framework={}", fw);
+                        println!("cargo:rustc-link-lib=framework={fw}");
                     }
                 } else {
                     // Just let pkg-config do its thing.

crates/engine_spx2html/src/font.rs

@@ -406,7 +406,7 @@ impl FontData {
         // CSS info for the main font.
 
         let rel_url = utf8_percent_encode(&self.basename, CONTROLS).to_string();
-        let mut rv = vec![(None, format!(r#"url("{}") format("opentype")"#, rel_url))];
+        let mut rv = vec![(None, format!(r#"url("{rel_url}") format("opentype")"#))];
 
         // Alternates until we're done
 
@@ -468,7 +468,7 @@ impl FontData {
             let rel_url = utf8_percent_encode(&varname, CONTROLS).to_string();
             rv.push((
                 Some(cur_map_index),
-                format!(r#"url("{}") format("opentype")"#, rel_url),
+                format!(r#"url("{rel_url}") format("opentype")"#),
             ));
         }
 

crates/engine_spx2html/src/lib.rs

@@ -333,7 +333,7 @@ impl InitializationState {
         let mut ih = None;
 
         for ext in &["", ".otf"] {
-            texpath = format!("{}{}", name, ext);
+            texpath = format!("{name}{ext}");
 
             match io.input_open_name(&texpath, common.status) {
                 OpenResult::Ok(h) => {
@@ -391,7 +391,7 @@ impl InitializationState {
 
         let info = FontInfo {
             rel_url: utf8_percent_encode(basename, CONTROLS).to_string(),
-            family_name: format!("tdux{}", font_num),
+            family_name: format!("tdux{font_num}"),
             family_relation: FamilyRelativeFontId::Regular,
             fd_key,
             size,
@@ -595,7 +595,7 @@ impl InitializationState {
                 b.family_name = if let Some(fname) = text.strip_prefix("family-name:") {
                     fname.to_owned()
                 } else {
-                    format!("tdux{}", font_num)
+                    format!("tdux{font_num}")
                 };
 
                 // Say that the "regular" font of the first font family definition
@@ -1083,7 +1083,7 @@ impl EmittingState {
                 "mfs" => {
                     if self.content_finished {
                         self.warn_finished_content(
-                            &format!("manual flexible start tag {:?}", remainder),
+                            &format!("manual flexible start tag {remainder:?}"),
                             common,
                         );
                         Ok(())
@@ -1095,7 +1095,7 @@ impl EmittingState {
                 "me" => {
                     if self.content_finished {
                         self.warn_finished_content(
-                            &format!("manual end tag </{}>", remainder),
+                            &format!("manual end tag </{remainder}>"),
                             common,
                         );
                     } else {
@@ -1484,7 +1484,7 @@ impl EmittingState {
         common: &mut Common,
     ) -> Result<()> {
         if self.content_finished {
-            self.warn_finished_content(&format!("text `{}`", text), common);
+            self.warn_finished_content(&format!("text `{text}`"), common);
             return Ok(());
         }
 
@@ -1609,7 +1609,7 @@ impl EmittingState {
                         self.current_content.push(' ');
                     }
 
-                    write!(self.current_content, "<span style=\"{}\">", font_sel).unwrap();
+                    write!(self.current_content, "<span style=\"{font_sel}\">").unwrap();
                     html_escape::encode_text_to_string(ch_as_str, &mut self.current_content);
                     write!(self.current_content, "</span>").unwrap();
                 } else {
@@ -2108,7 +2108,7 @@ struct FontInfo {
 impl FontInfo {
     fn selection_style_text(&self, alternate_map_index: Option<usize>) -> String {
         let alt_text = alternate_map_index
-            .map(|i| format!("vg{}", i))
+            .map(|i| format!("vg{i}"))
             .unwrap_or_default();
 
         let extra = match self.family_relation {
@@ -2124,7 +2124,7 @@ impl FontInfo {
 
     fn font_face_text(&self, alternate_map_index: Option<usize>) -> String {
         let alt_text = alternate_map_index
-            .map(|i| format!("vg{}", i))
+            .map(|i| format!("vg{i}"))
             .unwrap_or_default();
 
         let extra = match self.family_relation {

crates/errors/src/lib.rs

@@ -52,12 +52,12 @@ pub struct AnnotatedMessage {
 impl AnnotatedMessage {
     /// Set the primary message associated with this annotated report.
     pub fn set_message<T: fmt::Display>(&mut self, m: T) {
-        self.message = format!("{}", m);
+        self.message = format!("{m}");
     }
 
     /// Add an additional note to be associated with this annotated report.
     pub fn add_note<T: fmt::Display>(&mut self, n: T) {
-        self.notes.push(format!("{}", n));
+        self.notes.push(format!("{n}"));
     }
 
     /// Obtain the set of notes associated with this report.

crates/geturl/src/curl.rs

@@ -23,7 +23,7 @@ fn get_url_generic(
 
     if let Some((start, length)) = range {
         let end = start + length as u64 - 1;
-        handle.range(&format!("{}-{}", start, end))?;
+        handle.range(&format!("{start}-{end}"))?;
     }
 
     let mut buf = Vec::new();