mx00s/pijul - Change HBUMCAFVS4W5FHWNZR7ITJFEEUCVZ4Q2U4KGWYN7XZGDZ75JMFTQC

Avoid printing multiple names conflicts more than once

Created by pmeunier on December 6, 2021

HBUMCAFVS4W5FHWNZR7ITJFEEUCVZ4Q2U4KGWYN7XZGDZ75JMFTQC

Dependencies

In channels

main

Change contents

Replacement in libpijul/src/output/output.rs at line 13 [4.671807]
∅:D[3.73463] → [4.672295:672334]
B:BD[4.672295] → [4.672295:672334]
```
use std::collections::hash_map::Entry;
```
[3.73463]
[5.101615]
```
use std::collections::{hash_map::Entry, BTreeSet};
```
Replacement in libpijul/src/output/output.rs at line 17 [4.671807]
B:BD[4.672484] → [5.101636:101668]
```
#[derive(Debug, PartialEq, Eq)]
```
[4.672484]
[4.672501]
```
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord)]
```

Replacement in libpijul/src/output/output.rs at line 62 [4.671807]

∅:D[6.3573] → [3.73759:73834]

B:BD[3.73759] → [3.73759:73834]

) -> Result<Vec<Conflict>, OutputError<P::Error, T::GraphError, R::Error>>

[6.3573]

[3.73834]

) -> Result<BTreeSet<Conflict>, OutputError<P::Error, T::GraphError, R::Error>>

Replacement in libpijul/src/output/output.rs at line 151 [4.671807]

∅:D[6.3604] → [3.75806:75880]

B:BD[3.75806] → [3.75806:75880]

) -> Result<Vec<Conflict>, OutputError<P::Error, T::TreeError, R::Error>>

[6.3604]

[3.75880]

) -> Result<BTreeSet<Conflict>, OutputError<P::Error, T::TreeError, R::Error>>

Replacement in libpijul/src/output/output.rs at line 173 [4.671807]
B:BD[7.13191] → [7.13191:13222]
```
        conflicts: Vec::new(),
```
[7.13191]
[7.13222]
```
        conflicts: BTreeSet::new(),
```

Replacement in libpijul/src/output/output.rs at line 218 [4.671807]

B:BD[7.13998] → [7.13998:14062]

        state.conflicts.extend(t.join().unwrap()?.into_iter());

[7.13998]

[7.14062]

        for x in t.join().unwrap()?.into_iter() {
            state.conflicts.insert(x);
        }

Replacement in libpijul/src/output/output.rs at line 222 [4.671807]

B:BD[7.14068] → [7.14068:14112]

    state.conflicts.extend(o?.into_iter());

[7.14068]

[7.14112]

    for x in o?.into_iter() {
        state.conflicts.insert(x);
    }

Replacement in libpijul/src/output/output.rs at line 253 [4.671807]
B:BD[7.14945] → [7.14945:14975]
```
    conflicts: Vec<Conflict>,
```
[7.14945]
[2.492]
```
    conflicts: BTreeSet<Conflict>,
```

Replacement in libpijul/src/output/output.rs at line 314 [4.671807]

B:BD[7.16985] → [7.16985:17051]

                    self.conflicts.push(Conflict::MultipleNames {

[7.16985]

[7.17051]

                    self.conflicts.insert(Conflict::MultipleNames {

Replacement in libpijul/src/output/output.rs at line 330 [4.671807]

B:BD[7.17597] → [7.17597:17673]

                self.conflicts.push(Conflict::Name { path: name.clone() });

[7.17597]

[7.17673]

                self.conflicts.insert(Conflict::Name { path: name.clone() });

Replacement in libpijul/src/output/output.rs at line 334 [4.671807]

B:BD[7.17780] → [7.17780:17833]

                self.conflicts.push(Conflict::Name {

[7.17780]

[7.17833]

                self.conflicts.insert(Conflict::Name {

Replacement in libpijul/src/output/output.rs at line 439 [4.671807]

B:BD[7.21305] → [7.21305:21364]

                self.conflicts.push(Conflict::ZombieFile {

[7.21305]

[7.21364]

                self.conflicts.insert(Conflict::ZombieFile {

Replacement in libpijul/src/output/output.rs at line 441 [4.671807]
B:BD[7.21408] → [7.21408:21427]
```
                })
```
[7.21408]
[4.679059]
```
                });
```