rustfmt: set style_edition = "2024"

Author: taiki-e

.rustfmt.toml

@@ -8,7 +8,6 @@ error_on_line_overflow = true
 # Override the default formatting style.
 # See https://internals.rust-lang.org/t/running-rustfmt-on-rust-lang-rust-and-other-rust-lang-repositories/8732/81.
 use_small_heuristics = "Max"
-# This is the default of 2024 edition https://github.com/rust-lang/rust/pull/114764.
 # This is unstable (tracking issue: https://github.com/rust-lang/rustfmt/issues/3370)
 overflow_delimited_expr = true
 # This is unstable (tracking issue: https://github.com/rust-lang/rustfmt/issues/4991).
@@ -27,6 +26,7 @@ use_try_shorthand = true
 # Set the default settings again to always apply the proper formatting without
 # being affected by the editor settings.
 edition = "2021"
+style_edition = "2024"
 hard_tabs = false
 newline_style = "Unix"
 tab_spaces = 4

src/cargo.rs

@@ -2,7 +2,7 @@
 
 use std::ffi::OsStr;
 
-use anyhow::{bail, Context as _, Result};
+use anyhow::{Context as _, Result, bail};
 use camino::{Utf8Path, Utf8PathBuf};
 use cargo_config2::Config;
 
@@ -51,7 +51,9 @@ impl Workspace {
         let metadata = Metadata::new(current_manifest.as_std_path(), config.cargo())?;
         let mut target_for_config = config.build_target_for_config(target)?;
         if target_for_config.len() != 1 {
-            bail!("cargo-llvm-cov doesn't currently supports multi-target builds: {target_for_config:?}");
+            bail!(
+                "cargo-llvm-cov doesn't currently supports multi-target builds: {target_for_config:?}"
+            );
         }
         let target_for_config = target_for_config.pop().unwrap();
         let target_for_cli = config.build_target_for_cli(target)?.pop();
@@ -61,10 +63,14 @@ impl Workspace {
             rustc_version.nightly || env::var_os("RUSTC_BOOTSTRAP").unwrap_or_default() == "1";
 
         if doctests && !rustc_version.nightly {
-            warn!("--doctests flag requires nightly toolchain; consider using `cargo +nightly llvm-cov`");
+            warn!(
+                "--doctests flag requires nightly toolchain; consider using `cargo +nightly llvm-cov`"
+            );
         }
         if branch && !rustc_version.nightly {
-            warn!("--branch flag requires nightly toolchain; consider using `cargo +nightly llvm-cov`");
+            warn!(
+                "--branch flag requires nightly toolchain; consider using `cargo +nightly llvm-cov`"
+            );
         }
         if mcdc && !rustc_version.nightly {
             warn!(

src/cli.rs

@@ -2,7 +2,7 @@
 
 use std::{ffi::OsString, mem, str::FromStr};
 
-use anyhow::{bail, format_err, Error, Result};
+use anyhow::{Error, Result, bail, format_err};
 use camino::{Utf8Path, Utf8PathBuf};
 use lexopt::{
     Arg::{Long, Short, Value},
@@ -1208,7 +1208,9 @@ impl Args {
                 cargo_args.push(profile);
             }
             if nextest_archive_file.is_some() {
-                bail!("'--nextest-archive-file' is report-specific option; did you mean '--archive-file'?");
+                bail!(
+                    "'--nextest-archive-file' is report-specific option; did you mean '--archive-file'?"
+                );
             }
             nextest_archive_file = archive_file;
             if let Subcommand::Nextest { archive_file: f } = &mut subcommand {
@@ -1221,15 +1223,21 @@ impl Args {
             cargo_profile = profile;
             if let Subcommand::Report { nextest_archive_file: f } = &mut subcommand {
                 if archive_file.is_some() {
-                    bail!("'--archive-file' is nextest-specific option; did you mean '--nextest-archive-file'?");
+                    bail!(
+                        "'--archive-file' is nextest-specific option; did you mean '--nextest-archive-file'?"
+                    );
                 }
                 *f = nextest_archive_file.is_some();
             } else {
                 if archive_file.is_some() {
-                    bail!("'--archive-file' is nextest-specific option and not supported for this subcommand");
+                    bail!(
+                        "'--archive-file' is nextest-specific option and not supported for this subcommand"
+                    );
                 }
                 if nextest_archive_file.is_some() {
-                    bail!("'--nextest-archive-file' is report-specific option and not supported for this subcommand");
+                    bail!(
+                        "'--nextest-archive-file' is report-specific option and not supported for this subcommand"
+                    );
                 }
             }
         }

src/context.rs

@@ -6,7 +6,7 @@ use std::{
     path::PathBuf,
 };
 
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use camino::Utf8PathBuf;
 
 use crate::{
@@ -135,9 +135,13 @@ impl Context {
             (Some(llvm_cov), Some(llvm_profdata)) => (llvm_cov, llvm_profdata),
             (llvm_cov_env, llvm_profdata_env) => {
                 if llvm_cov_env.is_some() {
-                    warn!("setting only LLVM_COV environment variable may not work properly; consider setting both LLVM_COV and LLVM_PROFDATA environment variables");
+                    warn!(
+                        "setting only LLVM_COV environment variable may not work properly; consider setting both LLVM_COV and LLVM_PROFDATA environment variables"
+                    );
                 } else if llvm_profdata_env.is_some() {
-                    warn!("setting only LLVM_PROFDATA environment variable may not work properly; consider setting both LLVM_COV and LLVM_PROFDATA environment variables");
+                    warn!(
+                        "setting only LLVM_PROFDATA environment variable may not work properly; consider setting both LLVM_COV and LLVM_PROFDATA environment variables"
+                    );
                 }
                 // --print target-libdir (without --target flag) returns $sysroot/lib/rustlib/$host_triple/lib
                 // llvm-tools exists in $sysroot/lib/rustlib/$host_triple/bin
@@ -220,7 +224,9 @@ impl Context {
         if llvm_profdata_flags.is_none() {
             llvm_profdata_flags = env::var("CARGO_LLVM_PROFDATA_FLAGS")?;
             if llvm_profdata_flags.is_some() {
-                warn!("CARGO_LLVM_PROFDATA_FLAGS is deprecated; consider using LLVM_PROFDATA_FLAGS instead");
+                warn!(
+                    "CARGO_LLVM_PROFDATA_FLAGS is deprecated; consider using LLVM_PROFDATA_FLAGS instead"
+                );
             }
         }
 
@@ -234,7 +240,9 @@ impl Context {
                 Ok(exe) => exe,
                 Err(e) => {
                     let exe = format!("cargo-llvm-cov{}", env::consts::EXE_SUFFIX);
-                    warn!("failed to get current executable, assuming {exe} in PATH as current executable: {e}");
+                    warn!(
+                        "failed to get current executable, assuming {exe} in PATH as current executable: {e}"
+                    );
                     exe.into()
                 }
             },

src/fs.rs

@@ -3,7 +3,7 @@
 pub(crate) use std::fs::Metadata;
 use std::{ffi::OsStr, io, path::Path};
 
-pub(crate) use fs_err::{create_dir_all, read_dir, symlink_metadata, write, File};
+pub(crate) use fs_err::{File, create_dir_all, read_dir, symlink_metadata, write};
 
 /// Removes a file from the filesystem **if exists**. (Similar to `rm -f`)
 pub(crate) fn remove_file(path: impl AsRef<Path>) -> io::Result<()> {

src/main.rs

@@ -17,7 +17,7 @@ use std::{
     time::SystemTime,
 };
 
-use anyhow::{bail, Context as _, Result};
+use anyhow::{Context as _, Result, bail};
 use camino::{Utf8Path, Utf8PathBuf};
 use cargo_config2::Flags;
 use cargo_llvm_cov::json::{CodeCovJsonExport, CoverageKind, LlvmCovJsonExport};
@@ -786,19 +786,27 @@ fn object_files(cx: &Context) -> Result<Vec<OsString>> {
                     if binaries_metadata.rust_build_meta.base_output_directories.len() == 1 =>
                 {
                     if cx.args.target.is_some() {
-                        info!("--target flag is no longer needed because detection from nextest archive is now supported");
+                        info!(
+                            "--target flag is no longer needed because detection from nextest archive is now supported"
+                        );
                     }
                     if cx.args.release {
-                        info!("--release flag is no longer needed because detection from nextest archive is now supported");
+                        info!(
+                            "--release flag is no longer needed because detection from nextest archive is now supported"
+                        );
                     }
                     if cx.args.cargo_profile.is_some() {
-                        info!("--cargo-profile flag is no longer needed because detection from nextest archive is now supported");
+                        info!(
+                            "--cargo-profile flag is no longer needed because detection from nextest archive is now supported"
+                        );
                     }
                     target_dir.push(&binaries_metadata.rust_build_meta.base_output_directories[0]);
                     auto_detect_profile = true;
                 }
                 res => {
-                    warn!("found binaries-metadata.json in nextest archive {archive_file:?}, but has unsupported or incompatible format: {res:?}");
+                    warn!(
+                        "found binaries-metadata.json in nextest archive {archive_file:?}, but has unsupported or incompatible format: {res:?}"
+                    );
                 }
             }
         }
@@ -1212,8 +1220,12 @@ fn ignore_filename_regex(cx: &Context, object_files: &[OsString]) -> Result<Opti
         if let Some(dep) = &cx.args.cov.dep_coverage {
             let format = Format::Json;
             let json = format.get_json(cx, object_files, None).context("failed to get json")?;
-            let crates_io_re = Regex::new(&format!("{SEPARATOR}registry{SEPARATOR}src{SEPARATOR}index\\.crates\\.io-[0-9a-f]+{SEPARATOR}[0-9A-Za-z-_]+-[0-9]+\\.[0-9]+\\.[0-9]+(-[0-9A-Za-z\\.-]+)?(\\+[0-9A-Za-z\\.-]+)?{SEPARATOR}"))?;
-            let dep_re = Regex::new(&format!("{SEPARATOR}registry{SEPARATOR}src{SEPARATOR}index\\.crates\\.io-[0-9a-f]+{SEPARATOR}{dep}-[0-9]+\\.[0-9]+\\.[0-9]+(-[0-9A-Za-z\\.-]+)?(\\+[0-9A-Za-z\\.-]+)?{SEPARATOR}"))?;
+            let crates_io_re = Regex::new(&format!(
+                "{SEPARATOR}registry{SEPARATOR}src{SEPARATOR}index\\.crates\\.io-[0-9a-f]+{SEPARATOR}[0-9A-Za-z-_]+-[0-9]+\\.[0-9]+\\.[0-9]+(-[0-9A-Za-z\\.-]+)?(\\+[0-9A-Za-z\\.-]+)?{SEPARATOR}"
+            ))?;
+            let dep_re = Regex::new(&format!(
+                "{SEPARATOR}registry{SEPARATOR}src{SEPARATOR}index\\.crates\\.io-[0-9a-f]+{SEPARATOR}{dep}-[0-9]+\\.[0-9]+\\.[0-9]+(-[0-9A-Za-z\\.-]+)?(\\+[0-9A-Za-z\\.-]+)?{SEPARATOR}"
+            ))?;
             let mut set = BTreeSet::new();
             for data in &json.data {
                 for file in &data.files {
@@ -1264,11 +1276,7 @@ fn ignore_filename_regex(cx: &Context, object_files: &[OsString]) -> Result<Opti
         }
     }
 
-    if out.0.is_empty() {
-        Ok(None)
-    } else {
-        Ok(Some(out.0))
-    }
+    if out.0.is_empty() { Ok(None) } else { Ok(Some(out.0)) }
 }
 
 fn resolve_excluded_paths(cx: &Context) -> Vec<Utf8PathBuf> {

src/metadata.rs

@@ -4,7 +4,7 @@
 
 use std::{collections::HashMap, ffi::OsStr, path::Path};
 
-use anyhow::{format_err, Context as _, Result};
+use anyhow::{Context as _, Result, format_err};
 use camino::Utf8PathBuf;
 use serde_json::{Map, Value};
 
@@ -118,18 +118,10 @@ impl Target {
 // }
 
 fn into_string<S: From<String>>(value: Value) -> Option<S> {
-    if let Value::String(string) = value {
-        Some(string.into())
-    } else {
-        None
-    }
+    if let Value::String(string) = value { Some(string.into()) } else { None }
 }
 fn into_array(value: Value) -> Option<Vec<Value>> {
-    if let Value::Array(array) = value {
-        Some(array)
-    } else {
-        None
-    }
+    if let Value::Array(array) = value { Some(array) } else { None }
 }
 // fn into_object(value: Value) -> Option<Object> {
 //     if let Value::Object(object) = value {

tests/auxiliary/mod.rs

@@ -139,11 +139,7 @@ pub(crate) fn perturb_one_header(workspace_root: &Path) -> Option<PathBuf> {
     let target_dir = workspace_root.join("target").join("llvm-cov-target");
     let path = fs::read_dir(target_dir).unwrap().find_map(|entry| {
         let path = entry.ok().unwrap().path();
-        if path.extension() == Some(OsStr::new("profraw")) {
-            Some(path)
-        } else {
-            None
-        }
+        if path.extension() == Some(OsStr::new("profraw")) { Some(path) } else { None }
     });
     if let Some(path) = &path {
         perturb_header(path);

tests/fixtures/coverage-reports/cargo_config/cargo_config.codecov.json

@@ -1 +1 @@
-{"coverage":{"src/lib.rs":{"1":"1/1","2":"1/1","3":"0/1","5":"1/1","7":"1/1","10":"1/1","11":"1/1","12":"1/1","15":"1/1"}}}
+{"coverage":{"src/lib.rs":{"1":"1/1","2":"2/3","3":"1/1","6":"1/1","7":"1/1","8":"1/1","11":"1/1"}}}

tests/fixtures/coverage-reports/cargo_config/cargo_config.hide-instantiations.txt

@@ -1,15 +1,12 @@
     1|      1|fn func(x: i32) -> bool {
-    2|      1|    if x < 0 {
-    3|      0|        true
-    4|       |    } else {
-    5|      1|        false
-    6|       |    }
-    7|      1|}
-    8|       |
-    9|       |#[test]
-   10|      1|fn test() {
-   11|      1|    #[cfg(a)]
-   12|      1|    assert!(!func(1));
-   13|       |    #[cfg(not(a))]
-   14|       |    assert!(func(-1));
-   15|      1|}
+    2|      1|    if x < 0 { true } else { false }
+                             ^0
+    3|      1|}
+    4|       |
+    5|       |#[test]
+    6|      1|fn test() {
+    7|      1|    #[cfg(a)]
+    8|      1|    assert!(!func(1));
+    9|       |    #[cfg(not(a))]
+   10|       |    assert!(func(-1));
+   11|      1|}