Skip to content

Commit cb784b7

Browse files
committed
Remove DefRegion, which is not used
1 parent 1dd5ffa commit cb784b7

File tree

7 files changed

+5
-11
lines changed

7 files changed

+5
-11
lines changed

src/librustc/middle/astencode.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,6 @@ impl tr for def::Def {
476476
def::DefUpvar(dcx.tr_id(nid1), index, dcx.tr_id(nid2))
477477
}
478478
def::DefStruct(did) => def::DefStruct(did.tr(dcx)),
479-
def::DefRegion(nid) => def::DefRegion(dcx.tr_id(nid)),
480479
def::DefLabel(nid) => def::DefLabel(dcx.tr_id(nid))
481480
}
482481
}

src/librustc/middle/def.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ pub enum Def {
5050
/// - If it's an ExprPath referring to some tuple struct, then DefMap maps
5151
/// it to a def whose id is the StructDef.ctor_id.
5252
DefStruct(DefId),
53-
DefRegion(ast::NodeId),
5453
DefLabel(ast::NodeId),
5554
DefMethod(DefId),
5655
}
@@ -125,7 +124,7 @@ impl Def {
125124
DefVariant(..) | DefTy(..) | DefAssociatedTy(..) |
126125
DefTyParam(..) | DefUse(..) | DefStruct(..) | DefTrait(..) |
127126
DefMethod(..) | DefConst(..) | DefAssociatedConst(..) |
128-
DefPrimTy(..) | DefRegion(..) | DefLabel(..) | DefSelfTy(..) => {
127+
DefPrimTy(..) | DefLabel(..) | DefSelfTy(..) => {
129128
panic!("attempted .def_id() on invalid {:?}", self)
130129
}
131130
}
@@ -143,7 +142,6 @@ impl Def {
143142

144143
DefLocal(id) |
145144
DefUpvar(id, _, _) |
146-
DefRegion(id) |
147145
DefLabel(id) |
148146
DefSelfTy(_, Some((_, id))) => {
149147
DefId::xxx_local(id) // TODO, clearly

src/librustc/middle/mem_categorization.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ impl<'t, 'a,'tcx> MemCategorizationContext<'t, 'a, 'tcx> {
551551
}
552552
def::DefMod(_) | def::DefForeignMod(_) | def::DefUse(_) |
553553
def::DefTrait(_) | def::DefTy(..) | def::DefPrimTy(_) |
554-
def::DefTyParam(..) | def::DefRegion(_) |
554+
def::DefTyParam(..) |
555555
def::DefLabel(_) | def::DefSelfTy(..) |
556556
def::DefAssociatedTy(..) => {
557557
Ok(Rc::new(cmt_ {

src/librustc_resolve/build_reduced_graph.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,7 @@ impl<'a, 'b:'a, 'tcx:'b> GraphBuilder<'a, 'b, 'tcx> {
816816
self.structs.insert(def_id, fields);
817817
}
818818
DefLocal(..) | DefPrimTy(..) | DefTyParam(..) |
819-
DefUse(..) | DefUpvar(..) | DefRegion(..) |
819+
DefUse(..) | DefUpvar(..) |
820820
DefLabel(..) | DefSelfTy(..) => {
821821
panic!("didn't expect `{:?}`", def);
822822
}

src/librustc_trans/save/dump_csv.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,6 @@ impl <'l, 'tcx> DumpCsvVisitor<'l, 'tcx> {
264264
def::DefFn(..) => Some(recorder::FnRef),
265265

266266
def::DefSelfTy(..) |
267-
def::DefRegion(_) |
268267
def::DefLabel(_) |
269268
def::DefTyParam(..) |
270269
def::DefUse(_) |

src/librustc_trans/trans/callee.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,8 @@ fn trans<'blk, 'tcx>(bcx: Block<'blk, 'tcx>, expr: &hir::Expr)
215215
}
216216
def::DefMod(..) | def::DefForeignMod(..) | def::DefTrait(..) |
217217
def::DefTy(..) | def::DefPrimTy(..) | def::DefAssociatedTy(..) |
218-
def::DefUse(..) | def::DefRegion(..) | def::DefLabel(..) |
219-
def::DefTyParam(..) | def::DefSelfTy(..) => {
218+
def::DefUse(..) | def::DefLabel(..) | def::DefTyParam(..) |
219+
def::DefSelfTy(..) => {
220220
bcx.tcx().sess.span_bug(
221221
ref_expr.span,
222222
&format!("cannot translate def {:?} \

src/librustc_typeck/check/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4318,7 +4318,6 @@ fn type_scheme_and_predicates_for_def<'a, 'tcx>(fcx: &FnCtxt<'a, 'tcx>,
43184318
def::DefMod(..) |
43194319
def::DefForeignMod(..) |
43204320
def::DefUse(..) |
4321-
def::DefRegion(..) |
43224321
def::DefLabel(..) |
43234322
def::DefSelfTy(..) => {
43244323
fcx.ccx.tcx.sess.span_bug(sp, &format!("expected value, found {:?}", defn));
@@ -4489,7 +4488,6 @@ pub fn instantiate_path<'a, 'tcx>(fcx: &FnCtxt<'a, 'tcx>,
44894488
def::DefForeignMod(..) |
44904489
def::DefLocal(..) |
44914490
def::DefUse(..) |
4492-
def::DefRegion(..) |
44934491
def::DefLabel(..) |
44944492
def::DefUpvar(..) => {
44954493
segment_spaces = vec![None; segments.len()];

0 commit comments

Comments
 (0)