Use new format!() syntax

Author: orf

src/aws.rs

@@ -67,7 +67,7 @@ pub fn check_aws_keys(matches: Vec<ScannerMatch>) -> Result<Vec<LiveKey>> {
                     });
                 }
                 Err(e) => {
-                    eprintln!("sts error: {:?}", e);
+                    eprintln!("sts error: {e:?}");
                     continue;
                 }
             }

src/main.rs

@@ -81,10 +81,10 @@ fn run(state_path: PathBuf, save: bool, limit: usize, sources: Vec<SourceType>)
         .map(|s| -> Result<_> {
             let source_data = state.data_for_source(&s);
             let mut source = s.create_source(source_data).expect("Error creating source");
-            println!("Fetching data for source {}", source);
+            println!("Fetching data for source {source}");
             let packages = source
                 .get_new_packages_to_process(limit)
-                .with_context(|| format!("Failed to get packages to process for source {:?}", s))?;
+                .with_context(|| format!("Failed to get packages to process for source {s:?}"))?;
             println!("Source {:?} found {} packages", s, packages.len());
             let stats = source.get_stats();
             stats.add_packages_searched(packages.len() as u64);
@@ -114,13 +114,11 @@ fn run(state_path: PathBuf, save: bool, limit: usize, sources: Vec<SourceType>)
             let source = download.package.source.clone();
             let result = scanner.quick_check(download).with_context(|| {
                 format!(
-                    "Error running quick check on {:?} / {} @ {}",
-                    source, name, version
+                    "Error running quick check on {source:?} / {name} @ {version}"
                 )
             });
             println!(
-                "Finished quick check on {:?} / {} @ {}",
-                source, name, version
+                "Finished quick check on {source:?} / {name} @ {version}"
             );
             result
         })
@@ -143,7 +141,7 @@ fn run(state_path: PathBuf, save: bool, limit: usize, sources: Vec<SourceType>)
 
     let live_keys = check_aws_keys(all_matches?.into_iter().flatten().collect())
         .context("Error checking AWS keys")?;
-    println!("Live keys: {:?}", live_keys);
+    println!("Live keys: {live_keys:?}");
 
     create_findings(live_keys)?;
 

src/reporter.rs

@@ -87,7 +87,7 @@ pub fn create_findings(items: Vec<LiveKey>) -> Result<()> {
         ));
         let _ = fs::create_dir_all(output_dir);
         fs::write(&output_path, rendered).unwrap();
-        println!("Created file {:?}", output_path);
+        println!("Created file {output_path:?}");
     }
     Ok(())
 }

src/scanners/mod.rs

@@ -116,7 +116,7 @@ impl Scanner {
             "--json",
             package.downloaded_package.extract_dir.to_str().unwrap(),
         ])?;
-        println!("matches: {:?}", matches);
+        println!("matches: {matches:?}");
         let mut matched_keys = vec![];
         // The output may contain multiple matches for our second-stage regex.
         // Here we create a cartesian product product of all matches.

src/scanners/ripgrep.rs

@@ -36,11 +36,11 @@ pub fn run_ripgrep(args: &[&str]) -> Result<Vec<RipGrepMatch>> {
     let output = Command::new("rg")
         .args(args)
         .output()
-        .with_context(|| format!("Error running rg with args {:?}", args))?;
+        .with_context(|| format!("Error running rg with args {args:?}"))?;
 
     if !output.stderr.is_empty() {
         for line in output.stderr.lines().flatten() {
-            eprintln!("{}", line);
+            eprintln!("{line}");
         }
     }
 

src/sources/hexpm.rs

@@ -60,7 +60,7 @@ impl Source for HexPmSource {
             if results.len() >= limit {
                 break;
             }
-            let url = format!("{}&page={}", base_url, page);
+            let url = format!("{base_url}&page={page}");
             // ToDo: Replace the user agent with a link to the repo
             let response = client
                 .get(url)

src/sources/pypi.rs

@@ -57,7 +57,7 @@ impl Source for PyPiSource {
             Request::new("changelog_since_serial").arg(self.changelog_serial as i32);
         let res = changelog_request
             .call_url("https://pypi.org/pypi")
-            .with_context(|| format!("Error getting changelog serial: {:?}", changelog_request))?;
+            .with_context(|| format!("Error getting changelog serial: {changelog_request:?}"))?;
         let changelog_items: Vec<_> = match res {
             Value::Array(items) => {
                 let only_xml_vecs = items.iter().filter_map(|item| match item {
@@ -84,7 +84,7 @@ impl Source for PyPiSource {
             .max_by_key(|v| *v)
             .ok_or_else(|| anyhow!("No changelog items found"))?;
 
-        println!("Highest timestamp: {}", highest_datetime);
+        println!("Highest timestamp: {highest_datetime}");
 
         self.changelog_serial = highest_serial;
         self.last_package_timestamp = Some(highest_datetime);
@@ -105,7 +105,7 @@ impl Source for PyPiSource {
             .into_par_iter()
             .map(|((name, version), changelogs)| {
                 fetch_download_url_for_package(&name, &version, changelogs)
-                    .with_context(|| format!("Error fetching PyPi package {} - {}", name, version))
+                    .with_context(|| format!("Error fetching PyPi package {name} - {version}"))
             })
             .collect();
         let mut flattened_packages: Vec<_> = packages_to_process
@@ -177,7 +177,7 @@ fn fetch_download_url_for_package(
         .get(&url)
         .header("User-Agent", "https://github.com/orf/aws-creds-scanner")
         .send()
-        .with_context(|| format!("Failed to request URL {}", url))?;
+        .with_context(|| format!("Failed to request URL {url}"))?;
     // Some versions are not valid URLs. For example, `weightless-core @ 0.5.2.3-seecr-%`
     // These result in 400's, in which case we just return [].
     if response.status() == 404 || response.status() == 400 {
@@ -189,11 +189,10 @@ fn fetch_download_url_for_package(
 
     let text = response
         .text()
-        .with_context(|| format!("Error fetching text for URL {}", url))?;
+        .with_context(|| format!("Error fetching text for URL {url}"))?;
     let response: PyPiResponse = serde_json::from_str(&text).with_context(|| {
         format!(
-            "Failed to read JSON for URL {} - Status: {}. Text: {}",
-            url, status, text
+            "Failed to read JSON for URL {url} - Status: {status}. Text: {text}"
         )
     })?;
 

src/sources/rubygems.rs

@@ -61,12 +61,12 @@ impl Source for RubyGemsSource {
             if results.len() >= limit {
                 break;
             }
-            let url = format!("{}&page={}", base_url, page);
+            let url = format!("{base_url}&page={page}");
             let response = reqwest::blocking::get(&url)
-                .with_context(|| format!("Failed to request {}", url))?;
+                .with_context(|| format!("Failed to request {url}"))?;
             let ruby_response: Vec<RubyGemsResponse> = response
                 .json()
-                .with_context(|| format!("Failed to parse JSON from {}", url))?;
+                .with_context(|| format!("Failed to parse JSON from {url}"))?;
             if ruby_response.is_empty() {
                 break;
             } else {