pijul/pijul - Change GZXMKY3DU2VMKUEW44MY5L2KBL32HZ4DCVWZQULEVTGMEOVZFQ4AC

small refactors

Created by danieleades on January 9, 2021

GZXMKY3DU2VMKUEW44MY5L2KBL32HZ4DCVWZQULEVTGMEOVZFQ4AC

Dependencies

In discussions

#143 Clippy Lints

Change contents

Replacement in pijul-macros/src/lib.rs at line 509 [7.445]
B:BD[6.4823] → [6.4823:4879]
```
        proc_macro2::TokenStream::from(quote! { TxnT })
```
[6.4823]
[6.4879]
```
        quote! { TxnT }
```

Replacement in pijul-macros/src/lib.rs at line 516 [7.445]

B:BD[6.5065] → [6.5065:5127]

        proc_macro2::TokenStream::from(quote! { GraphError })

[6.5065]

[6.5127]

        quote! { GraphError }

Replacement in pijul/src/remote/ssh.rs at line 57 [7.25380]

B:BD[8.79] → [8.79:171]

        thrussh_config::parse_home(&host).unwrap_or(thrussh_config::Config::default(host));

[8.79]

[8.171]

        thrussh_config::parse_home(&host).unwrap_or_else(|_| thrussh_config::Config::default(host));

Replacement in pijul/src/remote/local.rs at line 117 [7.79745]

