1this derivation will be built:2 /nix/store/sl5i6pai9cpnza802956pbcdn4kxdaxf-treefmt-check.drv3building '/nix/store/sl5i6pai9cpnza802956pbcdn4kxdaxf-treefmt-check.drv' on 'ssh-ng://nix@eliza'4building '/nix/store/sl5i6pai9cpnza802956pbcdn4kxdaxf-treefmt-check.drv'5treefmt-check> treefmt v2.5.0traversed 28 files6treefmt-check> emitted 17 files for processing7treefmt-check> formatted 17 files (2 changed) in 64ms8treefmt-check> M src/render.rs9treefmt-check> M tests/snapshot_test.rs10treefmt-check> diff --git a/src/render.rs b/src/render.rs11treefmt-check> index 8643320..b5fa250 10064412treefmt-check> --- a/src/render.rs13treefmt-check> +++ b/src/render.rs14treefmt-check> @@ -497,8 +497,11 @@ impl Renderer {15treefmt-check> // matching on UnicodeWords better tokenizes words, paths, and other16treefmt-check> // non-space-delimited items, which gets us much more reliable inline17treefmt-check> // highlights18treefmt-check> - for change in diff.iter_inline_changes_with_options(op,19treefmt-check> - *similar::InlineChangeOptions::new().mode(similar::InlineChangeMode::UnicodeWords)) {20treefmt-check> + for change in diff.iter_inline_changes_with_options(21treefmt-check> + op,22treefmt-check> + *similar::InlineChangeOptions::new()23treefmt-check> + .mode(similar::InlineChangeMode::UnicodeWords),24treefmt-check> + ) {25treefmt-check> let (color, sign): (&[u8], &[u8]) = match change.tag() {26treefmt-check> ChangeTag::Delete => (self.red(), b"- "),27treefmt-check> ChangeTag::Insert => (self.green(), b"+ "),28treefmt-check> diff --git a/tests/snapshot_test.rs b/tests/snapshot_test.rs29treefmt-check> index 027d45d..b04ddbb 10064430treefmt-check> --- a/tests/snapshot_test.rs31treefmt-check> +++ b/tests/snapshot_test.rs32treefmt-check> @@ -14,13 +14,18 @@ fn normalize_readable_nix_output(output: &str, store_dir: &str) -> String {33treefmt-check> 34treefmt-check> // match against the file path diffs, which are never inline highlighted35treefmt-check> let re = regex::Regex::new(r"^<red>\-\-\- /nix/store/[a-z0-9]{32}-").unwrap();36treefmt-check> - normalized = re.replace_all(&normalized, r"<red>--- /nix/store/HASH-").to_string();37treefmt-check> + normalized = re38treefmt-check> + .replace_all(&normalized, r"<red>--- /nix/store/HASH-")39treefmt-check> + .to_string();40treefmt-check> 41treefmt-check> let re = regex::Regex::new(r"<grn>\+\+\+ /nix/store/[a-z0-9]{32}-").unwrap();42treefmt-check> - normalized = re.replace_all(&normalized, r"<grn>+++ /nix/store/HASH-").to_string();43treefmt-check> + normalized = re44treefmt-check> + .replace_all(&normalized, r"<grn>+++ /nix/store/HASH-")45treefmt-check> + .to_string();46treefmt-check> 47treefmt-check> let re = regex::Regex::new(r"/nix/store/(<rev>)[a-z0-9]{32}(</rev>)-").unwrap();48treefmt-check> - re.replace_all(&normalized, r"/nix/store/<rev>HASH</rev>-").to_string()49treefmt-check> + re.replace_all(&normalized, r"/nix/store/<rev>HASH</rev>-")50treefmt-check> + .to_string()51treefmt-check> }52treefmt-check> 53treefmt-check> // Normalize store paths and hashes for consistent snapshots54treefmt-check> @@ -33,7 +38,6 @@ fn normalize_nix_output(output: &str, store_dir: &str) -> String {55treefmt-check> re.replace_all(&normalized, "/nix/store/HASH-").to_string()56treefmt-check> }57treefmt-check> 58treefmt-check> -59treefmt-check> fn run_nix_diff(file1: &str, file2: &str) -> String {60treefmt-check> let tests_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests");61treefmt-check> let (nix_root, env_vars) = setup_nix_env();62error: build of '/nix/store/sl5i6pai9cpnza802956pbcdn4kxdaxf-treefmt-check.drv' on 'ssh-ng://nix@eliza' failed: Cannot build '/nix/store/sl5i6pai9cpnza802956pbcdn4kxdaxf-treefmt-check.drv'.63 Reason: builder failed with exit code 1.64 Output paths:65 /nix/store/hgl4xj176k9lyjn5pppa4fm0n7l8laz9-treefmt-check66 Last 25 log lines:67 > + normalized = re68 > + .replace_all(&normalized, r"<red>--- /nix/store/HASH-")69 > + .to_string();70 > 71 > let re = regex::Regex::new(r"<grn>\+\+\+ /nix/store/[a-z0-9]{32}-").unwrap();72 > - normalized = re.replace_all(&normalized, r"<grn>+++ /nix/store/HASH-").to_string();73 > + normalized = re74 > + .replace_all(&normalized, r"<grn>+++ /nix/store/HASH-")75 > + .to_string();76 > 77 > let re = regex::Regex::new(r"/nix/store/(<rev>)[a-z0-9]{32}(</rev>)-").unwrap();78 > - re.replace_all(&normalized, r"/nix/store/<rev>HASH</rev>-").to_string()79 > + re.replace_all(&normalized, r"/nix/store/<rev>HASH</rev>-")80 > + .to_string()81 > }82 > 83 > // Normalize store paths and hashes for consistent snapshots84 > @@ -33,7 +38,6 @@ fn normalize_nix_output(output: &str, store_dir: &str) -> String {85 > re.replace_all(&normalized, "/nix/store/HASH-").to_string()86 > }87 > 88 > -89 > fn run_nix_diff(file1: &str, file2: &str) -> String {90 > let tests_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests");91 > let (nix_root, env_vars) = setup_nix_env();92 For full logs, run:93 nix log /nix/store/sl5i6pai9cpnza802956pbcdn4kxdaxf-treefmt-check.drv94error: Cannot build '/nix/store/sl5i6pai9cpnza802956pbcdn4kxdaxf-treefmt-check.drv'.95 Reason: builder failed with exit code 1.96 Output paths:97 /nix/store/hgl4xj176k9lyjn5pppa4fm0n7l8laz9-treefmt-check