diff options
| author | Nicholas Nethercote <nnethercote@mozilla.com> | 2018-11-05 09:34:37 +1100 |
|---|---|---|
| committer | Nicholas Nethercote <nnethercote@mozilla.com> | 2018-11-25 17:54:06 +1100 |
| commit | c86bbd4830410f19812ddbe4286ebb83ae043a4b (patch) | |
| tree | 2f4b7fe2595cc312c59c54c6861fb48ae164b2ec | |
| parent | 9847b5cfcb16876630064ed766fbbb7545c67368 (diff) | |
| download | rust-c86bbd4830410f19812ddbe4286ebb83ae043a4b.tar.gz rust-c86bbd4830410f19812ddbe4286ebb83ae043a4b.zip | |
Rename `UndoLogEntry` as `UndoLog`.
So that it matches `librustc_data_structures/snapshot_map/mod.rs` and the `ena` crate.
| -rw-r--r-- | src/librustc/infer/region_constraints/mod.rs | 10 | ||||
| -rw-r--r-- | src/librustc/infer/region_constraints/taint.rs | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/librustc/infer/region_constraints/mod.rs b/src/librustc/infer/region_constraints/mod.rs index 391bfc428c3..eb4c0d08f9f 100644 --- a/src/librustc/infer/region_constraints/mod.rs +++ b/src/librustc/infer/region_constraints/mod.rs @@ -11,7 +11,7 @@ //! See README.md use self::CombineMapType::*; -use self::UndoLogEntry::*; +use self::UndoLog::*; use super::unify_key; use super::{MiscVariable, RegionVariableOrigin, SubregionOrigin}; @@ -59,7 +59,7 @@ pub struct RegionConstraintCollector<'tcx> { /// otherwise we end up adding entries for things like the lower /// bound on a variable and so forth, which can never be rolled /// back. - undo_log: Vec<UndoLogEntry<'tcx>>, + undo_log: Vec<UndoLog<'tcx>>, /// When we add a R1 == R2 constriant, we currently add (a) edges /// R1 <= R2 and R2 <= R1 and (b) we unify the two regions in this @@ -254,7 +254,7 @@ struct TwoRegions<'tcx> { } #[derive(Copy, Clone, PartialEq)] -enum UndoLogEntry<'tcx> { +enum UndoLog<'tcx> { /// Pushed when we start a snapshot. OpenSnapshot, @@ -456,7 +456,7 @@ impl<'tcx> RegionConstraintCollector<'tcx> { self.any_unifications = snapshot.any_unifications; } - fn rollback_undo_entry(&mut self, undo_entry: UndoLogEntry<'tcx>) { + fn rollback_undo_entry(&mut self, undo_entry: UndoLog<'tcx>) { match undo_entry { OpenSnapshot => { panic!("Failure to observe stack discipline"); @@ -548,7 +548,7 @@ impl<'tcx> RegionConstraintCollector<'tcx> { fn kill_constraint<'tcx>( placeholders: &FxHashSet<ty::Region<'tcx>>, - undo_entry: &UndoLogEntry<'tcx>, + undo_entry: &UndoLog<'tcx>, ) -> bool { match undo_entry { &AddConstraint(Constraint::VarSubVar(..)) => false, diff --git a/src/librustc/infer/region_constraints/taint.rs b/src/librustc/infer/region_constraints/taint.rs index ef7365276f6..9f08fdcad7e 100644 --- a/src/librustc/infer/region_constraints/taint.rs +++ b/src/librustc/infer/region_constraints/taint.rs @@ -29,7 +29,7 @@ impl<'tcx> TaintSet<'tcx> { pub(super) fn fixed_point( &mut self, tcx: TyCtxt<'_, '_, 'tcx>, - undo_log: &[UndoLogEntry<'tcx>], + undo_log: &[UndoLog<'tcx>], verifys: &[Verify<'tcx>], ) { let mut prev_len = 0; |
