Skip to content

Commit c86bbd4

Browse files
committed
Rename UndoLogEntry as UndoLog.
So that it matches `librustc_data_structures/snapshot_map/mod.rs` and the `ena` crate.
1 parent 9847b5c commit c86bbd4

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/librustc/infer/region_constraints/mod.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//! See README.md
1212
1313
use self::CombineMapType::*;
14-
use self::UndoLogEntry::*;
14+
use self::UndoLog::*;
1515

1616
use super::unify_key;
1717
use super::{MiscVariable, RegionVariableOrigin, SubregionOrigin};
@@ -59,7 +59,7 @@ pub struct RegionConstraintCollector<'tcx> {
5959
/// otherwise we end up adding entries for things like the lower
6060
/// bound on a variable and so forth, which can never be rolled
6161
/// back.
62-
undo_log: Vec<UndoLogEntry<'tcx>>,
62+
undo_log: Vec<UndoLog<'tcx>>,
6363

6464
/// When we add a R1 == R2 constriant, we currently add (a) edges
6565
/// R1 <= R2 and R2 <= R1 and (b) we unify the two regions in this
@@ -254,7 +254,7 @@ struct TwoRegions<'tcx> {
254254
}
255255

256256
#[derive(Copy, Clone, PartialEq)]
257-
enum UndoLogEntry<'tcx> {
257+
enum UndoLog<'tcx> {
258258
/// Pushed when we start a snapshot.
259259
OpenSnapshot,
260260

@@ -456,7 +456,7 @@ impl<'tcx> RegionConstraintCollector<'tcx> {
456456
self.any_unifications = snapshot.any_unifications;
457457
}
458458

459-
fn rollback_undo_entry(&mut self, undo_entry: UndoLogEntry<'tcx>) {
459+
fn rollback_undo_entry(&mut self, undo_entry: UndoLog<'tcx>) {
460460
match undo_entry {
461461
OpenSnapshot => {
462462
panic!("Failure to observe stack discipline");
@@ -548,7 +548,7 @@ impl<'tcx> RegionConstraintCollector<'tcx> {
548548

549549
fn kill_constraint<'tcx>(
550550
placeholders: &FxHashSet<ty::Region<'tcx>>,
551-
undo_entry: &UndoLogEntry<'tcx>,
551+
undo_entry: &UndoLog<'tcx>,
552552
) -> bool {
553553
match undo_entry {
554554
&AddConstraint(Constraint::VarSubVar(..)) => false,

src/librustc/infer/region_constraints/taint.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ impl<'tcx> TaintSet<'tcx> {
2929
pub(super) fn fixed_point(
3030
&mut self,
3131
tcx: TyCtxt<'_, '_, 'tcx>,
32-
undo_log: &[UndoLogEntry<'tcx>],
32+
undo_log: &[UndoLog<'tcx>],
3333
verifys: &[Verify<'tcx>],
3434
) {
3535
let mut prev_len = 0;

0 commit comments

Comments
 (0)