pijul/pijul - Change KITFGWY2FX3OZVDBCMTKJ5EX5ASQE2FOXGJ7JGJM5NT2ETVVNN6QC

run cargo fmt

Created by hardy7cc on August 13, 2023

KITFGWY2FX3OZVDBCMTKJ5EX5ASQE2FOXGJ7JGJM5NT2ETVVNN6QC

Dependencies

In discussions

#832 [DRAFT] refactor global configuration

Change contents

Replacement in libpijul/src/vertex_buffer.rs at line 165 [12.217202]

B:BD[12.221091] → [13.0:91]

            changes: sides.iter().flat_map(|(_, b)| b.iter()).cloned().cloned().collect(),

[12.221091]

[14.796]

            changes: sides
                .iter()
                .flat_map(|(_, b)| b.iter())
                .cloned()
                .cloned()
                .collect(),

Replacement in libpijul/src/vertex_buffer.rs at line 184 [12.217202]

B:BD[12.221363] → [13.92:185]

            changes: add_del.iter().flat_map(|(_, b)| b.iter()).cloned().cloned().collect(),

[12.221363]

[14.926]

            changes: add_del
                .iter()
                .flat_map(|(_, b)| b.iter())
                .cloned()
                .cloned()
                .collect(),

Replacement in libpijul/src/vertex_buffer.rs at line 204 [12.217202]

B:BD[12.221703] → [13.186:309]

    fn conflict_next<C: ChangeStore>(&mut self, id_: usize, sides: Option<(&C, &[&Hash])>) -> Result<(), std::io::Error> {

[12.221703]

[14.1133]

    fn conflict_next<C: ChangeStore>(
        &mut self,
        id_: usize,
        sides: Option<(&C, &[&Hash])>,
    ) -> Result<(), std::io::Error> {

Replacement in libpijul/src/vertex_buffer.rs at line 229 [12.217202]

B:BD[13.774] → [7.0:151]

        Ok(header) => if let Some(l) = header.message.lines().next() {
            l.to_string()
        } else {
            String::new()
        },

[13.774]

[13.848]

        Ok(header) => {
            if let Some(l) = header.message.lines().next() {
                l.to_string()
            } else {
                String::new()
            }
        }

Replacement in libpijul/src/unrecord/mod.rs at line 663 [12.231493]
B:BD[2.2833] → [2.2833:2855]
```
                break
```
[2.2833]
[2.2855]
```
                break;
```

Replacement in libpijul/src/tests/file_conflicts.rs at line 1216 [12.305506]

B:BD[15.646] → [3.708:813]

        Conflict::ZombieFile { ref path, .. } => assert!(path == "a/b/c/file" || path == "a/b/c/alice"),

[15.646]

[12.345145]

        Conflict::ZombieFile { ref path, .. } => {
            assert!(path == "a/b/c/file" || path == "a/b/c/alice")
        }

Replacement in libpijul/src/tests/file_conflicts.rs at line 1238 [12.305506]

B:BD[15.692] → [3.814:919]

        Conflict::ZombieFile { ref path, .. } => assert!(path == "a/b/c/file" || path == "a/b/c/alice"),

[15.692]

[12.345703]

        Conflict::ZombieFile { ref path, .. } => {
            assert!(path == "a/b/c/file" || path == "a/b/c/alice")
        }

Replacement in libpijul/src/record.rs at line 1741 [12.488880]
B:BD[6.891] → [6.891:912]
```
            continue
```
[6.891]
[6.912]
```
            continue;
```
Replacement in libpijul/src/diff/replace.rs at line 307 [12.779907]
B:BD[4.100] → [4.100:130]
```
                        break
```
[4.100]
[12.790553]
```
                        break;
```

Replacement in libpijul/src/change.rs at line 304 [12.831311]

B:BD[10.239] → [10.239:290]

        return Err(MakeChangeError::InvalidChange)

[10.239]

[10.290]

        return Err(MakeChangeError::InvalidChange);

Replacement in libpijul/src/change.rs at line 343 [12.831311]

B:BD[10.428] → [10.428:479]

        return Err(MakeChangeError::InvalidChange)

[10.428]

[10.479]

        return Err(MakeChangeError::InvalidChange);

Replacement in libpijul/src/change.rs at line 1449 [12.831311]

B:BD[16.140483] → [17.0:83]

    info!("compressing with ZStd {}", zstd_seekable::version().to_str().unwrap());

[16.140483]

[9.25]

    info!(
        "compressing with ZStd {}",
        zstd_seekable::version().to_str().unwrap()
    );

Replacement in libpijul/src/change/text_changes.rs at line 29 [18.37976]
B:BD[10.1212] → [10.1212:1255]
```
    MakeChange(#[from]MakeChangeError<T>),
```
[10.1212]
[18.38343]
```
    MakeChange(#[from] MakeChangeError<T>),
```
Replacement in libpijul/src/change/text_changes.rs at line 202 [18.37976]
∅:D[19.10351] → [20.122912:122944]
∅:D[21.59097] → [20.122912:122944]
B:BD[18.43188] → [20.122912:122944]
B:BD[20.122944] → [10.1301:1380]
```
        let (mut deps, extra) =
            dependencies(txn, &channel.read(), change.hashed.changes.iter())?;
```
[21.59097]
[18.43278]
```
        let (mut deps, extra) = dependencies(txn, &channel.read(), change.hashed.changes.iter())?;
```
Replacement in libpijul/src/change/parse.rs at line 164 [19.64713]
B:BD[22.212] → [22.212:228]
```
            )))
```
[22.212]
[8.0]
```
            )));
```
Replacement in libpijul/src/change/parse.rs at line 383 [19.64713]
B:BD[5.161] → [5.161:177]
```
            )))
```
[5.161]
[5.177]
```
            )));
```

Replacement in libpijul/src/apply.rs at line 50 [12.944089]

B:BD[20.123233] → [11.752:810]

    MakeChange(#[from]crate::change::MakeChangeError<T>),

[20.123233]

[18.94263]

    MakeChange(#[from] crate::change::MakeChangeError<T>),

run cargo fmt

Dependencies

In discussions

Change contents

Replacement in libpijul/src/vertex_buffer.rs at line 165 [12.217202]

Replacement in libpijul/src/vertex_buffer.rs at line 184 [12.217202]

Replacement in libpijul/src/vertex_buffer.rs at line 204 [12.217202]

Replacement in libpijul/src/vertex_buffer.rs at line 229 [12.217202]

Replacement in libpijul/src/unrecord/mod.rs at line 663 [12.231493]

Replacement in libpijul/src/tests/file_conflicts.rs at line 1216 [12.305506]

Replacement in libpijul/src/tests/file_conflicts.rs at line 1238 [12.305506]

Replacement in libpijul/src/record.rs at line 1741 [12.488880]

Replacement in libpijul/src/diff/replace.rs at line 307 [12.779907]

Replacement in libpijul/src/change.rs at line 304 [12.831311]

Replacement in libpijul/src/change.rs at line 343 [12.831311]

Replacement in libpijul/src/change.rs at line 1449 [12.831311]

Replacement in libpijul/src/change/text_changes.rs at line 29 [18.37976]

Replacement in libpijul/src/change/text_changes.rs at line 202 [18.37976]

Replacement in libpijul/src/change/parse.rs at line 164 [19.64713]

Replacement in libpijul/src/change/parse.rs at line 383 [19.64713]

Replacement in libpijul/src/apply.rs at line 50 [12.944089]