ThetaDev/automerge
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

Simplify if statement to remove unreachable case

Browse source 
If `op_by_id` contains `succ` then we can get the index straight away,
else we can do the original work. This means we don't need an `else`
case for a third situation as in reality there isn't one.
This commit is contained in:
Andrew Jeffery 2021-03-26 14:11:52 +00:00 • committed by Orion Henry
parent 239fe59090
commit 02e1a6b6cc
1 changed files with 3 additions and 7 deletions

10
automerge-backend/src/change.rs
View file

@ -474,7 +474,9 @@ fn group_doc_change_and_doc_ops(
//let id = (op.ctr, op.actor);
//op_by_id.insert(id, i);
for succ in op.succ.iter() {
if !op_by_id.contains_key(&succ) {
if let Some(index) = op_by_id.get(&succ) {
ops[*index].pred.push((op.ctr, op.actor))
} else {
let key = if op.insert {
amp::OpId(op.ctr, actors[op.actor].clone()).into()
} else {
@ -492,12 +494,6 @@ fn group_doc_change_and_doc_ops(
};
op_by_id.insert(*succ, ops.len());
ops.push(del);
} else if let Some(index) = op_by_id.get(&succ) {
ops[*index].pred.push((op.ctr, op.actor))
} else {
return Err(AutomergeError::ChangeDecompressError(
"Doc Succ Invalid".into(),
));
}
}
}