bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Inline and remove RegionConstraintStorage::remove_constraint_entry.

Browse source 
It has a single call site.
This commit is contained in:
Nicholas Nethercote 2024-10-03 12:06:34 +10:00
parent 2b57a785a9
commit 85507cffc3
1 changed files with 20 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

44
compiler/rustc_infer/src/infer/region_constraints/mod.rs
View file

@ -320,29 +320,6 @@ impl<'tcx> RegionConstraintStorage<'tcx> {
) -> RegionConstraintCollector<'a, 'tcx> { ) -> RegionConstraintCollector<'a, 'tcx> {
RegionConstraintCollector { storage: self, undo_log } RegionConstraintCollector { storage: self, undo_log }
} }
fn rollback_undo_entry(&mut self, undo_entry: UndoLog<'tcx>) {
match undo_entry {
AddVar(vid) => {
self.var_infos.pop().unwrap();
assert_eq!(self.var_infos.len(), vid.index());
}
AddConstraint(index) => {
self.data.constraints.pop().unwrap();
assert_eq!(self.data.constraints.len(), index);
}
AddVerify(index) => {
self.data.verifys.pop();
assert_eq!(self.data.verifys.len(), index);
}
AddCombination(Glb, ref regions) => {
self.glbs.remove(regions);
}
AddCombination(Lub, ref regions) => {
self.lubs.remove(regions);
}
}
}
} }
impl<'tcx> RegionConstraintCollector<'_, 'tcx> { impl<'tcx> RegionConstraintCollector<'_, 'tcx> {
@ -793,6 +770,25 @@ impl<'tcx> RegionConstraintData<'tcx> {
impl<'tcx> Rollback<UndoLog<'tcx>> for RegionConstraintStorage<'tcx> { impl<'tcx> Rollback<UndoLog<'tcx>> for RegionConstraintStorage<'tcx> {
fn reverse(&mut self, undo: UndoLog<'tcx>) { fn reverse(&mut self, undo: UndoLog<'tcx>) {
self.rollback_undo_entry(undo) match undo {
AddVar(vid) => {
self.var_infos.pop().unwrap();
assert_eq!(self.var_infos.len(), vid.index());
}
AddConstraint(index) => {
self.data.constraints.pop().unwrap();
assert_eq!(self.data.constraints.len(), index);
}
AddVerify(index) => {
self.data.verifys.pop();
assert_eq!(self.data.verifys.len(), index);
}
AddCombination(Glb, ref regions) => {
self.glbs.remove(regions);
}
AddCombination(Lub, ref regions) => {
self.lubs.remove(regions);
}
}
} }
} }