fix: Clippy warnings for Rust 1.88 (#1204)

Author: scouten-adobe

.github/workflows/ci.yml

@@ -487,14 +487,11 @@ jobs:
       - name: Install nightly toolchain
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: nightly-2025-06-05
+          toolchain: nightly-2025-06-28
           components: rustfmt
-          # Pinning to specific nightly build for now. More recent versions
-          # introduce a lifetime check that creates a whole slew of build
-          # errors.
 
       - name: Check format
-        run: cargo +nightly-2025-06-05 fmt --all -- --check
+        run: cargo +nightly-2025-06-28 fmt --all -- --check
 
   docs_rs:
     name: Preflight docs.rs build

c2pa_c_ffi/build.rs

@@ -22,7 +22,7 @@ fn main() {
 
     // Get the workspace target directory.
     let out_dir = env::var("OUT_DIR").expect("OUT_DIR environment variable not set");
-    println!("Running c2pa_c_ffi folder build script: {:?}", out_dir);
+    println!("Running c2pa_c_ffi folder build script: {out_dir:?}");
 
     let workspace_target_dir = Path::new(&out_dir)
         .ancestors()
@@ -38,10 +38,10 @@ fn main() {
     // Add a version string to the header.
     config.header = match config.header {
         Some(ref mut header) => {
-            header.push_str(&format!("\n// Version: {}\n", version));
+            header.push_str(&format!("\n// Version: {version}\n"));
             Some(header.clone())
         }
-        None => Some(format!("\n// Version: {}\n", version)),
+        None => Some(format!("\n// Version: {version}\n")),
     };
 
     // Generate the header file.
@@ -50,7 +50,7 @@ fn main() {
             cbindgen::Error::ParseSyntaxError { .. } => {
                 eprintln!("Warning: ParseSyntaxError encountered while generating bindings");
             }
-            e => panic!("{:?}", e),
+            e => panic!("{e:?}"),
         },
         |bindings| {
             println!(

c2pa_c_ffi/src/c_api.rs

@@ -1118,7 +1118,7 @@ pub unsafe extern "C" fn c2pa_signer_create(
                 signed_len_max,
             )
         };
-        println!("c_callback: signed_size: {}", signed_size);
+        println!("c_callback: signed_size: {signed_size}");
         if signed_size < 0 {
             return Err(c2pa::Error::CoseSignature); // todo:: return errors from callback
         }
@@ -1604,11 +1604,8 @@ mod tests {
     #[cfg(feature = "file_io")]
     fn test_reader_from_file_cawg_identity() {
         let base = env!("CARGO_MANIFEST_DIR");
-        let path = CString::new(format!(
-            "{}/../sdk/tests/fixtures/C_with_CAWG_data.jpg",
-            base
-        ))
-        .unwrap();
+        let path =
+            CString::new(format!("{base}/../sdk/tests/fixtures/C_with_CAWG_data.jpg")).unwrap();
         let reader = unsafe { c2pa_reader_from_file(path.as_ptr()) };
         if reader.is_null() {
             let error = unsafe { c2pa_error() };

c2pa_c_ffi/src/json_api.rs

@@ -83,7 +83,7 @@ mod tests {
     /// returns a path to a file in the fixtures folder
     pub fn test_path(path: &str) -> String {
         let base = env!("CARGO_MANIFEST_DIR");
-        format!("{}/../sdk/{}", base, path)
+        format!("{base}/../sdk/{path}")
     }
 
     #[test]
@@ -92,7 +92,7 @@ mod tests {
         let result = read_file(&path, None);
         assert!(result.is_ok());
         let json_report = result.unwrap();
-        println!("{}", json_report);
+        println!("{json_report}");
         assert!(json_report.contains("C.jpg"));
         assert!(!json_report.contains("validation_status"));
     }
@@ -107,7 +107,7 @@ mod tests {
         let result = read_file(&path, Some(data_dir.to_owned()));
         //assert!(result.is_ok());
         let json_report = result.unwrap();
-        println!("{}", json_report);
+        println!("{json_report}");
         assert!(json_report.contains("C.jpg"));
         assert!(PathBuf::from(data_dir).exists());
         assert!(json_report.contains("thumbnail"));
@@ -119,7 +119,7 @@ mod tests {
         let result = read_file(&path, None);
         assert!(result.is_ok());
         let json_report = result.unwrap();
-        println!("{}", json_report);
+        println!("{json_report}");
         assert!(json_report.contains("cawg.identity"));
         assert!(json_report.contains("cawg.ica.credential_valid"));
     }

cli/src/callback_signer.rs

@@ -149,7 +149,7 @@ impl<'a> CallbackSigner<'a> {
 impl Signer for CallbackSigner<'_> {
     fn sign(&self, data: &[u8]) -> c2pa::Result<Vec<u8>> {
         self.callback.sign(data).map_err(|e| {
-            eprintln!("Unable to embed signature into asset. {}", e);
+            eprintln!("Unable to embed signature into asset. {e}");
             Error::EmbeddingError
         })
     }

cli/src/main.rs

@@ -253,15 +253,15 @@ fn load_trust_resource(resource: &TrustResource) -> Result<String> {
     match resource {
         TrustResource::File(path) => {
             let data = std::fs::read_to_string(path)
-                .with_context(|| format!("Failed to read trust resource from path: {:?}", path))?;
+                .with_context(|| format!("Failed to read trust resource from path: {path:?}"))?;
 
             Ok(data)
         }
         TrustResource::Url(url) => {
             #[cfg(not(target_os = "wasi"))]
             let data = reqwest::blocking::get(url.to_string())?
                 .text()
-                .with_context(|| format!("Failed to read trust resource from URL: {}", url))?;
+                .with_context(|| format!("Failed to read trust resource from URL: {url}"))?;
 
             #[cfg(target_os = "wasi")]
             let data = blocking_get(&url.to_string())?;
@@ -376,7 +376,7 @@ fn configure_sdk(args: &CliArgs) -> Result<()> {
     {
         if let Some(trust_list) = &trust_anchors {
             let data = load_trust_resource(trust_list)?;
-            debug!("Using trust anchors from {:?}", trust_list);
+            debug!("Using trust anchors from {trust_list:?}");
             let replacement_val = serde_json::Value::String(data).to_string(); // escape string
             let setting = TA.replace("replacement_val", &replacement_val);
 
@@ -387,7 +387,7 @@ fn configure_sdk(args: &CliArgs) -> Result<()> {
 
         if let Some(allowed_list) = &allowed_list {
             let data = load_trust_resource(allowed_list)?;
-            debug!("Using allowed list from {:?}", allowed_list);
+            debug!("Using allowed list from {allowed_list:?}");
             let replacement_val = serde_json::Value::String(data).to_string(); // escape string
             let setting = AL.replace("replacement_val", &replacement_val);
 
@@ -398,7 +398,7 @@ fn configure_sdk(args: &CliArgs) -> Result<()> {
 
         if let Some(trust_config) = &trust_config {
             let data = load_trust_resource(trust_config)?;
-            debug!("Using trust config from {:?}", trust_config);
+            debug!("Using trust config from {trust_config:?}");
             let replacement_val = serde_json::Value::String(data).to_string(); // escape string
             let setting = TC.replace("replacement_val", &replacement_val);
 
@@ -456,7 +456,7 @@ fn sign_fragmented(
                     }
                 }
 
-                println!("Adding manifest to: {:?}", p);
+                println!("Adding manifest to: {p:?}");
                 let new_output_path =
                     output_path.join(init_dir.file_name().context("invalid file name")?);
                 builder.sign_fragmented_files(signer, &p, &fragments, &new_output_path)?;
@@ -467,7 +467,7 @@ fn sign_fragmented(
         }
     }
     if count == 0 {
-        println!("No files matching pattern: {}", ip);
+        println!("No files matching pattern: {ip}");
     }
     Ok(())
 }
@@ -499,11 +499,11 @@ fn verify_fragmented(init_pattern: &Path, frag_pattern: &Path) -> Result<Vec<Rea
                     }
                 }
 
-                println!("Verifying manifest: {:?}", p);
+                println!("Verifying manifest: {p:?}");
                 let reader = Reader::from_fragmented_files(p, &fragments)?;
                 if let Some(vs) = reader.validation_status() {
                     if let Some(e) = vs.iter().find(|v| !v.passed()) {
-                        eprintln!("Error validating segments: {:?}", e);
+                        eprintln!("Error validating segments: {e:?}");
                         return Ok(readers);
                     }
                 }
@@ -517,7 +517,7 @@ fn verify_fragmented(init_pattern: &Path, frag_pattern: &Path) -> Result<Vec<Rea
     }
 
     if count == 0 {
-        println!("No files matching pattern: {}", ip);
+        println!("No files matching pattern: {ip}");
     }
 
     Ok(readers)
@@ -739,9 +739,9 @@ fn main() -> Result<()> {
                 let mut reader = Reader::from_file(&output).map_err(special_errs)?;
                 validate_cawg(&mut reader)?;
                 if args.detailed {
-                    println!("{:#?}", reader);
+                    println!("{reader:#?}");
                 } else {
-                    println!("{}", reader)
+                    println!("{reader}")
                 }
             }
         } else {
@@ -775,7 +775,7 @@ fn main() -> Result<()> {
             if args.detailed {
                 // for a detailed report first call the above to generate the thumbnails
                 // then call this to add the detailed report
-                let detailed = format!("{:#?}", reader);
+                let detailed = format!("{reader:#?}");
                 File::create(output.join("detailed.json"))?.write_all(&detailed.into_bytes())?;
             }
             File::create(output.join("manifest_store.json"))?.write_all(&report.into_bytes())?;
@@ -789,7 +789,7 @@ fn main() -> Result<()> {
     } else if args.detailed {
         let mut reader = Reader::from_file(&args.path).map_err(special_errs)?;
         validate_cawg(&mut reader)?;
-        println!("{:#?}", reader);
+        println!("{reader:#?}");
     } else if let Some(Commands::Fragment {
         fragments_glob: Some(fg),
     }) = &args.command
@@ -807,7 +807,7 @@ fn main() -> Result<()> {
     } else {
         let mut reader = Reader::from_file(&args.path).map_err(special_errs)?;
         validate_cawg(&mut reader)?;
-        println!("{}", reader);
+        println!("{reader}");
     }
 
     Ok(())
@@ -862,7 +862,7 @@ pub mod tests {
         let ms = Reader::from_file(output_path)
             .expect("from_file")
             .to_string();
-        println!("{}", ms);
+        println!("{ms}");
         //let ms = report_from_path(&OUTPUT_PATH, false).expect("report_from_path");
         assert!(ms.contains("my_key"));
     }

cli/src/tree.rs

@@ -34,9 +34,9 @@ fn populate_node(
             if let Some(label) = ingredient.active_manifest() {
                 // create new node
                 let data = if name_only {
-                    format!("{}_{}", title, label)
+                    format!("{title}_{label}")
                 } else {
-                    format!("Asset:{}, Manifest:{}", title, label)
+                    format!("Asset:{title}, Manifest:{label}")
                 };
 
                 let new_token = current_token.append(tree, data);
@@ -83,7 +83,7 @@ pub fn tree<P: AsRef<Path>>(path: P) -> Result<String> {
 
     // walk through the manifests and show the contents
     Ok(if let Some(manifest_label) = reader.active_label() {
-        let data = format!("Asset:{}, Manifest:{}", asset_name, manifest_label);
+        let data = format!("Asset:{asset_name}, Manifest:{manifest_label}");
         let (mut tree, root_token) = Arena::with_data(data);
         populate_node(&mut tree, &reader, manifest_label, &root_token, false)?;
         // print tree

export_schema/src/main.rs

@@ -5,11 +5,11 @@ use c2pa::{settings::Settings, Builder, ManifestDefinition, Reader};
 use schemars::{schema::RootSchema, schema_for};
 
 fn write_schema(schema: &RootSchema, name: &str) {
-    println!("Exporting JSON schema for {}", name);
+    println!("Exporting JSON schema for {name}");
     let output = serde_json::to_string_pretty(schema).expect("Failed to serialize schema");
     let output_dir = Path::new("./target/schema");
     fs::create_dir_all(output_dir).expect("Could not create schema directory");
-    let output_path = output_dir.join(format!("{}.schema.json", name));
+    let output_path = output_dir.join(format!("{name}.schema.json"));
     fs::write(&output_path, output).expect("Unable to write schema");
     println!("Wrote schema to {}", output_path.display());
 }

make_test_images/src/compare_manifests.rs

@@ -27,12 +27,12 @@ pub fn compare_folders<P: AsRef<Path>, Q: AsRef<Path>>(folder1: P, folder2: Q) -
     if folder1.is_file() && folder2.is_file() {
         let issues = compare_image_manifests(folder1, folder2)?;
         if !issues.is_empty() {
-            eprintln!("Failed {:?}", folder1);
+            eprintln!("Failed {folder1:?}");
             for issue in issues {
-                eprintln!("  {}", issue);
+                eprintln!("  {issue}");
             }
         } else {
-            println!("Passed {:?}", folder1);
+            println!("Passed {folder1:?}");
         }
         return Ok(());
     } else if !(folder1.is_dir() && folder2.is_dir()) {
@@ -61,12 +61,12 @@ pub fn compare_folders<P: AsRef<Path>, Q: AsRef<Path>>(folder1: P, folder2: Q) -
                 ));
             }
             if !issues.is_empty() {
-                eprintln!("Failed {:?}", relative_path);
+                eprintln!("Failed {relative_path:?}");
                 for issue in issues {
-                    eprintln!("  {}", issue);
+                    eprintln!("  {issue}");
                 }
             } else {
-                println!("Passed {:?}", relative_path);
+                println!("Passed {relative_path:?}");
             }
         }
     }
@@ -126,7 +126,7 @@ pub fn compare_manifests(
         let value1 = serde_json::to_value(manifest_store1.get_manifest(label1))?;
         let value2 = serde_json::to_value(manifest_store2.get_manifest(label2))?;
         compare_json_values(
-            &format!("manifests.{}", label1),
+            &format!("manifests.{label1}"),
             &value1,
             &value2,
             &mut issues,
@@ -181,18 +181,18 @@ fn compare_json_values(
         (serde_json::Value::Object(map1), serde_json::Value::Object(map2)) => {
             for (key, val1) in map1 {
                 let val2 = map2.get(key).unwrap_or(&serde_json::Value::Null);
-                compare_json_values(&format!("{}.{}", path, key), val1, val2, issues);
+                compare_json_values(&format!("{path}.{key}"), val1, val2, issues);
             }
 
             for (key, value) in map2 {
                 if map1.get(key).is_none() {
-                    issues.push(format!("Added {}.{}: {}", path, key, value));
+                    issues.push(format!("Added {path}.{key}: {value}"));
                 }
             }
         }
         (serde_json::Value::Array(arr1), serde_json::Value::Array(arr2)) => {
             for (i, (val1, val2)) in arr1.iter().zip(arr2.iter()).enumerate() {
-                compare_json_values(&format!("{}[{}]", path, i), val1, val2, issues);
+                compare_json_values(&format!("{path}[{i}]"), val1, val2, issues);
             }
         }
         (val1, val2) if val1 != val2 => {
@@ -265,11 +265,11 @@ fn compare_json_values(
             }
 
             if val2.is_null() {
-                issues.push(format!("Missing {}: {}", path, val1));
+                issues.push(format!("Missing {path}: {val1}"));
             } else if val2.is_null() {
-                issues.push(format!("Added {}: {}", path, val2));
+                issues.push(format!("Added {path}: {val2}"));
             } else {
-                issues.push(format!("Changed {}: {} vs {}", path, val1, val2));
+                issues.push(format!("Changed {path}: {val1} vs {val2}"));
             }
         }
         _ => (),

sdk/examples/fragmented_bmff.rs

@@ -154,7 +154,7 @@ mod cawg {
                         }
                     }
 
-                    println!("Adding manifest to: {:?}", p);
+                    println!("Adding manifest to: {p:?}");
                     let new_output_path =
                         output_path.join(init_dir.file_name().context("invalid file name")?);
                     builder.sign_fragmented_files(signer, &p, &fragments, &new_output_path)?;
@@ -165,7 +165,7 @@ mod cawg {
             }
         }
         if count == 0 {
-            println!("No files matching pattern: {}", ip);
+            println!("No files matching pattern: {ip}");
         }
         Ok(())
     }