replacement in rustfmt.toml at line 1
replacement in pijul-repository/Cargo.toml at line 6
replacement in pijul-remote/src/ssh.rs at line 135
− writeln!(stderr, "Warning: Unable to automatically authenticate with server. Please make sure your SSH keys have been uploaded to the Nest.")?;
− writeln!(stderr, "For more information, please visit https://pijul.org/manual/the_nest/public_keys.html#ssh-public-keys")?;
+ writeln!(
+ stderr,
+ "Warning: Unable to automatically authenticate with server. Please make sure your SSH keys have been uploaded to the Nest."
+ )?;
+ writeln!(
+ stderr,
+ "For more information, please visit https://pijul.org/manual/the_nest/public_keys.html#ssh-public-keys"
+ )?;
replacement in pijul-remote/src/ssh.rs at line 572
[8.70]→[8.3960:4027](∅→∅),
[8.3960]→[8.3960:4027](∅→∅) − if let Some(ref mut sender) = sender {
+ if let Some(sender) = sender {
replacement in pijul-remote/src/ssh.rs at line 593
− path,
− final_path,
− hashes[*current]
+ path, final_path, hashes[*current]
replacement in pijul-remote/src/ssh.rs at line 702
[8.3378]→[8.3378:3449](∅→∅) − if let Some(ref mut sender) = sender {
+ if let Some(sender) = sender {
replacement in pijul-remote/src/lib.rs at line 6
− use anyhow::{bail, Context};
+ use anyhow::{Context, bail};
edit in pijul-remote/src/lib.rs at line 9
replacement in pijul-remote/src/lib.rs at line 11
− sanakirja::MutTxn, Base32, ChangeId, ChannelRef, GraphIter, Hash, Merkle, MutTxnT, RemoteRef,
− TxnT,
+ Base32, ChangeId, ChannelRef, GraphIter, Hash, Merkle, MutTxnT, RemoteRef, TxnT,
+ sanakirja::MutTxn,
edit in pijul-remote/src/lib.rs at line 14
[8.137]→[8.52599:52622](∅→∅),
[8.602]→[8.52599:52622](∅→∅),
[8.1128]→[8.52599:52622](∅→∅),
[8.52599]→[8.52599:52622](∅→∅) replacement in pijul-remote/src/lib.rs at line 31
[8.62]→[8.344:437](∅→∅),
[8.344]→[8.344:437](∅→∅) − ProgressBar, Spinner, APPLY_MESSAGE, COMPLETE_MESSAGE, DOWNLOAD_MESSAGE, UPLOAD_MESSAGE,
+ APPLY_MESSAGE, COMPLETE_MESSAGE, DOWNLOAD_MESSAGE, ProgressBar, Spinner, UPLOAD_MESSAGE,
replacement in pijul-remote/src/lib.rs at line 619
[8.7224]→[8.8466:8590](∅→∅),
[8.8466]→[8.8466:8590](∅→∅) − if k >= n {
− Some(k)
− } else {
− None
− }
+ if k >= n { Some(k) } else { None }
replacement in pijul-remote/src/lib.rs at line 631
[8.8687]→[8.8687:8811](∅→∅) − if k >= n {
− Some(k)
− } else {
− None
− }
+ if k >= n { Some(k) } else { None }
replacement in pijul-remote/src/lib.rs at line 1112
[8.65345]→[8.524:658](∅→∅),
[8.658]→[8.452:496](∅→∅),
[8.452]→[8.452:496](∅→∅) − RemoteRepo::Local(ref mut l) => {
− l.upload_changes(upload_bar, local, to_channel, changes)?
− }
− RemoteRepo::Ssh(ref mut s) => {
+ RemoteRepo::Local(l) => l.upload_changes(upload_bar, local, to_channel, changes)?,
+ RemoteRepo::Ssh(s) => {
replacement in pijul-remote/src/lib.rs at line 1117
− RemoteRepo::Http(ref h) => {
+ &mut RemoteRepo::Http(ref h) => {
replacement in pijul-remote/src/lib.rs at line 1121
[8.684]→[8.2442:2497](∅→∅),
[8.778]→[8.2442:2497](∅→∅),
[8.66522]→[8.2442:2497](∅→∅) − RemoteRepo::LocalChannel(ref channel) => {
+ &mut RemoteRepo::LocalChannel(ref channel) => {
edit in pijul-remote/src/http.rs at line 2
[8.11135]→[8.2210:2254](∅→∅) − use libpijul::pristine::{Base32, Position};
edit in pijul-remote/src/http.rs at line 3
+ use libpijul::pristine::{Base32, Position};
replacement in pijul-remote/Cargo.toml at line 6
replacement in pijul-macros/Cargo.toml at line 6
replacement in pijul-interaction/src/lib.rs at line 67
[6.1740]→[6.1740:1853](∅→∅) − #[error("unable to provide interactivity in this context, and no valid default value for {0} prompt `{1}`")]
+ #[error(
+ "unable to provide interactivity in this context, and no valid default value for {0} prompt `{1}`"
+ )]
replacement in pijul-interaction/Cargo.toml at line 6
[8.4116]→[8.4116:4133](∅→∅) replacement in pijul-identity/src/repair.rs at line 10
− use anyhow::{bail, Context};
+ use anyhow::{Context, bail};
edit in pijul-identity/src/load.rs at line 1
[8.22387]→[8.22388:22415](∅→∅) − use super::fix_identities;
edit in pijul-identity/src/load.rs at line 2
+ use super::fix_identities;
edit in pijul-identity/src/create.rs at line 1
[8.28175]→[8.28176:28199](∅→∅) edit in pijul-identity/src/create.rs at line 2
replacement in pijul-identity/src/create.rs at line 7
[8.448]→[8.28402:28431](∅→∅),
[8.1105]→[8.28402:28431](∅→∅),
[8.28402]→[8.28402:28431](∅→∅) − use anyhow::{bail, Context};
+ use anyhow::{Context, bail};
replacement in pijul-identity/src/create.rs at line 137
[8.11799]→[8.11799:11899](∅→∅) − PublicKey::RSA { ref hash, .. } => hash.name().identity_file(),
+ PublicKey::RSA { hash, .. } => hash.name().identity_file(),
replacement in pijul-identity/Cargo.toml at line 6
replacement in pijul-config/src/lib.rs at line 236
− toml::Value::String(ref s) => {
+ toml::Value::String(s) => {
replacement in pijul-config/Cargo.toml at line 6
replacement in pijul/tests/identity.rs at line 9
− use common::identity::{default, prompt, Identity, SubCommand};
+ use common::identity::{Identity, SubCommand, default, prompt};
replacement in pijul/tests/common/mod.rs at line 10
[8.10988]→[8.10988:11015](∅→∅) − use anyhow::{bail, Error};
+ use anyhow::{Error, bail};
edit in pijul/tests/common/mod.rs at line 12
[8.11031]→[8.11031:11078](∅→∅) − process::{unix::UnixProcess, NonBlocking},
edit in pijul/tests/common/mod.rs at line 13
+ process::{NonBlocking, unix::UnixProcess},
replacement in pijul/tests/common/identity.rs at line 214
[8.24254]→[8.24254:24406](∅→∅) − assert!(toml_data
− .get("public_key")
− .unwrap()
− .get("expires")
− .is_none());
+ assert!(
+ toml_data
+ .get("public_key")
+ .unwrap()
+ .get("expires")
+ .is_none()
+ );
replacement in pijul/tests/common/identity.rs at line 472
[8.32103]→[8.32103:32305](∅→∅) − assert!(!self
− .config_path
− .join("identities")
− .join(&self.id_name.valid_input().as_string())
− .exists());
+ assert!(
+ !self
+ .config_path
+ .join("identities")
+ .join(&self.id_name.valid_input().as_string())
+ .exists()
+ );
replacement in pijul/src/commands/reset.rs at line 7
[7.31]→[8.0:81](∅→∅),
[8.303]→[8.0:81](∅→∅) − use libpijul::pristine::{sanakirja::MutTxn, ChangeId, ChannelMutTxnT, Position};
+ use libpijul::pristine::{ChangeId, ChannelMutTxnT, Position, sanakirja::MutTxn};
replacement in pijul/src/commands/reset.rs at line 11
[8.1348]→[8.402:452](∅→∅) − use pijul_interaction::{Spinner, OUTPUT_MESSAGE};
+ use pijul_interaction::{OUTPUT_MESSAGE, Spinner};
replacement in pijul/src/commands/record.rs at line 115
[8.103811]→[8.76:128](∅→∅) − let h = if let Some(ref hash) = amend {
+ let h = if let Some(hash) = amend {
replacement in pijul/src/commands/pushpull.rs at line 15
[8.1120]→[8.453:531](∅→∅),
[8.531]→[4.23:99](∅→∅) − use pijul_interaction::{ProgressBar, Spinner, APPLY_MESSAGE, OUTPUT_MESSAGE};
− use pijul_remote::{self as remote, PushDelta, RemoteDelta, RemoteRepo, CS};
+ use pijul_interaction::{APPLY_MESSAGE, OUTPUT_MESSAGE, ProgressBar, Spinner};
+ use pijul_remote::{self as remote, CS, PushDelta, RemoteDelta, RemoteRepo};
replacement in pijul/src/commands/pushpull.rs at line 166
[8.19680]→[8.19680:19751](∅→∅) − if let RemoteRepo::LocalChannel(ref remote_channel) = remote {
+ if let &mut RemoteRepo::LocalChannel(ref remote_channel) = remote {
replacement in pijul/src/commands/pushpull.rs at line 206
[8.115196]→[8.115196:115226](∅→∅),
[8.115226]→[8.6865:6894](∅→∅),
[8.2010]→[8.115255:115308](∅→∅),
[8.6894]→[8.115255:115308](∅→∅),
[8.115255]→[8.115255:115308](∅→∅) − if c.is_empty() {
− channel_name
− } else {
− c
− }
+ if c.is_empty() { channel_name } else { c }
replacement in pijul/src/commands/mod.rs at line 336
− Conflict::Name { ref path, .. } => writeln!(w, " - Name conflict on \"{}\"", path)?,
− Conflict::ZombieFile { ref path, .. } => {
+ Conflict::Name { path, .. } => writeln!(w, " - Name conflict on \"{}\"", path)?,
+ Conflict::ZombieFile { path, .. } => {
replacement in pijul/src/commands/mod.rs at line 340
[8.2316]→[8.2316:2374](∅→∅) − Conflict::MultipleNames { ref path, .. } => {
+ Conflict::MultipleNames { path, .. } => {
replacement in pijul/src/commands/mod.rs at line 343
[8.2462]→[8.154:251](∅→∅) − Conflict::Zombie {
− ref path, ref line, ..
− } => writeln!(
+ Conflict::Zombie { path, line, .. } => writeln!(
replacement in pijul/src/commands/mod.rs at line 348
[8.2660]→[8.252:349](∅→∅) − Conflict::Cyclic {
− ref path, ref line, ..
− } => writeln!(
+ Conflict::Cyclic { path, line, .. } => writeln!(
replacement in pijul/src/commands/mod.rs at line 353
[8.2855]→[8.350:446](∅→∅) − Conflict::Order {
− ref path, ref line, ..
− } => writeln!(
+ Conflict::Order { path, line, .. } => writeln!(
edit in pijul/src/commands/log.rs at line 1
[8.134376]→[8.655:694](∅→∅) − use std::collections::hash_map::Entry;
edit in pijul/src/commands/log.rs at line 2
+ use std::collections::hash_map::Entry;
replacement in pijul/src/commands/log.rs at line 11
[8.7044]→[8.7044:7124](∅→∅) − sanakirja::Txn, ChannelRef, DepsTxnT, GraphTxnT, TreeErr, TreeTxnT, TxnErr,
+ ChannelRef, DepsTxnT, GraphTxnT, TreeErr, TreeTxnT, TxnErr, sanakirja::Txn,
replacement in pijul/src/commands/log.rs at line 120
[8.2485]→[8.2485:2595](∅→∅) − #[error("pijul log couldn't assemble file prefix for pattern `{}`: the path contained invalid UTF-8", 0)]
+ #[error(
+ "pijul log couldn't assemble file prefix for pattern `{}`: the path contained invalid UTF-8",
+ 0
+ )]
replacement in pijul/src/commands/log.rs at line 149
[8.1254]→[8.2852:2913](∅→∅) − return Err(Error::NotFound(pat.to_string()))
+ return Err(Error::NotFound(pat.to_string()));
replacement in pijul/src/commands/log.rs at line 164
[8.3115]→[8.3115:3134](∅→∅) replacement in pijul/src/commands/log.rs at line 220
− if let Some(ref h) = hash {
+ if let Some(h) = hash {
replacement in pijul/src/commands/log.rs at line 223
[8.995]→[8.995:1048](∅→∅) − if let Some(ref authors) = authors {
+ if let Some(authors) = authors {
replacement in pijul/src/commands/log.rs at line 238
[8.1579]→[8.1579:1636](∅→∅) − if let Some(ref timestamp) = timestamp {
+ if let Some(timestamp) = timestamp {
replacement in pijul/src/commands/log.rs at line 241
[8.1711]→[8.1711:1758](∅→∅) − if let Some(ref mrk) = state {
+ if let Some(mrk) = state {
replacement in pijul/src/commands/log.rs at line 244
[8.1828]→[8.1828:1881](∅→∅) − if let Some(ref message) = message {
+ if let Some(message) = message {
replacement in pijul/src/commands/log.rs at line 247
[8.1956]→[8.1956:2017](∅→∅) − if let Some(ref description) = description {
+ if let Some(description) = description {
replacement in pijul/src/commands/log.rs at line 250
[8.5953]→[3.330:379](∅→∅) − if let Some(ref paths) = paths {
+ if let Some(paths) = paths {
replacement in pijul/src/commands/identity.rs at line 2
[8.1254]→[8.763:851](∅→∅) − use pijul_identity::{self as identity, choose_identity_name, fix_identities, Complete};
+ use pijul_identity::{self as identity, Complete, choose_identity_name, fix_identities};
replacement in pijul/src/commands/identity.rs at line 13
[8.15]→[8.41098:41136](∅→∅),
[8.2816]→[8.41098:41136](∅→∅),
[8.41098]→[8.41098:41136](∅→∅) − use ptree::{print_tree, TreeBuilder};
+ use ptree::{TreeBuilder, print_tree};
replacement in pijul/src/commands/identity.rs at line 255
[8.2063]→[8.2063:2411](∅→∅) − warn!("Could not prove identity `{}`. Please check your credentials & network connection. If you are on an enterprise network, perhaps try running with `--no-cert-check`. Your data is safe but will not be connected to {} without runnning `pijul identity prove {}`", identity.name, identity.config.author.origin, identity.name);
+ warn!(
+ "Could not prove identity `{}`. Please check your credentials & network connection. If you are on an enterprise network, perhaps try running with `--no-cert-check`. Your data is safe but will not be connected to {} without runnning `pijul identity prove {}`",
+ identity.name, identity.config.author.origin, identity.name
+ );
replacement in pijul/src/commands/identity.rs at line 281
[8.50140]→[8.50140:50273](∅→∅) − writeln!(stderr, "If you have created a key in the past, you may need to migrate via `pijul identity repair`")?;
+ writeln!(
+ stderr,
+ "If you have created a key in the past, you may need to migrate via `pijul identity repair`"
+ )?;
replacement in pijul/src/commands/identity.rs at line 419
[8.3449]→[8.3449:3817](∅→∅) − warn!("Could not prove identity `{}`. Please check your credentials & network connection. If you are on an enterprise network, perhaps try running with `--no-cert-check`. Your data is safe but will not be connected to {} without runnning `pijul identity prove {}`", new_identity.name, new_identity.config.author.origin, new_identity.name);
+ warn!(
+ "Could not prove identity `{}`. Please check your credentials & network connection. If you are on an enterprise network, perhaps try running with `--no-cert-check`. Your data is safe but will not be connected to {} without runnning `pijul identity prove {}`",
+ new_identity.name,
+ new_identity.config.author.origin,
+ new_identity.name
+ );
replacement in pijul/src/commands/git.rs at line 293
[8.144482]→[8.257:388](∅→∅) − bail!("Pijul channel changed since last import. Please unrecord channel {} to state {}", oid_, merkle.to_base32())
+ bail!(
+ "Pijul channel changed since last import. Please unrecord channel {} to state {}",
+ oid_,
+ merkle.to_base32()
+ )
replacement in pijul/src/commands/git.rs at line 973
[8.163995]→[8.299:416](∅→∅) − f, "{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}",
+ f,
+ "{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}",
replacement in pijul/src/commands/git.rs at line 999
[8.165016]→[8.165016:165101](∅→∅) − if let Some(ref h) = self.hash { h.to_base32() } else { String::new() },
+ if let Some(ref h) = self.hash {
+ h.to_base32()
+ } else {
+ String::new()
+ },
replacement in pijul/src/commands/file_operations.rs at line 179
[8.1332]→[8.1332:1492](∅→∅) − writeln!(stderr, "The directory `{}` has been recorded, but its contents will not be tracked (use --recursive to override)", display_str)?;
+ writeln!(
+ stderr,
+ "The directory `{}` has been recorded, but its contents will not be tracked (use --recursive to override)",
+ display_str
+ )?;
replacement in pijul/src/commands/credit.rs at line 8
− use libpijul::vertex_buffer::{change_message, VertexBuffer};
+ use libpijul::vertex_buffer::{VertexBuffer, change_message};
replacement in pijul/src/commands/apply.rs at line 10
[8.3380]→[8.532:582](∅→∅) − use pijul_interaction::{Spinner, OUTPUT_MESSAGE};
+ use pijul_interaction::{OUTPUT_MESSAGE, Spinner};
replacement in pijul/Cargo.toml at line 6
[8.196541]→[8.36:53](∅→∅)