bigger clippy refactors

[?]

Nov 30, 2020, 3:23 PM

KDF6FJRVF72L274BEUJCTUKRFMNL6BDZMTVKDPEYGFX4TC3YOVSQC

Dependencies

[2] I52XSRUH Massive cleanup, and simplification
[3] 76PCXGML Pushing to, and pulling from the local repository
[4] K6GWUOD5 Styling progress bars
[5] 43AJ37IX Getting rid of edge validation, which does not work for zombie conflicts
[6] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
[7] Q45QHPO4 Feedback on network stuff

Change contents

replacement in pijul/src/commands/pushpull.rs at line 153

[3.115664]→[3.115664:115696](∅→∅)

vec![p.to_string()]

[3.115664]

[3.115696]

vec![p]
replacement in libpijul/src/record.rs at line 659

[3.513201]→[3.513201:513298](∅→∅)

(&previous_name[2..] != &name[2..]) || (new_meta != old_meta && cfg!(not(windows)));

[3.513201]

[2.34801]

(previous_name[2..] != name[2..]) || (new_meta != old_meta && cfg!(not(windows)));
replacement in libpijul/src/pristine/vertex.rs at line 127

[3.529140]→[3.529140:529276](∅→∅)

let n = if let Some(n) = s.iter().position(|c| *c == b'.') {
n
} else {
return None;
};

[3.529140]

[3.529276]

let n = s.iter().position(|c| *c == b'.')?;
replacement in libpijul/src/pristine/vertex.rs at line 130

[3.529343]→[3.529343:529478](∅→∅)

let change = if let Some(change) = H::from_base32(s) {
change
} else {
return None;
};

[3.529343]

[3.529478]

let change = H::from_base32(s)?;
replacement in libpijul/src/pristine/vertex.rs at line 132

[3.529508]→[3.529508:529854](∅→∅)

let len = if let Ok(len) = data_encoding::BASE32_NOPAD.decode_len(pos.len()) {
len
} else {
return None;
};
let pos = if let Ok(_) = data_encoding::BASE32_NOPAD.decode_mut(pos, &mut dec[..len]) {
LittleEndian::read_u64(&dec)
} else {
return None;
};

[3.529508]

[3.529854]

let len = data_encoding::BASE32_NOPAD.decode_len(pos.len()).ok()?;
let pos = data_encoding::BASE32_NOPAD
.decode_mut(pos, &mut dec[..len])
.map(|_| LittleEndian::read_u64(&dec))
.ok()?;
replacement in libpijul/src/pristine/change_id.rs at line 31

[3.667343]→[3.667343:667427](∅→∅)

if let Ok(_) = data_encoding::BASE32_NOPAD.decode_mut(b, &mut dec[..len]) {

[3.667343]

[3.667427]

if data_encoding::BASE32_NOPAD
.decode_mut(b, &mut dec[..len])
.is_ok()
{
replacement in libpijul/src/missing_context.rs at line 24

[3.697325]→[3.697325:697406](∅→∅)

return Err(crate::Error::InconsistentChange.into());

[3.697325]

[3.697406]

return Err(crate::Error::InconsistentChange);
replacement in libpijul/src/fs.rs at line 712

[2.64427]→[3.762172:762280](∅→∅),[3.762172]→[3.762172:762280](∅→∅)

.filter(|e| e.flag.contains(EdgeFlags::PARENT | EdgeFlags::FOLDER))
.next()

[2.64427]

[3.762280]

.find(|e| e.flag.contains(EdgeFlags::PARENT | EdgeFlags::FOLDER))
replacement in libpijul/src/apply.rs at line 182

[3.950325]→[3.950325:950554](∅→∅),[3.950600]→[3.950600:951533](∅→∅)

match *change_ {
Atom::EdgeMap(ref n) => {
for edge in n.edges.iter() {
if edge.flag.contains(EdgeFlags::DELETED) {
put_newedge(
txn,
channel,
ws,
change_id,
n.inode,
edge,
|_, _, _, _| Ok(true),
)?;
// org id aNVimxa4oSqbTYJ033w2QbZTCVMG/+tO2ymc1QSWPH0=
crate::missing_context::collect_zombie_context(
txn,
channel,
&mut ws.missing_context,
n.inode,
edge,
change_id,
|h| change.knows(&h),
)?
// org id hXW9eN25ZM8EQ5B2Ew8NMra+xi7hFv6CN8no+qg8GpY=
}

[3.950325]

[3.951533]

if let Atom::EdgeMap(ref n) = *change_ {
for edge in n.edges.iter() {
if edge.flag.contains(EdgeFlags::DELETED) {
put_newedge(txn, channel, ws, change_id, n.inode, edge, |_, _, _, _| {
Ok(true)
})?;
// org id aNVimxa4oSqbTYJ033w2QbZTCVMG/+tO2ymc1QSWPH0=
crate::missing_context::collect_zombie_context(
txn,
channel,
&mut ws.missing_context,
n.inode,
edge,
change_id,
|h| change.knows(&h),
)?
// org id hXW9eN25ZM8EQ5B2Ew8NMra+xi7hFv6CN8no+qg8GpY=
edit in libpijul/src/apply.rs at line 201

[3.951573]→[3.951573:951597](∅→∅)

_ => {}
edit in libpijul/src/apply.rs at line 799

[3.971862]

[3.971862]

} else if let Ok(dest) = find_block(txn, channel, p.dest) {
(next_vertex, dest)
replacement in libpijul/src/apply.rs at line 802

[3.971879]→[2.70823:70888](∅→∅),[2.70888]→[3.971943:972040](∅→∅),[3.971943]→[3.971943:972040](∅→∅)

if let Ok(dest) = find_block(txn, channel, p.dest) {
(next_vertex, dest)
} else {
continue;
}

[3.971879]

[3.972040]

continue;
replacement in libpijul/src/apply.rs at line 910

[2.72020]→[2.72020:72118](∅→∅)

.filter(|e| e.introduced_by != change_id)
.next()

[2.72020]

[2.72118]

.find(|e| e.introduced_by != change_id)
replacement in libpijul/src/apply.rs at line 981

[3.978920]→[3.978920:979334](∅→∅)

match atom {
Atom::EdgeMap(ref n) => {
for e in n.edges.iter() {
assert!(!e.flag.contains(EdgeFlags::PARENT));
if e.flag.contains(EdgeFlags::FOLDER | EdgeFlags::DELETED) {
if e.to.len() > 0 {
repair_edge(txn, channel, e, change_id, ws)?;
}
}

[3.978920]

[3.979334]

if let Atom::EdgeMap(ref n) = atom {
for e in n.edges.iter() {
assert!(!e.flag.contains(EdgeFlags::PARENT));
if e.flag.contains(EdgeFlags::FOLDER | EdgeFlags::DELETED) && e.to.len() > 0 {
repair_edge(txn, channel, e, change_id, ws)?;
edit in libpijul/src/apply.rs at line 988

[3.979366]→[3.979366:979386](∅→∅)

_ => {}
replacement in libpijul/src/alive/retrieve.rs at line 76

[2.73293]→[2.73293:73332](∅→∅)

if crate::pristine::iter_adjacent(

[2.73293]

[2.73332]

crate::pristine::iter_adjacent(
replacement in libpijul/src/alive/retrieve.rs at line 83

[2.73482]→[2.73482:73542](∅→∅)

.next()
.is_none()
{
return None;
}

[2.73482]

[2.73542]

.next()?;