B:BD[7.82894] → [2.0:220]

            if std::fs::metadata(&self.changes_dir).is_err() {
                if std::fs::hard_link(&local, &self.changes_dir).is_err() {
                    std::fs::copy(&local, &self.changes_dir)?;
                }

[7.82894]

[9.3529]

            if std::fs::metadata(&self.changes_dir).is_err()
                && std::fs::hard_link(&local, &self.changes_dir).is_err()
            {
                std::fs::copy(&local, &self.changes_dir)?;

Deletion in pijul/src/remote/http.rs at line 1 [10.10]
B:BD[10.10] → [11.4982:5013]
```
use std::collections::HashSet;
```
Insertion in pijul/src/remote/http.rs at line 3 [10.10]
[10.55]
[12.1192]
```
use std::{collections::HashSet, path::Path};
```
Replacement in pijul/src/remote/http.rs at line 76 [10.10]
B:BD[13.1252] → [14.1436:1460]
```
        path: &PathBuf,
```
[13.1252]
[13.1280]
```
        path: &Path,
```

Replacement in pijul/src/remote/http.rs at line 95 [10.10]

B:BD[14.1740] → [14.1740:1774]

                    path.clone(),

[14.1740]

[14.1774]

                    path.to_path_buf(),

Replacement in pijul/src/config.rs at line 29 [7.89866]

B:BD[15.430] → [15.430:468]

                        Err(e.into())

[15.430]

[15.468]

                        Err(e)

Replacement in pijul/src/config.rs at line 38 [7.89866]

B:BD[7.90561] → [15.640:678]

                        Err(e.into())

[7.90561]

[7.90607]

                        Err(e)

Replacement in pijul/src/commands/pushpull.rs at line 304 [7.111631]

B:BD[11.8542] → [11.8542:8601]

        let mut to_download = if self.changes.is_empty() {

[11.8542]

[11.8601]

        let to_download = if self.changes.is_empty() {

Replacement in pijul/src/commands/pushpull.rs at line 346 [7.111631]

B:BD[9.7683] → [9.7683:7709]

B:BD[9.7709] → [11.9526:9576]

                        {
                            if inodes_.is_empty()

[9.7683]

[11.9576]

                            && (inodes_.is_empty()

Replacement in pijul/src/commands/pushpull.rs at line 351 [7.111631]

∅:D[6.14947] → [11.9733:9798]

B:BD[11.9733] → [11.9733:9798]

∅:D[11.9798] → [9.7978:8060]

B:BD[9.7978] → [9.7978:8060]

                                })
                            {
                                to_download.push(h)
                            }

[6.14947]

[9.8060]

                                }))
                        {
                            to_download.push(h)

Replacement in pijul/src/commands/pushpull.rs at line 374 [7.111631]
B:BD[11.10034] → [11.10034:10068]
```
                &mut to_download,
```
[11.10034]
[11.10068]
```
                &to_download,
```
Replacement in pijul/src/commands/mod.rs at line 147 [7.133619]
B:BD[16.3660] → [16.3660:3698]
```
            writeln!(v, "").unwrap();
```
[16.3660]
[16.3698]
```
            writeln!(v).unwrap();
```

Replacement in pijul/src/commands/archive.rs at line 75 [7.191083]

B:BD[4.55] → [4.55:115]

                    if !p.is_empty() && !p.ends_with("/") {

[4.55]

[4.115]

                    if !p.is_empty() && !p.ends_with('/') {

Replacement in libpijul/src/working_copy/filesystem.rs at line 126 [7.208900]
B:BD[17.752] → [18.1720:1755]
```
                repo_path.clone(),
```
[17.752]
[17.779]
```
                repo_path,
```

Replacement in libpijul/src/working_copy/filesystem.rs at line 168 [7.208900]

B:BD[17.1813] → [17.1813:1913]

                                    if p.ends_with("~") || (p.starts_with("#") && p.ends_with("#"))

[17.1813]

[17.1913]

                                    if p.ends_with('~') || (p.starts_with('#') && p.ends_with('#'))

Replacement in libpijul/src/record.rs at line 438 [7.488880]

B:BD[18.2878] → [18.2878:2929]

                    &self.rec.actions.len() - len,

[18.2878]

[18.2929]

                    self.rec.actions.len() - len,

Replacement in libpijul/src/pristine/sanakirja.rs at line 1005 [7.531056]
B:BD[19.44694] → [19.44694:44730]
```
                name: name.clone(),
```
[19.44694]
[19.44730]
```
                name,
```
Replacement in libpijul/src/pristine/sanakirja.rs at line 1135 [7.531056]
B:BD[7.551003] → [7.551003:551047]
```
                        name: name.clone(),
```
[7.551003]
[7.551047]
```
                        name,
```
Replacement in libpijul/src/pristine/sanakirja.rs at line 1139 [7.531056]
B:BD[7.551128] → [6.47596:47633]
```
                    return Ok(None);
```
[7.551128]
[7.551161]
```
                    Ok(None)
```

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

B:BD[7.564081] → [7.564081:564129]

                            name: name.clone(),

[7.564081]

[7.564129]

                            name,

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

B:BD[7.564634] → [7.564634:564682]

                            name: name.clone(),

[7.564634]

[7.564682]

                            name,

Replacement in libpijul/src/pristine/path_id.rs at line 36 [7.584967]
B:BD[7.585964] → [7.585964:586017]
```
            parent_inode: self.parent_inode.clone(),
```
[7.585964]
[7.586017]
```
            parent_inode: self.parent_inode,
```
Replacement in libpijul/src/pristine/mod.rs at line 650 [7.586748]
B:BD[19.53761] → [19.53761:53800]
```
        Some(Err(e)) => Err(e.into()),
```
[19.53761]
[19.53800]
```
        Some(Err(e)) => Err(e),
```
Deletion in libpijul/src/output/archive.rs at line 238 [7.690044]
B:BD[3.118] → [3.118:126]
```
    'a,
```

Replacement in libpijul/src/fs.rs at line 380 [7.737429]

B:BD[6.105682] → [6.105682:105732]

                        if k.basename.len() > 0 {

[6.105682]

[6.105732]

                        if !k.basename.is_empty() {

Replacement in libpijul/src/change.rs at line 949 [7.831311]

B:BD[7.860210] → [6.120530:120624]

    fn globalize<T: GraphTxnT>(&self, txn: &T) -> Result<Atom<Option<Hash>>, T::GraphError> {

[7.860210]

[7.860276]

    fn globalize<T: GraphTxnT>(&self, txn: &T) -> Atom<Option<Hash>> {

Replacement in libpijul/src/change.rs at line 958 [7.831311]

B:BD[7.860484] → [6.120625:120674]

            }) => Ok(Atom::NewVertex(NewVertex {

[7.860484]

[7.860530]

            }) => Atom::NewVertex(NewVertex {

Replacement in libpijul/src/change.rs at line 980 [7.831311]

B:BD[7.861348] → [6.120937:121036]

            })),
            Atom::EdgeMap(EdgeMap { edges, inode }) => Ok(Atom::EdgeMap(EdgeMap {

[7.861348]

[7.861443]

            }),
            Atom::EdgeMap(EdgeMap { edges, inode }) => Atom::EdgeMap(EdgeMap {

Replacement in libpijul/src/change.rs at line 1009 [7.831311]
B:BD[7.862631] → [6.121394:121411]
```
            })),
```
[7.862631]
[7.862647]
```
            }),
```

Replacement in libpijul/src/change.rs at line 1055 [7.831311]

∅:D[5.7646] → [6.121566:121650]

B:BD[7.864210] → [6.121566:121650]

                del: del.globalize(txn)?,
                add: add.globalize(txn)?,

[5.7646]

[7.864292]

                del: del.globalize(txn),
                add: add.globalize(txn),

Replacement in libpijul/src/change.rs at line 1064 [7.831311]

∅:D[5.7709] → [6.121651:121777]

B:BD[7.864463] → [6.121651:121777]

                del: del.globalize(txn)?,
                contents: contents.as_ref().map(|del| del.globalize(txn).unwrap()),

[5.7709]

[7.864579]

                del: del.globalize(txn),
                contents: contents.as_ref().map(|del| del.globalize(txn)),

Replacement in libpijul/src/change.rs at line 1073 [7.831311]

∅:D[5.7776] → [6.121778:121908]

B:BD[7.864756] → [6.121778:121908]

                undel: undel.globalize(txn)?,
                contents: contents.as_ref().map(|del| del.globalize(txn).unwrap()),

[5.7776]

[7.864876]

                undel: undel.globalize(txn),
                contents: contents.as_ref().map(|del| del.globalize(txn)),

Replacement in libpijul/src/change.rs at line 1078 [7.831311]
∅:D[5.7857] → [6.121909:121953]
B:BD[7.864997] → [6.121909:121953]
```
                name: name.globalize(txn)?,
```
[5.7857]
[7.865040]
```
                name: name.globalize(txn),
```
Replacement in libpijul/src/change.rs at line 1082 [7.831311]
∅:D[5.7942] → [6.121954:121998]
B:BD[7.865165] → [6.121954:121998]
```
                name: name.globalize(txn)?,
```
[5.7942]
[7.865208]
```
                name: name.globalize(txn),
```

Replacement in libpijul/src/change.rs at line 1091 [7.831311]

∅:D[5.8005] → [6.121999:122189]

B:BD[7.865411] → [6.121999:122189]

                add_name: add_name.globalize(txn)?,
                add_inode: add_inode.globalize(txn)?,
                contents: contents.as_ref().map(|add| add.globalize(txn).unwrap()),

[5.8005]

[7.865590]

                add_name: add_name.globalize(txn),
                add_inode: add_inode.globalize(txn),
                contents: contents.as_ref().map(|add| add.globalize(txn)),

Replacement in libpijul/src/change.rs at line 1097 [7.831311]
∅:D[5.8063] → [6.122190:122238]
B:BD[7.865688] → [6.122190:122238]
```
                change: change.globalize(txn)?,
```
[5.8063]
[7.865735]
```
                change: change.globalize(txn),
```

Replacement in libpijul/src/change.rs at line 1105 [7.831311]

∅:D[5.8134] → [6.122239:122345]

B:BD[7.865922] → [6.122239:122345]

                change: change.globalize(txn)?,
                replacement: replacement.globalize(txn)?,

[5.8134]

[7.866026]

                change: change.globalize(txn),
                replacement: replacement.globalize(txn),

Replacement in libpijul/src/change.rs at line 1110 [7.831311]
∅:D[5.8220] → [6.122346:122394]
B:BD[7.866153] → [6.122346:122394]
```
                change: change.globalize(txn)?,
```
[5.8220]
[7.866200]
```
                change: change.globalize(txn),
```
Replacement in libpijul/src/change.rs at line 1114 [7.831311]
∅:D[5.8310] → [6.122395:122443]
B:BD[7.866331] → [6.122395:122443]
```
                change: change.globalize(txn)?,
```
[5.8310]
[7.866378]
```
                change: change.globalize(txn),
```
Replacement in libpijul/src/change.rs at line 1118 [7.831311]
∅:D[5.8392] → [6.122444:122492]
B:BD[7.866501] → [6.122444:122492]
```
                change: change.globalize(txn)?,
```
[5.8392]
[7.866548]
```
                change: change.globalize(txn),
```

Replacement in libpijul/src/change.rs at line 1301 [7.831311]

B:BD[7.872645] → [20.37530:37588]

            return Err((ChangeError::ChangeHashMismatch {

[7.872645]

[7.872697]

            return Err(ChangeError::ChangeHashMismatch {

Replacement in libpijul/src/change.rs at line 1304 [7.831311]
B:BD[7.872770] → [7.872770:872807]
```
            })
            .into());
```
[7.872770]
[7.872807]
```
            });
```

Replacement in libpijul/src/change/text_changes.rs at line 100 [20.37976]

B:BD[20.41137] → [20.41137:41211]

                return Err((TextSerError::MissingContents { h }).into());

[20.41137]

[20.41211]

                return Err(TextSerError::MissingContents { h });

Replacement in libpijul/src/change/text_changes.rs at line 1221 [20.37976]

B:BD[20.85693] → [21.528:623]

        Atom::EdgeMap(ref n) if n.edges.is_empty() => return Err(TextSerError::InvalidChange),

[20.85693]

        Atom::EdgeMap(ref n) if n.edges.is_empty() => Err(TextSerError::InvalidChange),

Replacement in libpijul/src/apply.rs at line 324 [7.944089]

B:BD[22.290] → [20.96242:96316]

        return Err((LocalApplyError::DependencyMissing { hash }).into());

[22.290]

[22.354]

        return Err(LocalApplyError::DependencyMissing { hash });

Replacement in libpijul/src/apply.rs at line 540 [7.944089]

∅:D[23.19378] → [13.69437:69509]

B:BD[13.69437] → [13.69437:69509]

∅:D[13.69509] → [7.960555:960613]

B:BD[7.960555] → [7.960555:960613]

B:BD[7.960613] → [6.129586:129672]

∅:D[6.129672] → [7.960764:960811]

B:BD[7.960764] → [7.960764:960811]

B:BD[7.960811] → [23.19379:19443]

∅:D[23.19443] → [7.960935:960953]

B:BD[7.960935] → [7.960935:960953]

        if parent.flag.contains(EdgeFlags::PARENT | EdgeFlags::BLOCK) {
            if parent.flag.contains(EdgeFlags::DELETED) {
                let introduced_by = txn.get_external(parent.introduced_by)?.unwrap();
                if !ch.knows(&introduced_by) {
                    ws.deleted_by.insert(parent.introduced_by);
                }

[23.19378]

[7.961010]

        if parent.flag.contains(EdgeFlags::PARENT | EdgeFlags::BLOCK)
            && parent.flag.contains(EdgeFlags::DELETED)
        {
            let introduced_by = txn.get_external(parent.introduced_by)?.unwrap();
            if !ch.knows(&introduced_by) {
                ws.deleted_by.insert(parent.introduced_by);

Replacement in libpijul/src/apply.rs at line 768 [7.944089]

B:BD[6.131956] → [6.131956:132015]

        return Err(LocalApplyError::InvalidChange.into());

[6.131956]

[6.132015]

        return Err(LocalApplyError::InvalidChange);

small refactors

Dependencies

In discussions

Change contents

Replacement in pijul-macros/src/lib.rs at line 509 [7.445]

Replacement in pijul-macros/src/lib.rs at line 516 [7.445]

Replacement in pijul/src/remote/ssh.rs at line 57 [7.25380]

Replacement in pijul/src/remote/local.rs at line 117 [7.79745]

Deletion in pijul/src/remote/http.rs at line 1 [10.10]

Insertion in pijul/src/remote/http.rs at line 3 [10.10]

Replacement in pijul/src/remote/http.rs at line 76 [10.10]

Replacement in pijul/src/remote/http.rs at line 95 [10.10]

Replacement in pijul/src/config.rs at line 29 [7.89866]

Replacement in pijul/src/config.rs at line 38 [7.89866]

Replacement in pijul/src/commands/pushpull.rs at line 304 [7.111631]

Replacement in pijul/src/commands/pushpull.rs at line 346 [7.111631]

Replacement in pijul/src/commands/pushpull.rs at line 351 [7.111631]

Replacement in pijul/src/commands/pushpull.rs at line 374 [7.111631]

Replacement in pijul/src/commands/mod.rs at line 147 [7.133619]

Replacement in pijul/src/commands/archive.rs at line 75 [7.191083]

Replacement in libpijul/src/working_copy/filesystem.rs at line 126 [7.208900]

Replacement in libpijul/src/working_copy/filesystem.rs at line 168 [7.208900]

Replacement in libpijul/src/record.rs at line 438 [7.488880]

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

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

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

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

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

Replacement in libpijul/src/pristine/path_id.rs at line 36 [7.584967]

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

Deletion in libpijul/src/output/archive.rs at line 238 [7.690044]

Replacement in libpijul/src/fs.rs at line 380 [7.737429]

Replacement in libpijul/src/change.rs at line 949 [7.831311]

Replacement in libpijul/src/change.rs at line 958 [7.831311]

Replacement in libpijul/src/change.rs at line 980 [7.831311]

Replacement in libpijul/src/change.rs at line 1009 [7.831311]

Replacement in libpijul/src/change.rs at line 1055 [7.831311]

Replacement in libpijul/src/change.rs at line 1064 [7.831311]

Replacement in libpijul/src/change.rs at line 1073 [7.831311]

Replacement in libpijul/src/change.rs at line 1078 [7.831311]

Replacement in libpijul/src/change.rs at line 1082 [7.831311]

Replacement in libpijul/src/change.rs at line 1091 [7.831311]

Replacement in libpijul/src/change.rs at line 1097 [7.831311]

Replacement in libpijul/src/change.rs at line 1105 [7.831311]

Replacement in libpijul/src/change.rs at line 1110 [7.831311]

Replacement in libpijul/src/change.rs at line 1114 [7.831311]