Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions src/librustc_data_structures/snapshot_map/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ pub struct SnapshotMap<K, V>
}

pub struct Snapshot {
len: usize
len: usize,
}

enum UndoLog<K, V> {
Expand All @@ -39,7 +39,7 @@ impl<K, V> SnapshotMap<K, V>
pub fn new() -> Self {
SnapshotMap {
map: FnvHashMap(),
undo_log: vec![]
undo_log: vec![],
}
}

Expand Down Expand Up @@ -68,9 +68,7 @@ impl<K, V> SnapshotMap<K, V>
}
true
}
None => {
false
}
None => false,
}
}

Expand All @@ -88,7 +86,7 @@ impl<K, V> SnapshotMap<K, V>
assert!(snapshot.len < self.undo_log.len());
assert!(match self.undo_log[snapshot.len] {
UndoLog::OpenSnapshot => true,
_ => false
_ => false,
});
}

Expand All @@ -110,7 +108,7 @@ impl<K, V> SnapshotMap<K, V>
panic!("cannot rollback an uncommitted snapshot");
}

UndoLog::CommittedSnapshot => { }
UndoLog::CommittedSnapshot => {}

UndoLog::Inserted(key) => {
self.map.remove(&key);
Expand All @@ -123,7 +121,10 @@ impl<K, V> SnapshotMap<K, V>
}

let v = self.undo_log.pop().unwrap();
assert!(match v { UndoLog::OpenSnapshot => true, _ => false });
assert!(match v {
UndoLog::OpenSnapshot => true,
_ => false,
});
assert!(self.undo_log.len() == snapshot.len);
}
}
Expand Down