Skip to content

Commit da2f897

Browse files
committed
remove un-needed variants
1 parent 2069e8c commit da2f897

File tree

2 files changed

+2
-20
lines changed
  • compiler

2 files changed

+2
-20
lines changed

compiler/rustc_smir/src/rustc_smir/mod.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
//! For now, we are developing everything inside `rustc`, thus, we keep this module private.
99
1010
use crate::rustc_smir::hir::def::DefKind;
11-
use crate::rustc_smir::stable_mir::ty::{BoundRegion, EarlyBoundRegion, FreeRegion, Region};
11+
use crate::rustc_smir::stable_mir::ty::{BoundRegion, EarlyBoundRegion, Region};
1212
use rustc_hir as hir;
1313
use rustc_middle::mir;
1414
use rustc_middle::mir::interpret::{alloc_range, AllocId};
@@ -1521,12 +1521,7 @@ impl<'tcx> Stable<'tcx> for ty::RegionKind<'tcx> {
15211521
db_index.as_u32(),
15221522
BoundRegion { var: bound_reg.var.as_u32(), kind: bound_reg.kind.stable(tables) },
15231523
),
1524-
ty::ReFree(free_reg) => RegionKind::ReFree(FreeRegion {
1525-
scope: tables.region_def(free_reg.scope),
1526-
bound_region: free_reg.bound_region.stable(tables),
1527-
}),
15281524
ty::ReStatic => RegionKind::ReStatic,
1529-
ty::ReVar(vid_reg) => RegionKind::ReVar(vid_reg.as_u32()),
15301525
ty::RePlaceholder(place_holder) => {
15311526
RegionKind::RePlaceholder(stable_mir::ty::Placeholder {
15321527
universe: place_holder.universe.as_u32(),
@@ -1537,7 +1532,7 @@ impl<'tcx> Stable<'tcx> for ty::RegionKind<'tcx> {
15371532
})
15381533
}
15391534
ty::ReErased => RegionKind::ReErased,
1540-
ty::ReError(_) => RegionKind::ReError(()),
1535+
_=> unimplemented!()
15411536
}
15421537
}
15431538
}

compiler/stable_mir/src/ty.rs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,9 @@ pub struct Region {
4444
pub enum RegionKind {
4545
ReEarlyBound(EarlyBoundRegion),
4646
ReLateBound(DebruijnIndex, BoundRegion),
47-
ReFree(FreeRegion),
4847
ReStatic,
49-
ReVar(RegionVid),
5048
RePlaceholder(Placeholder<BoundRegion>),
5149
ReErased,
52-
ReError(ErrorGuaranteed),
5350
}
5451

5552
pub(crate) type DebruijnIndex = u32;
@@ -69,14 +66,6 @@ pub struct BoundRegion {
6966
pub kind: BoundRegionKind,
7067
}
7168

72-
#[derive(Debug, Clone)]
73-
pub struct FreeRegion {
74-
pub scope: RegionDef,
75-
pub bound_region: BoundRegionKind,
76-
}
77-
78-
pub(crate) type RegionVid = u32;
79-
8069
pub(crate) type UniverseIndex = u32;
8170

8271
#[derive(Debug, Clone)]
@@ -85,8 +74,6 @@ pub struct Placeholder<T> {
8574
pub bound: T,
8675
}
8776

88-
pub(crate) type ErrorGuaranteed = ();
89-
9077
#[derive(Clone, Copy, PartialEq, Eq)]
9178
pub struct Span(pub usize);
9279

0 commit comments

Comments
 (0)