this derivation will be built: /nix/store/87bchlm3mfiay3a0sdpfxkyg4a5smvcx-treefmt-check.drv building '/nix/store/87bchlm3mfiay3a0sdpfxkyg4a5smvcx-treefmt-check.drv' on 'ssh-ng://customer@mac02' building '/nix/store/87bchlm3mfiay3a0sdpfxkyg4a5smvcx-treefmt-check.drv' treefmt-check> treefmt v2.5.0traversed 724 files treefmt-check> emitted 298 files for processing treefmt-check> formatted 298 files (3 changed) in 1.03s treefmt-check> M crates/tinc-crypto/src/invite.rs treefmt-check> M crates/tinc-tools/src/cmd/invite.rs treefmt-check> M crates/tinc-tools/src/cmd/join/tests.rs treefmt-check> diff --git a/crates/tinc-crypto/src/invite.rs b/crates/tinc-crypto/src/invite.rs treefmt-check> index 39291b9..82c4fd2 100644 treefmt-check> --- a/crates/tinc-crypto/src/invite.rs treefmt-check> +++ b/crates/tinc-crypto/src/invite.rs treefmt-check> @@ -214,12 +214,18 @@ mod tests { treefmt-check> treefmt-check> #[test] treefmt-check> fn replace_marker() { treefmt-check> - assert_eq!(strip_replace_marker(b"Name = a\n"), (None, &b"Name = a\n"[..])); treefmt-check> + assert_eq!( treefmt-check> + strip_replace_marker(b"Name = a\n"), treefmt-check> + (None, &b"Name = a\n"[..]) treefmt-check> + ); treefmt-check> assert_eq!( treefmt-check> strip_replace_marker(b"#replace abc\nName = a\n"), treefmt-check> (Some(&b"abc"[..]), &b"Name = a\n"[..]) treefmt-check> ); treefmt-check> - assert_eq!(strip_replace_marker(b"#replace abc"), (Some(&b"abc"[..]), &b""[..])); treefmt-check> + assert_eq!( treefmt-check> + strip_replace_marker(b"#replace abc"), treefmt-check> + (Some(&b"abc"[..]), &b""[..]) treefmt-check> + ); treefmt-check> } treefmt-check> treefmt-check> /// `key_hash(pk) == fingerprint_hash(fingerprint(pk))`. The KAT treefmt-check> diff --git a/crates/tinc-tools/src/cmd/invite.rs b/crates/tinc-tools/src/cmd/invite.rs treefmt-check> index 140036a..44153e9 100644 treefmt-check> --- a/crates/tinc-tools/src/cmd/invite.rs treefmt-check> +++ b/crates/tinc-tools/src/cmd/invite.rs treefmt-check> @@ -54,8 +54,8 @@ use std::time::{Duration, SystemTime}; treefmt-check> treefmt-check> use rand_core::Rng; treefmt-check> use tinc_conf::Config; treefmt-check> -use tinc_crypto::invite::{COOKIE_LEN, REPLACE_MARKER, SLUG_PART_LEN, build_slug, cookie_filename}; treefmt-check> use tinc_crypto::b64; treefmt-check> +use tinc_crypto::invite::{COOKIE_LEN, REPLACE_MARKER, SLUG_PART_LEN, build_slug, cookie_filename}; treefmt-check> use tinc_crypto::os_rng; treefmt-check> use tinc_crypto::sign::SigningKey; treefmt-check> use zeroize::Zeroizing; treefmt-check> @@ -139,7 +139,10 @@ pub fn invite( treefmt-check> let file = hosts.file(invitee); treefmt-check> let cfg = Config::read(&file).map_err(|e| CmdError::BadInput(e.to_string()))?; treefmt-check> let key = keypair::load_public_from_config(&cfg, &file).ok_or_else(|| { treefmt-check> - CmdError::BadInput(format!("{} has no Ed25519 public key to replace", file.display())) treefmt-check> + CmdError::BadInput(format!( treefmt-check> + "{} has no Ed25519 public key to replace", treefmt-check> + file.display() treefmt-check> + )) treefmt-check> })?; treefmt-check> Some(b64::encode(&key)) treefmt-check> } else { treefmt-check> @@ -981,10 +984,17 @@ mod tests { treefmt-check> let paths = cd.paths().clone(); treefmt-check> init_with_address(&paths, "alice", "myhost"); treefmt-check> let old = b64::encode(&[7u8; 32]); treefmt-check> - let cd = cd.with_overlay_host("bob", &format!("Subnet = 10.0.0.7\nEd25519PublicKey = {old}\n")); treefmt-check> + let cd = cd.with_overlay_host( treefmt-check> + "bob", treefmt-check> + &format!("Subnet = 10.0.0.7\nEd25519PublicKey = {old}\n"), treefmt-check> + ); treefmt-check> let paths = cd.paths().clone(); treefmt-check> let script = cd.confbase().join("invitation-created"); treefmt-check> - fs::write(&script, "#!/bin/sh\necho \"# $REPLACE\" >> \"$INVITATION_FILE\"\n").unwrap(); treefmt-check> + fs::write( treefmt-check> + &script, treefmt-check> + "#!/bin/sh\necho \"# $REPLACE\" >> \"$INVITATION_FILE\"\n", treefmt-check> + ) treefmt-check> + .unwrap(); treefmt-check> fs::set_permissions(&script, fs::Permissions::from_mode(0o755)).unwrap(); treefmt-check> treefmt-check> invite(&paths, None, "bob", true, SystemTime::now()).unwrap(); treefmt-check> @@ -1010,7 +1020,10 @@ mod tests { treefmt-check> ("rsa", "no Ed25519 public key"), treefmt-check> ] { treefmt-check> let err = invite(&paths, None, who, true, SystemTime::now()).unwrap_err(); treefmt-check> - assert!(matches!(&err, CmdError::BadInput(m) if m.contains(want)), "{who}: {err}"); treefmt-check> + assert!( treefmt-check> + matches!(&err, CmdError::BadInput(m) if m.contains(want)), treefmt-check> + "{who}: {err}" treefmt-check> + ); treefmt-check> } treefmt-check> } treefmt-check> treefmt-check> diff --git a/crates/tinc-tools/src/cmd/join/tests.rs b/crates/tinc-tools/src/cmd/join/tests.rs treefmt-check> index 03087db..084f6f0 100644 treefmt-check> --- a/crates/tinc-tools/src/cmd/join/tests.rs treefmt-check> +++ b/crates/tinc-tools/src/cmd/join/tests.rs treefmt-check> @@ -496,7 +496,8 @@ fn invite_join_roundtrip_in_process() { treefmt-check> .append_conf("Mode = switch\n"); treefmt-check> let inviter = inviter_cd.paths(); treefmt-check> treefmt-check> - let inv_result = invite::invite(inviter, Some("acme"), "bob", false, SystemTime::now()).unwrap(); treefmt-check> + let inv_result = treefmt-check> + invite::invite(inviter, Some("acme"), "bob", false, SystemTime::now()).unwrap(); treefmt-check> let parsed = parse_url(&inv_result.url).unwrap(); treefmt-check> treefmt-check> // Load invitation key. Both the server stub and the joiner's error: build of '/nix/store/87bchlm3mfiay3a0sdpfxkyg4a5smvcx-treefmt-check.drv' on 'ssh-ng://customer@mac02' failed: Cannot build '/nix/store/87bchlm3mfiay3a0sdpfxkyg4a5smvcx-treefmt-check.drv'. Reason: builder failed with exit code 1. Output paths: /nix/store/6wgz1j9jh7k3qf7qkknw8x6g4gcj798c-treefmt-check Last 25 log lines: > ("rsa", "no Ed25519 public key"), > ] { > let err = invite(&paths, None, who, true, SystemTime::now()).unwrap_err(); > - assert!(matches!(&err, CmdError::BadInput(m) if m.contains(want)), "{who}: {err}"); > + assert!( > + matches!(&err, CmdError::BadInput(m) if m.contains(want)), > + "{who}: {err}" > + ); > } > } > > diff --git a/crates/tinc-tools/src/cmd/join/tests.rs b/crates/tinc-tools/src/cmd/join/tests.rs > index 03087db..084f6f0 100644 > --- a/crates/tinc-tools/src/cmd/join/tests.rs > +++ b/crates/tinc-tools/src/cmd/join/tests.rs > @@ -496,7 +496,8 @@ fn invite_join_roundtrip_in_process() { > .append_conf("Mode = switch\n"); > let inviter = inviter_cd.paths(); > > - let inv_result = invite::invite(inviter, Some("acme"), "bob", false, SystemTime::now()).unwrap(); > + let inv_result = > + invite::invite(inviter, Some("acme"), "bob", false, SystemTime::now()).unwrap(); > let parsed = parse_url(&inv_result.url).unwrap(); > > // Load invitation key. Both the server stub and the joiner's For full logs, run: nix log /nix/store/87bchlm3mfiay3a0sdpfxkyg4a5smvcx-treefmt-check.drv error: Cannot build '/nix/store/87bchlm3mfiay3a0sdpfxkyg4a5smvcx-treefmt-check.drv'. Reason: builder failed with exit code 1. Output paths: /nix/store/6wgz1j9jh7k3qf7qkknw8x6g4gcj798c-treefmt-check