pijul/pijul - Change Y6TBQN7MFWX4SKJM2UGDGR4UMMDEO4TPNNJZKZWHEBTW7MPX4WWQC

Automatically format `pijul` crate

Moving this work into a separate change so that it does not pollute other diffs. Nothing major, but it is still important to keep the repository in compliance with rustfmt style.

Created by finchie on July 13, 2023

Y6TBQN7MFWX4SKJM2UGDGR4UMMDEO4TPNNJZKZWHEBTW7MPX4WWQC

Dependencies

In channels

main

In discussions

#804 Split Pijul CLI into multiple sub-crates

#832 [DRAFT] refactor global configuration

Change contents

Deletion in pijul/src/identity/mod.rs at line 57 [11.15627]
B:BD[11.17299] → [10.0:25]
```
use std::sync::OnceLock;
```
Insertion in pijul/src/identity/mod.rs at line 58 [11.15627]
[12.2141]
[11.17299]
```
use std::sync::OnceLock;
```

Replacement in pijul/src/identity/mod.rs at line 133 [11.15627]

B:BD[12.4106] → [13.280:382]

            if let Ok(password) = keyring::Entry::new("pijul", name).and_then(|x| x.get_password()) {

[12.4106]

[12.4192]

            if let Ok(password) = keyring::Entry::new("pijul", name).and_then(|x| x.get_password())
            {

Replacement in pijul/src/identity/mod.rs at line 149 [11.15627]

B:BD[12.4743] → [13.383:496]

            if let Err(e) = keyring::Entry::new("pijul", name).and_then(|x| x.set_password(&password_attempt)) {

[12.4743]

[14.317]

            if let Err(e) =
                keyring::Entry::new("pijul", name).and_then(|x| x.set_password(&password_attempt))
            {

Replacement in pijul/src/identity/mod.rs at line 272 [11.15627]

B:BD[12.7658] → [13.497:613]

            if let Err(e) = keyring::Entry::new("pijul", &self.name).and_then(|x| x.set_password(&user_password)) {

[12.7658]

[14.488]

            if let Err(e) = keyring::Entry::new("pijul", &self.name)
                .and_then(|x| x.set_password(&user_password))
            {

Insertion in pijul/src/identity/create.rs at line 8 [11.28175]
[11.28402]
[11.28402]
```
use crate::config;
```
Deletion in pijul/src/identity/create.rs at line 13 [11.28175]
B:BD[11.28571] → [12.8736:8770]
```
use thrussh_keys::key::PublicKey;
```
Replacement in pijul/src/identity/create.rs at line 14 [11.28175]
∅:D[10.352] → [15.31:50]
B:BD[15.31] → [15.31:50]
```
use crate::config;
```
[10.352]
[11.28571]
```
use thrussh_keys::key::PublicKey;
```

Replacement in pijul/src/commands/tag.rs at line 290 [16.74]

B:BD[16.5248] → [4.0:110]

            chrono::DateTime::from_utc(chrono::NaiveDateTime::from_timestamp_opt(t, 0).unwrap(), chrono::Utc)

[16.5248]

[16.5345]

            chrono::DateTime::from_utc(
                chrono::NaiveDateTime::from_timestamp_opt(t, 0).unwrap(),
                chrono::Utc,
            )

Replacement in pijul/src/commands/record.rs at line 360 [18.101759]

B:BD[17.14343] → [6.558:758]

                    if self.patience {
                        libpijul::Algorithm::Patience
                    } else {
                        libpijul::Algorithm::default()
                    },

[17.14343]

                if self.patience {
                    libpijul::Algorithm::Patience
                } else {
                    libpijul::Algorithm::default()
                },

Replacement in pijul/src/commands/protocol.rs at line 413 [18.123281]
B:BD[19.2669] → [7.492:524]
```
                return Ok(true)
```
[19.2669]
[19.2669]
```
                return Ok(true);
```

Replacement in pijul/src/commands/log.rs at line 321 [18.134376]

B:BD[20.410] → [20.410:507]

        let mut reverse_log = self.txn.reverse_log(&*self.channel_ref.read(), None)?.peekable();

[20.410]

[20.507]

        let mut reverse_log = self
            .txn
            .reverse_log(&*self.channel_ref.read(), None)?
            .peekable();

Replacement in pijul/src/commands/log.rs at line 443 [18.134376]

B:BD[21.13977] → [2.27:115]

            description: if self.cmd.descriptions { header.description } else { None },

[21.13977]

[21.14022]

            description: if self.cmd.descriptions {
                header.description
            } else {
                None
            },

Replacement in pijul/src/commands/log.rs at line 471 [18.134376]

B:BD[3.322] → [3.322:358]

∅:D[3.358] → [22.2380:2450]

B:BD[21.14431] → [22.2380:2450]

            OutputFormat::Json => {
                serde_json::to_writer_pretty(&mut stdout, &log_iter)?

[3.322]

[21.14521]

            OutputFormat::Json => serde_json::to_writer_pretty(&mut stdout, &log_iter)?,
            OutputFormat::Plaintext => {
                log_iter.for_each(|entry| match write!(&mut stdout, "{}", entry) {
                    Ok(_) => Ok(()),
                    Err(e) if e.kind() == std::io::ErrorKind::BrokenPipe => Ok(()),
                    Err(e) => Err(e),
                })?

Deletion in pijul/src/commands/log.rs at line 479 [18.134376]

B:BD[21.14535] → [3.359:465]

∅:D[3.465] → [22.2535:2699]

B:BD[22.2535] → [22.2535:2699]

            OutputFormat::Plaintext => log_iter.for_each(|entry| match write!(&mut stdout, "{}", entry) {
                Ok(_) => Ok(()),
                Err(e) if e.kind() == std::io::ErrorKind::BrokenPipe => Ok(()),
                Err(e) => Err(e),
            })?,

Replacement in pijul/src/commands/identity.rs at line 443 [11.40825]

B:BD[12.19585] → [13.1057:1165]

                    if let Err(e) = Entry::new("pijul", &identity.name).and_then(|x| x.delete_password()) {

[12.19585]

[23.108]

                    if let Err(e) =
                        Entry::new("pijul", &identity.name).and_then(|x| x.delete_password())
                    {

Deletion in pijul/src/commands/dependents.rs at line 1 [24.243]
B:BD[24.243] → [24.244:288]
```
use std::path::PathBuf;
use std::io::Write;
```
Insertion in pijul/src/commands/dependents.rs at line 3 [24.243]
[24.323]
[24.323]
```
use std::io::Write;
use std::path::PathBuf;
```
Replacement in pijul/src/commands/dependents.rs at line 37 [24.243]
B:BD[8.450] → [8.450:480]
```
                return Ok(())
```
[8.450]
[24.1076]
```
                return Ok(());
```

Replacement in pijul/src/commands/dependents.rs at line 65 [24.243]

B:BD[8.856] → [8.856:886]

                        break

[8.856]

[8.886]

                        break;

Replacement in pijul/src/commands/debug.rs at line 43 [18.177758]

B:BD[17.21392] → [17.21392:21427]

B:BD[17.21427] → [5.0:74]

                let (pos, _) = txn
                    .follow_oldest_path(&repo.changes, &channel, &root)?;

[17.21392]

[17.21530]

                let (pos, _) = txn.follow_oldest_path(&repo.changes, &channel, &root)?;

Insertion in pijul/src/commands/client.rs at line 3 [25.4568]

[25.4588]

use crate::config::global_config_dir;
use hyper::service::{make_service_fn, service_fn};
use hyper::{Body, Request, Response, Server};

Deletion in pijul/src/commands/client.rs at line 8 [25.4568]

B:BD[25.4644] → [25.4644:4773]

use hyper::{Body, Request, Response, Server};
use hyper::service::{make_service_fn, service_fn};
use tokio::sync::mpsc::channel;

Replacement in pijul/src/commands/client.rs at line 9 [25.4568]
B:BD[25.4792] → [25.4792:4830]
```
use crate::config::global_config_dir;
```
[25.4792]
[25.4830]
```
use tokio::sync::mpsc::channel;
```
Deletion in pijul/src/commands/client.rs at line 20 [25.4568]
B:BD[25.5032] → [25.5032:5033]
Replacement in pijul/src/commands/client.rs at line 29 [25.4568]
B:BD[25.5461] → [25.5461:5495]
```
                    return Ok(())
```
[25.5461]
[25.5495]
```
                    return Ok(());
```
Deletion in pijul/src/commands/client.rs at line 36 [25.4568]
B:BD[25.5610] → [25.5610:5611]

Replacement in pijul/src/commands/client.rs at line 65 [25.4568]

B:BD[25.6965] → [25.6965:7011]

                                    .unwrap()

[25.6965]

[25.7011]

                                    .unwrap(),

Replacement in pijul/src/commands/client.rs at line 80 [25.4568]

∅:D[9.60] → [26.11272:11362]

B:BD[25.7541] → [26.11272:11362]

                eprintln!("If the URL doesn't open automatically, please visit {}", url);

[9.60]

[25.7541]

                eprintln!(
                    "If the URL doesn't open automatically, please visit {}",
                    url
                );

Replacement in pijul/src/commands/client.rs at line 85 [25.4568]
B:BD[25.7598] → [25.7598:7623]
```
                select!{
```
[25.7598]
[25.7623]
```
                select! {
```
Replacement in pijul/src/commands/client.rs at line 111 [25.4568]
B:BD[25.8334] → [25.8334:8356]
```
                break
```
[25.8334]
[25.8356]
```
                break;
```

Automatically format `pijul` crate

Dependencies

In channels

In discussions

Change contents

Deletion in pijul/src/identity/mod.rs at line 57 [11.15627]

Insertion in pijul/src/identity/mod.rs at line 58 [11.15627]

Replacement in pijul/src/identity/mod.rs at line 133 [11.15627]

Replacement in pijul/src/identity/mod.rs at line 149 [11.15627]

Replacement in pijul/src/identity/mod.rs at line 272 [11.15627]

Insertion in pijul/src/identity/create.rs at line 8 [11.28175]

Deletion in pijul/src/identity/create.rs at line 13 [11.28175]

Replacement in pijul/src/identity/create.rs at line 14 [11.28175]

Replacement in pijul/src/commands/tag.rs at line 290 [16.74]

Replacement in pijul/src/commands/record.rs at line 360 [18.101759]

Replacement in pijul/src/commands/protocol.rs at line 413 [18.123281]

Replacement in pijul/src/commands/log.rs at line 321 [18.134376]

Replacement in pijul/src/commands/log.rs at line 443 [18.134376]

Replacement in pijul/src/commands/log.rs at line 471 [18.134376]

Deletion in pijul/src/commands/log.rs at line 479 [18.134376]

Replacement in pijul/src/commands/identity.rs at line 443 [11.40825]

Deletion in pijul/src/commands/dependents.rs at line 1 [24.243]

Insertion in pijul/src/commands/dependents.rs at line 3 [24.243]

Replacement in pijul/src/commands/dependents.rs at line 37 [24.243]

Replacement in pijul/src/commands/dependents.rs at line 65 [24.243]

Replacement in pijul/src/commands/debug.rs at line 43 [18.177758]

Insertion in pijul/src/commands/client.rs at line 3 [25.4568]

Deletion in pijul/src/commands/client.rs at line 8 [25.4568]

Replacement in pijul/src/commands/client.rs at line 9 [25.4568]

Deletion in pijul/src/commands/client.rs at line 20 [25.4568]

Replacement in pijul/src/commands/client.rs at line 29 [25.4568]

Deletion in pijul/src/commands/client.rs at line 36 [25.4568]

Replacement in pijul/src/commands/client.rs at line 65 [25.4568]

Replacement in pijul/src/commands/client.rs at line 80 [25.4568]

Replacement in pijul/src/commands/client.rs at line 85 [25.4568]

Replacement in pijul/src/commands/client.rs at line 111 [25.4568]