1this derivation will be built:2 /nix/store/mf20hl02f99y1krzqaw8zrd0yv6zi9w6-treefmt-check.drv3building '/nix/store/mf20hl02f99y1krzqaw8zrd0yv6zi9w6-treefmt-check.drv'4treefmt-check> treefmt v2.5.0traversed 28 files5treefmt-check> emitted 17 files for processing6treefmt-check> formatted 17 files (8 changed) in 282ms7treefmt-check> M src/render.rs8treefmt-check> M tests/snapshot_test.rs9treefmt-check> diff --git a/src/render.rs b/src/render.rs10treefmt-check> index 8643320..b5fa250 10064411treefmt-check> --- a/src/render.rs12treefmt-check> +++ b/src/render.rs13treefmt-check> @@ -497,8 +497,11 @@ impl Renderer {14treefmt-check> // matching on UnicodeWords better tokenizes words, paths, and other15treefmt-check> // non-space-delimited items, which gets us much more reliable inline16treefmt-check> // highlights17treefmt-check> - for change in diff.iter_inline_changes_with_options(op,18treefmt-check> - *similar::InlineChangeOptions::new().mode(similar::InlineChangeMode::UnicodeWords)) {19treefmt-check> + for change in diff.iter_inline_changes_with_options(20treefmt-check> + op,21treefmt-check> + *similar::InlineChangeOptions::new()22treefmt-check> + .mode(similar::InlineChangeMode::UnicodeWords),23treefmt-check> + ) {24treefmt-check> let (color, sign): (&[u8], &[u8]) = match change.tag() {25treefmt-check> ChangeTag::Delete => (self.red(), b"- "),26treefmt-check> ChangeTag::Insert => (self.green(), b"+ "),27treefmt-check> diff --git a/tests/snapshot_test.rs b/tests/snapshot_test.rs28treefmt-check> index 027d45d..b04ddbb 10064429treefmt-check> --- a/tests/snapshot_test.rs30treefmt-check> +++ b/tests/snapshot_test.rs31treefmt-check> @@ -14,13 +14,18 @@ fn normalize_readable_nix_output(output: &str, store_dir: &str) -> String {32treefmt-check> 33treefmt-check> // match against the file path diffs, which are never inline highlighted34treefmt-check> let re = regex::Regex::new(r"^<red>\-\-\- /nix/store/[a-z0-9]{32}-").unwrap();35treefmt-check> - normalized = re.replace_all(&normalized, r"<red>--- /nix/store/HASH-").to_string();36treefmt-check> + normalized = re37treefmt-check> + .replace_all(&normalized, r"<red>--- /nix/store/HASH-")38treefmt-check> + .to_string();39treefmt-check> 40treefmt-check> let re = regex::Regex::new(r"<grn>\+\+\+ /nix/store/[a-z0-9]{32}-").unwrap();41treefmt-check> - normalized = re.replace_all(&normalized, r"<grn>+++ /nix/store/HASH-").to_string();42treefmt-check> + normalized = re43treefmt-check> + .replace_all(&normalized, r"<grn>+++ /nix/store/HASH-")44treefmt-check> + .to_string();45treefmt-check> 46treefmt-check> let re = regex::Regex::new(r"/nix/store/(<rev>)[a-z0-9]{32}(</rev>)-").unwrap();47treefmt-check> - re.replace_all(&normalized, r"/nix/store/<rev>HASH</rev>-").to_string()48treefmt-check> + re.replace_all(&normalized, r"/nix/store/<rev>HASH</rev>-")49treefmt-check> + .to_string()50treefmt-check> }51treefmt-check> 52treefmt-check> // Normalize store paths and hashes for consistent snapshots53treefmt-check> @@ -33,7 +38,6 @@ fn normalize_nix_output(output: &str, store_dir: &str) -> String {54treefmt-check> re.replace_all(&normalized, "/nix/store/HASH-").to_string()55treefmt-check> }56treefmt-check> 57treefmt-check> -58treefmt-check> fn run_nix_diff(file1: &str, file2: &str) -> String {59treefmt-check> let tests_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests");60treefmt-check> let (nix_root, env_vars) = setup_nix_env();61error: Cannot build '/nix/store/mf20hl02f99y1krzqaw8zrd0yv6zi9w6-treefmt-check.drv'.62 Reason: builder failed with exit code 1.63 Output paths:64 /nix/store/npmb2azl0ns4154ysg91b3iw7p65h2jq-treefmt-check65 Last 25 log lines:66 > + normalized = re67 > + .replace_all(&normalized, r"<red>--- /nix/store/HASH-")68 > + .to_string();69 > 70 > let re = regex::Regex::new(r"<grn>\+\+\+ /nix/store/[a-z0-9]{32}-").unwrap();71 > - normalized = re.replace_all(&normalized, r"<grn>+++ /nix/store/HASH-").to_string();72 > + normalized = re73 > + .replace_all(&normalized, r"<grn>+++ /nix/store/HASH-")74 > + .to_string();75 > 76 > let re = regex::Regex::new(r"/nix/store/(<rev>)[a-z0-9]{32}(</rev>)-").unwrap();77 > - re.replace_all(&normalized, r"/nix/store/<rev>HASH</rev>-").to_string()78 > + re.replace_all(&normalized, r"/nix/store/<rev>HASH</rev>-")79 > + .to_string()80 > }81 > 82 > // Normalize store paths and hashes for consistent snapshots83 > @@ -33,7 +38,6 @@ fn normalize_nix_output(output: &str, store_dir: &str) -> String {84 > re.replace_all(&normalized, "/nix/store/HASH-").to_string()85 > }86 > 87 > -88 > fn run_nix_diff(file1: &str, file2: &str) -> String {89 > let tests_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests");90 > let (nix_root, env_vars) = setup_nix_env();91 For full logs, run:92 nix log /nix/store/mf20hl02f99y1krzqaw8zrd0yv6zi9w6-treefmt-check.drv