|
11 | 11 | //! See README.md |
12 | 12 |
|
13 | 13 | use self::CombineMapType::*; |
14 | | -use self::UndoLogEntry::*; |
| 14 | +use self::UndoLog::*; |
15 | 15 |
|
16 | 16 | use super::unify_key; |
17 | 17 | use super::{MiscVariable, RegionVariableOrigin, SubregionOrigin}; |
@@ -59,7 +59,7 @@ pub struct RegionConstraintCollector<'tcx> { |
59 | 59 | /// otherwise we end up adding entries for things like the lower |
60 | 60 | /// bound on a variable and so forth, which can never be rolled |
61 | 61 | /// back. |
62 | | - undo_log: Vec<UndoLogEntry<'tcx>>, |
| 62 | + undo_log: Vec<UndoLog<'tcx>>, |
63 | 63 |
|
64 | 64 | /// When we add a R1 == R2 constriant, we currently add (a) edges |
65 | 65 | /// R1 <= R2 and R2 <= R1 and (b) we unify the two regions in this |
@@ -254,7 +254,7 @@ struct TwoRegions<'tcx> { |
254 | 254 | } |
255 | 255 |
|
256 | 256 | #[derive(Copy, Clone, PartialEq)] |
257 | | -enum UndoLogEntry<'tcx> { |
| 257 | +enum UndoLog<'tcx> { |
258 | 258 | /// Pushed when we start a snapshot. |
259 | 259 | OpenSnapshot, |
260 | 260 |
|
@@ -456,7 +456,7 @@ impl<'tcx> RegionConstraintCollector<'tcx> { |
456 | 456 | self.any_unifications = snapshot.any_unifications; |
457 | 457 | } |
458 | 458 |
|
459 | | - fn rollback_undo_entry(&mut self, undo_entry: UndoLogEntry<'tcx>) { |
| 459 | + fn rollback_undo_entry(&mut self, undo_entry: UndoLog<'tcx>) { |
460 | 460 | match undo_entry { |
461 | 461 | OpenSnapshot => { |
462 | 462 | panic!("Failure to observe stack discipline"); |
@@ -548,7 +548,7 @@ impl<'tcx> RegionConstraintCollector<'tcx> { |
548 | 548 |
|
549 | 549 | fn kill_constraint<'tcx>( |
550 | 550 | placeholders: &FxHashSet<ty::Region<'tcx>>, |
551 | | - undo_entry: &UndoLogEntry<'tcx>, |
| 551 | + undo_entry: &UndoLog<'tcx>, |
552 | 552 | ) -> bool { |
553 | 553 | match undo_entry { |
554 | 554 | &AddConstraint(Constraint::VarSubVar(..)) => false, |
|
0 commit comments