Skip to content

Commit 0cc69f0

Browse files
committed
rustc: Remove def::DefUse
1 parent 785a8a6 commit 0cc69f0

File tree

7 files changed

+4
-10
lines changed

7 files changed

+4
-10
lines changed

src/librustc/middle/def.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ pub enum Def {
3535
DefTrait(DefId),
3636
DefPrimTy(hir::PrimTy),
3737
DefTyParam(ParamSpace, u32, DefId, ast::Name),
38-
DefUse(DefId),
3938
DefUpvar(DefId, // def id of closed over local
4039
ast::NodeId, // node id of closed over local
4140
usize, // index in the freevars list of the closure
@@ -123,7 +122,7 @@ impl Def {
123122

124123
DefFn(..) | DefMod(..) | DefForeignMod(..) | DefStatic(..) |
125124
DefVariant(..) | DefTy(..) | DefAssociatedTy(..) |
126-
DefTyParam(..) | DefUse(..) | DefStruct(..) | DefTrait(..) |
125+
DefTyParam(..) | DefStruct(..) | DefTrait(..) |
127126
DefMethod(..) | DefConst(..) | DefAssociatedConst(..) |
128127
DefPrimTy(..) | DefLabel(..) | DefSelfTy(..) | DefErr => {
129128
panic!("attempted .def_id() on invalid {:?}", self)
@@ -135,7 +134,7 @@ impl Def {
135134
match *self {
136135
DefFn(id, _) | DefMod(id) | DefForeignMod(id) | DefStatic(id, _) |
137136
DefVariant(_, id, _) | DefTy(id, _) | DefAssociatedTy(_, id) |
138-
DefTyParam(_, _, id, _) | DefUse(id) | DefStruct(id) | DefTrait(id) |
137+
DefTyParam(_, _, id, _) | DefStruct(id) | DefTrait(id) |
139138
DefMethod(id) | DefConst(id) | DefAssociatedConst(id) |
140139
DefLocal(id, _) | DefUpvar(id, _, _, _) => {
141140
id

src/librustc/middle/mem_categorization.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ impl<'t, 'a,'tcx> MemCategorizationContext<'t, 'a, 'tcx> {
548548
def::DefAssociatedConst(..) | def::DefFn(..) | def::DefMethod(..) => {
549549
Ok(self.cat_rvalue_node(id, span, expr_ty))
550550
}
551-
def::DefMod(_) | def::DefForeignMod(_) | def::DefUse(_) |
551+
def::DefMod(_) | def::DefForeignMod(_) |
552552
def::DefTrait(_) | def::DefTy(..) | def::DefPrimTy(_) |
553553
def::DefTyParam(..) |
554554
def::DefLabel(_) | def::DefSelfTy(..) |

src/librustc_metadata/astencode.rs

-1
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,6 @@ impl tr for def::Def {
399399
def::DefAssociatedTy(trait_did.tr(dcx), did.tr(dcx)),
400400
def::DefPrimTy(p) => def::DefPrimTy(p),
401401
def::DefTyParam(s, index, def_id, n) => def::DefTyParam(s, index, def_id.tr(dcx), n),
402-
def::DefUse(did) => def::DefUse(did.tr(dcx)),
403402
def::DefUpvar(_, nid1, index, nid2) => {
404403
let nid1 = dcx.tr_id(nid1);
405404
let nid2 = dcx.tr_id(nid2);

src/librustc_resolve/build_reduced_graph.rs

-1
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,6 @@ impl<'a, 'b:'a, 'tcx:'b> GraphBuilder<'a, 'b, 'tcx> {
706706
DefLocal(..) |
707707
DefPrimTy(..) |
708708
DefTyParam(..) |
709-
DefUse(..) |
710709
DefUpvar(..) |
711710
DefLabel(..) |
712711
DefSelfTy(..) |

src/librustc_trans/save/dump_csv.rs

-1
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,6 @@ impl <'l, 'tcx> DumpCsvVisitor<'l, 'tcx> {
274274
def::DefSelfTy(..) |
275275
def::DefLabel(_) |
276276
def::DefTyParam(..) |
277-
def::DefUse(_) |
278277
def::DefMethod(..) |
279278
def::DefPrimTy(_) |
280279
def::DefErr => {

src/librustc_trans/trans/callee.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ 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::DefLabel(..) | def::DefTyParam(..) |
218+
def::DefLabel(..) | def::DefTyParam(..) |
219219
def::DefSelfTy(..) | def::DefErr => {
220220
bcx.tcx().sess.span_bug(
221221
ref_expr.span,

src/librustc_typeck/check/mod.rs

-2
Original file line numberDiff line numberDiff line change
@@ -4327,7 +4327,6 @@ fn type_scheme_and_predicates_for_def<'a, 'tcx>(fcx: &FnCtxt<'a, 'tcx>,
43274327
def::DefTyParam(..) |
43284328
def::DefMod(..) |
43294329
def::DefForeignMod(..) |
4330-
def::DefUse(..) |
43314330
def::DefLabel(..) |
43324331
def::DefSelfTy(..) |
43334332
def::DefErr => {
@@ -4498,7 +4497,6 @@ pub fn instantiate_path<'a, 'tcx>(fcx: &FnCtxt<'a, 'tcx>,
44984497
def::DefMod(..) |
44994498
def::DefForeignMod(..) |
45004499
def::DefLocal(..) |
4501-
def::DefUse(..) |
45024500
def::DefLabel(..) |
45034501
def::DefUpvar(..) |
45044502
def::DefErr => {

0 commit comments

Comments
 (0)