laumann/pijul-export - Change CV3S2Z2RTSL5F3RW3CZTGABGF7R6TRTO24LH45V6H2JHOWYZKJUAC

Fix most clippy warnings

The one warning that's left is a warning about large size differences for some Error enums.

Created by laumann on October 10, 2023

CV3S2Z2RTSL5F3RW3CZTGABGF7R6TRTO24LH45V6H2JHOWYZKJUAC

Dependencies

In channels

main

Change contents

Insertion in src/repo.rs at line 1 [4.32]
[4.32]
[2.0]
```
use std::cmp::Ordering;
```

Replacement in src/repo.rs at line 99 [4.32]

B:BD[4.818] → [5.81:149]

        let change_store = EagerChangeStore::from_root(&repo_path);

[4.818]

        let change_store = EagerChangeStore::from_root(repo_path);

Replacement in src/repo.rs at line 103 [4.32]

B:BD[6.481] → [6.481:778]

        match env::var("HOME") {
            Ok(home) => {
                Self::load_identities(
                    &mut identities,
                    &Path::new(&home).join(".config/pijul/identities"),
                )
                .unwrap_or(());
            }
            Err(..) => {}

[6.481]

[6.778]

        if let Ok(home) = env::var("HOME") {
            Self::load_identities(
                &mut identities,
                &Path::new(&home).join(".config/pijul/identities"),
            )
            .unwrap_or(());

Replacement in src/repo.rs at line 111 [4.32]
∅:D[6.789] → [7.443:474]
B:BD[4.819] → [7.443:474]
```
        return Ok(Repository {
```
[6.789]
[8.610]
```
        Ok(Repository {
```
Replacement in src/repo.rs at line 116 [4.32]
∅:D[6.814] → [7.522:534]
B:BD[7.522] → [7.522:534]
```
        });
```
[6.814]
[9.121]
```
        })
```

Replacement in src/repo.rs at line 125 [4.32]

B:BD[6.1015] → [6.1015:1423]

            match fs::read_to_string(dir.join(file?.path()).join("identity.toml")) {
                Ok(content) => {
                    let id: Identity = toml::from_str(&content)?;
                    identities.insert(
                        id.public_key.key,
                        format!("{} <{}>", id.display_name, id.email),
                    );
                }
                Err(..) => {}

[6.1015]

[6.1423]

            if let Ok(content) = fs::read_to_string(dir.join(file?.path()).join("identity.toml")) {
                let id: Identity = toml::from_str(&content)?;
                identities.insert(
                    id.public_key.key,
                    format!("{} <{}>", id.display_name, id.email),
                );

Replacement in src/repo.rs at line 133 [4.32]
B:BD[6.1447] → [6.1447:1470]
```
        return Ok(());
```
[6.1447]
[6.1470]
```
        Ok(())
```

Replacement in src/repo.rs at line 154 [4.32]

B:BD[6.1522] → [6.1522:1770]

            match self.identities.get(key) {
                Some(name) => {
                    return name.to_string();
                }
                None => {
                    return format!("{} <>", key);
                }
            }

[6.1522]

[6.1770]

            return self
                .identities
                .get(key)
                .map_or_else(|| format!("{} <>", key), Into::into);

Replacement in src/repo.rs at line 161 [4.32]

B:BD[7.633] → [7.633:798]

            if let Some(email) = a.0.get("email") {
                return format!("{} <{}>", name, email);
            }
            return format!("{} <>", name);

[7.633]

[7.798]

            return format!(
                "{} <{}>",
                name,
                a.0.get("email").map(|e| e.as_str()).unwrap_or("")
            );

Replacement in src/repo.rs at line 172 [4.32]
B:BD[7.1008] → [7.1008:1041]
```
        return "<>".to_string();
```
[7.1008]
[7.1041]
```
        "<>".into()
```

Replacement in src/repo.rs at line 188 [4.32]

B:BD[7.1260] → [7.1260:1309]

                .map(|a| self.author_string(&a))

[7.1260]

[7.1309]

                .map(|a| self.author_string(a))

Replacement in src/repo.rs at line 201 [4.32]
B:BD[4.1434] → [4.1434:1462]
```
        return Ok(changes);
```
[4.1434]
[8.647]
```
        Ok(changes)
```

Replacement in src/repo.rs at line 205 [4.32]

B:BD[8.725] → [5.150:230]

        let change_store = EagerChangeStore::from_root(&Path::new(&self.path));

[8.725]

[8.851]

        let change_store = EagerChangeStore::from_root(Path::new(&self.path));

Replacement in src/repo.rs at line 208 [4.32]
B:BD[8.984] → [8.984:1012]
```
        return Ok(Sandbox {
```
[8.984]
[8.1012]
```
        Ok(Sandbox {
```
Replacement in src/repo.rs at line 212 [4.32]
B:BD[8.1076] → [8.1076:1088]
```
        });
```
[8.1076]
[8.1088]
```
        })
```
Replacement in src/repo.rs at line 237 [4.32]
B:BD[8.1912] → [8.1912:1935]
```
        return Ok(());
```
[8.1912]
[8.1935]
```
        Ok(())
```

Replacement in src/repo.rs at line 250 [4.32]

B:BD[2.433] → [2.433:561]

                if int_ < int {
                    continue;
                } else if int_ > int {
                    break;

[2.433]

[2.561]

                match int_.cmp(int) {
                    Ordering::Less => continue,
                    Ordering::Greater => break,
                    Ordering::Equal => {
                        if let Some((path, _)) = libpijul::fs::find_path(
                            &self.change_store,
                            &*txn,
                            &*self.channel.read(),
                            false,
                            *inode,
                        )? {
                            touched_paths.insert(path);
                        } else {
                            touched_paths.clear();
                            break;
                        }
                    }

Deletion in src/repo.rs at line 268 [4.32]

B:BD[2.579] → [2.579:992]

                if let Some((path, _)) = libpijul::fs::find_path(
                    &self.change_store,
                    &*txn,
                    &*self.channel.read(),
                    false,
                    *inode,
                )? {
                    touched_paths.insert(path);
                } else {
                    touched_paths.clear();
                    break;
                }

Replacement in src/repo.rs at line 280 [4.32]

B:BD[2.1232] → [2.1232:1664]

            match last {
                Some(last_path) => {
                    // If `last_path` is a prefix (in the path sense) of `path`, skip.
                    if last_path.len() < path.len() {
                        let (pre_last, post_last) = path.split_at(last_path.len());
                        if pre_last == last_path && post_last.starts_with("/") {
                            continue;
                        }

[2.1232]

[2.1664]

            if let Some(last_path) = last {
                // If `last_path` is a prefix (in the path sense) of `path`, skip.
                if last_path.len() < path.len() {
                    let (pre_last, post_last) = path.split_at(last_path.len());
                    if pre_last == last_path && post_last.starts_with('/') {
                        continue;

Deletion in src/repo.rs at line 288 [4.32]
B:BD[2.1704] → [2.1704:1729]
```
                _ => (),
```
Replacement in src/repo.rs at line 303 [4.32]
∅:D[2.2080] → [10.129:152]
B:BD[8.2355] → [10.129:152]
```
        return Ok(fs);
```
[2.2080]
[4.1462]
```
        Ok(fs)
```
Replacement in src/repo.rs at line 402 [4.32]
∅:D[10.817] → [8.5612:5634]
B:BD[8.5612] → [8.5612:5634]
```
        return Ok(f);
```
[10.817]
[8.5634]
```
        Ok(f)
```

Replacement in src/main.rs at line 39 [12.67]

B:BD[11.121] → [3.733:823]

∅:D[3.823] → [11.219:239]

B:BD[11.219] → [11.219:239]

    match cli.marks {
        Some(ref filename) => stream.load_marks(filename).unwrap(),
        None => (),

[11.121]

[11.239]

    if let Some(ref filename) = cli.marks {
        stream.load_marks(filename).unwrap();

Replacement in src/main.rs at line 69 [12.67]

B:BD[11.573] → [3.1190:1280]

∅:D[3.1280] → [11.671:691]

B:BD[11.671] → [11.671:691]

    match cli.marks {
        Some(ref filename) => stream.save_marks(filename).unwrap(),
        None => (),

[11.573]

[13.939]

    if let Some(ref filename) = cli.marks {
        stream.save_marks(filename).unwrap();

Replacement in src/fast_export.rs at line 25 [15.313]
B:BD[14.317] → [14.317:336]
```
    return result;
```
[14.317]
[14.336]
```
    result
```

Replacement in src/fast_export.rs at line 40 [15.313]

B:BD[15.426] → [16.407:499]

    pub fn new(branch_name: String) -> FastExportStream {
        return FastExportStream {

[15.426]

[16.499]

    pub fn new(branch_name: String) -> Self {
        FastExportStream {

Replacement in src/fast_export.rs at line 50 [15.313]
∅:D[17.79] → [16.599:610]
∅:D[8.6007] → [16.599:610]
B:BD[16.599] → [16.599:610]
```
        };
```
[17.79]
[16.610]
```
        }
```

Replacement in src/fast_export.rs at line 56 [15.313]

B:BD[10.1070] → [10.1070:1970]

            match &op {
                FileOp::Modify { fw } => {
                    let ct = fw.content.lock().unwrap();
                    let content: &[u8] = &*ct;
                    let h = sha256::digest(content);
                    let mut new_blob = false;
                    let blob_mark = *self.blob_marks.entry(h).or_insert_with(|| {
                        new_blob = true;
                        self.max_blob_mark += 1;
                        self.max_blob_mark
                    });
                    file_marks.insert(fw.name.clone(), blob_mark);
                    if new_blob {
                        println!("blob");
                        println!("mark :{}", blob_mark);
                        println!("data {}", content.len());
                        std::io::stdout().write_all(content).unwrap();
                        println!("");
                    }

[10.1070]

[10.1970]

            if let FileOp::Modify { fw } = &op {
                let ct = fw.content.lock().unwrap();
                let content: &[u8] = &ct;
                let h = sha256::digest(content);
                let mut new_blob = false;
                let blob_mark = *self.blob_marks.entry(h).or_insert_with(|| {
                    new_blob = true;
                    self.max_blob_mark += 1;
                    self.max_blob_mark
                });
                file_marks.insert(fw.name.clone(), blob_mark);
                if new_blob {
                    println!("blob");
                    println!("mark :{}", blob_mark);
                    println!("data {}", content.len());
                    std::io::stdout().write_all(content).unwrap();
                    println!();

Deletion in src/fast_export.rs at line 74 [15.313]
B:BD[10.1988] → [10.1988:2013]
```
                _ => (),
```

Replacement in src/fast_export.rs at line 90 [15.313]

∅:D[16.893] → [15.557:606]

B:BD[15.557] → [15.557:606]

        let committer = if c.authors.len() > 0 {

[16.893]

[15.606]

        let committer = if c.authors.is_empty() {
            "<>"
        } else {

Deletion in src/fast_export.rs at line 94 [15.313]
B:BD[15.632] → [15.632:666]
```
        } else {
            "<>"
```

Replacement in src/fast_export.rs at line 102 [15.313]

B:BD[15.1010] → [16.894:917]

B:BD[16.917] → [8.6530:6676]

∅:D[8.6676] → [16.1108:1123]

B:BD[16.1108] → [16.1108:1123]

B:BD[16.1123] → [8.6677:6700]

        match parent {
            Some(p) => match self.commit_marks.get(&p) {
                Some(p_mark) => println!("from :{}", p_mark),
                None => {}
            },
            None => {}

[15.1010]

[8.6700]

        if let Some(p) = parent {
            if let Some(p_mark) = self.commit_marks.get(&p) {
                println!("from :{}", p_mark);
            }

Replacement in src/fast_export.rs at line 114 [15.313]

B:BD[10.2302] → [10.2302:2389]

                FileOp::Delete { path } => println!("D \"{}\"", escape_string(&path)),

[10.2302]

[10.2389]

                FileOp::Delete { path } => println!("D \"{}\"", escape_string(path)),

Replacement in src/fast_export.rs at line 116 [15.313]

B:BD[10.2438] → [10.2438:2528]

                    println!("R \"{}\" \"{}\"", escape_string(&old), escape_string(&new))

[10.2438]

[10.2528]

                    println!("R \"{}\" \"{}\"", escape_string(old), escape_string(new))

Replacement in src/fast_export.rs at line 120 [15.313]
B:BD[15.1082] → [15.1082:1104]
```
        println!("");
```
[16.1157]
[11.1093]
```
        println!();
```

Replacement in src/fast_export.rs at line 126 [15.313]

B:BD[11.1265] → [11.1265:1338]

        let state = libpijul::Merkle::from_base32(&caps[2].as_bytes())?;

[11.1265]

[11.1338]

        let state = libpijul::Merkle::from_base32(caps[2].as_bytes())?;

Replacement in src/fast_export.rs at line 150 [15.313]
B:BD[11.2225] → [11.2225:2248]
```
        return Ok(());
```
[11.2225]
[11.2248]
```
        Ok(())
```

Replacement in src/fast_export.rs at line 154 [15.313]

B:BD[11.2332] → [11.2332:2385]

        std::fs::write(&filename, &self.mark_file)?;

[11.2332]

[11.2385]

        std::fs::write(filename, &self.mark_file)?;

Replacement in src/changestore.rs at line 49 [5.326]

B:BD[5.1738] → [5.1738:1778]

            if let Some(_) = r.get(h) {

[5.1738]

[5.1778]

            if r.get(h).is_some() {

Replacement in src/changestore.rs at line 56 [5.326]

B:BD[5.1919] → [5.1919:1978]

        let p = Change::deserialize(&file_name, Some(h))?;

[5.1919]

[5.1978]

        let p = Change::deserialize(file_name, Some(h))?;

Replacement in src/changestore.rs at line 83 [5.326]
B:BD[5.2693] → [5.2693:2730]
```
        if let Some(t) = r.get(&h) {
```
[5.2693]
[5.2730]
```
        if let Some(t) = r.get(h) {
```

Fix most clippy warnings

Dependencies

In channels

Change contents

Insertion in src/repo.rs at line 1 [4.32]

Replacement in src/repo.rs at line 99 [4.32]

Replacement in src/repo.rs at line 103 [4.32]

Replacement in src/repo.rs at line 111 [4.32]

Replacement in src/repo.rs at line 116 [4.32]

Replacement in src/repo.rs at line 125 [4.32]

Replacement in src/repo.rs at line 133 [4.32]

Replacement in src/repo.rs at line 154 [4.32]

Replacement in src/repo.rs at line 161 [4.32]

Replacement in src/repo.rs at line 172 [4.32]

Replacement in src/repo.rs at line 188 [4.32]

Replacement in src/repo.rs at line 201 [4.32]

Replacement in src/repo.rs at line 205 [4.32]

Replacement in src/repo.rs at line 208 [4.32]

Replacement in src/repo.rs at line 212 [4.32]

Replacement in src/repo.rs at line 237 [4.32]

Replacement in src/repo.rs at line 250 [4.32]

Deletion in src/repo.rs at line 268 [4.32]

Replacement in src/repo.rs at line 280 [4.32]

Deletion in src/repo.rs at line 288 [4.32]

Replacement in src/repo.rs at line 303 [4.32]

Replacement in src/repo.rs at line 402 [4.32]

Replacement in src/main.rs at line 39 [12.67]

Replacement in src/main.rs at line 69 [12.67]

Replacement in src/fast_export.rs at line 25 [15.313]

Replacement in src/fast_export.rs at line 40 [15.313]

Replacement in src/fast_export.rs at line 50 [15.313]

Replacement in src/fast_export.rs at line 56 [15.313]

Deletion in src/fast_export.rs at line 74 [15.313]

Replacement in src/fast_export.rs at line 90 [15.313]

Deletion in src/fast_export.rs at line 94 [15.313]