ilyagr/pijul - Change LLBKJA6YL3R5GWU5E2WRKACD3CVME2LCTVWBOAZF6IFEBZJHQFCQC

Simpler channel iterator

Created by pmeunier on December 5, 2021

LLBKJA6YL3R5GWU5E2WRKACD3CVME2LCTVWBOAZF6IFEBZJHQFCQC

Dependencies

In channels

main

Change contents

Replacement in libpijul/src/pristine/sanakirja.rs at line 1316 [7.531056]
∅:D[5.25125] → [6.47694:47722]
∅:D[8.27704] → [6.47694:47722]
∅:D[9.79139] → [6.47694:47722]
B:BD[7.551813] → [6.47694:47722]
```
    fn iter_channels<'txn>(
```
[8.27704]
[6.47722]
```
    fn channels<'txn>(
```

Replacement in libpijul/src/pristine/sanakirja.rs at line 1319 [7.531056]

B:BD[6.47763] → [6.47763:47836]

    ) -> Result<ChannelIterator<'txn, Self>, TxnErr<Self::GraphError>> {

[6.47763]

[7.551898]

    ) -> Result<Vec<ChannelRef<Self>>, TxnErr<Self::GraphError>> {

Replacement in libpijul/src/pristine/sanakirja.rs at line 1323 [7.531056]

B:BD[9.79266] → [9.79266:79316]

        Ok(ChannelIterator { cursor, txn: self })

[9.79266]

[7.552158]

        while let Ok(Some((name, _))) = self.cursor_channels_next(&mut cursor) {
            self.load_channel(name.as_str())?;
        }
        Ok(self
            .open_channels
            .lock()
            .iter()
            .map(|(_, x)| x.clone())
            .collect())

Replacement in libpijul/src/pristine/sanakirja.rs at line 1967 [7.531056]

B:BD[4.151] → [4.151:664]

                let mut it0 = self.iter_channels("").map_err(|e| e.0)?;
                let it1 = self.open_channels.lock();
                let mut it1 = it1.iter();
                loop {
                    let (name, chan) = if let Some(chan) = it0.next() {
                        chan.map_err(|e| e.0)?
                    } else if let Some((name, chan)) = it1.next() {
                        (name.as_ref(), chan.clone())
                    } else {
                        break
                    };

[4.151]

[4.664]

                for chan in self.channels("").map_err(|e| e.0)? {

Deletion in libpijul/src/pristine/sanakirja.rs at line 1969 [7.531056]
∅:D[4.739] → [10.136:190]
B:BD[11.285] → [10.136:190]
```
                    assert_ne!(name.as_str(), name0);
```
Insertion in libpijul/src/pristine/sanakirja.rs at line 1970 [7.531056]
[3.99702]
[12.2052]
```
                    assert_ne!(chan.name.as_str(), name0);
```
Replacement in libpijul/src/pristine/mod.rs at line 648 [7.586748]
B:BD[7.592225] → [6.58709:58737]
```
    fn iter_channels<'txn>(
```
[7.592225]
[6.58737]
```
    fn channels<'txn>(
```

Replacement in libpijul/src/pristine/mod.rs at line 651 [7.586748]

B:BD[6.58778] → [6.58778:58850]

    ) -> Result<ChannelIterator<'txn, Self>, TxnErr<Self::GraphError>>;

[6.58778]

[7.600373]

    ) -> Result<Vec<ChannelRef<Self>>, TxnErr<Self::GraphError>>;

Replacement in libpijul/src/unrecord/mod.rs at line 123 [7.231493]

∅:D[3.933] → [6.23537:23576]

∅:D[13.29942] → [6.23537:23576]

B:BD[7.233731] → [6.23537:23576]

B:BD[6.23576] → [13.29943:30022]

    for br in txn.iter_channels("")? {
        let (name, br) = br?;
        if name.as_str() == txn.name(&channel) {

[3.933]

[13.30022]

    for br in txn.channels("")? {
        let br = br.read();
        if txn.name(&br) == txn.name(&channel) {

Deletion in libpijul/src/unrecord/mod.rs at line 128 [7.231493]
B:BD[13.30054] → [3.934:962]
```
        let br = br.read();
```

Replacement in pijul/src/commands/channel.rs at line 45 [7.186892]

∅:D[14.3916] → [6.18688:18744]

B:BD[7.187789] → [6.18688:18744]

B:BD[6.18744] → [13.23141:23190]

                for channel in txn.iter_channels("")? {
                    let (_, channel) = channel?;

[14.3916]

[2.17354]

                for channel in txn.channels("")? {

Simpler channel iterator

Dependencies

In channels

Change contents

Replacement in libpijul/src/pristine/sanakirja.rs at line 1316 [7.531056]

Replacement in libpijul/src/pristine/sanakirja.rs at line 1319 [7.531056]

Replacement in libpijul/src/pristine/sanakirja.rs at line 1323 [7.531056]

Replacement in libpijul/src/pristine/sanakirja.rs at line 1967 [7.531056]

Deletion in libpijul/src/pristine/sanakirja.rs at line 1969 [7.531056]

Insertion in libpijul/src/pristine/sanakirja.rs at line 1970 [7.531056]

Replacement in libpijul/src/pristine/mod.rs at line 648 [7.586748]

Replacement in libpijul/src/pristine/mod.rs at line 651 [7.586748]

Replacement in libpijul/src/unrecord/mod.rs at line 123 [7.231493]

Deletion in libpijul/src/unrecord/mod.rs at line 128 [7.231493]

Replacement in pijul/src/commands/channel.rs at line 45 [7.186892]