diff options
| author | mark <markm@cs.wisc.edu> | 2020-04-24 14:26:11 -0500 |
|---|---|---|
| committer | mark <markm@cs.wisc.edu> | 2020-04-24 14:26:11 -0500 |
| commit | 087c0d7ea9c6ceac2d9afef90e80416ba5f6e2eb (patch) | |
| tree | ba2832af118843422e92d890a5be16c9cb5850c4 | |
| parent | d00f94ffc1750854c2b50abeb86f59038f465444 (diff) | |
| download | rust-087c0d7ea9c6ceac2d9afef90e80416ba5f6e2eb.tar.gz rust-087c0d7ea9c6ceac2d9afef90e80416ba5f6e2eb.zip | |
fix a couple more uses of def_kind
| -rw-r--r-- | src/librustc_passes/dead.rs | 2 | ||||
| -rw-r--r-- | src/librustc_passes/stability.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_passes/dead.rs b/src/librustc_passes/dead.rs index 61a9e7d907c..3b778cacefe 100644 --- a/src/librustc_passes/dead.rs +++ b/src/librustc_passes/dead.rs @@ -558,7 +558,7 @@ impl DeadVisitor<'tcx> { if !name.as_str().starts_with('_') { self.tcx.struct_span_lint_hir(lint::builtin::DEAD_CODE, id, span, |lint| { let def_id = self.tcx.hir().local_def_id(id); - let descr = self.tcx.def_kind(def_id).descr(def_id); + let descr = self.tcx.def_kind(def_id).descr(def_id.to_def_id()); lint.build(&format!("{} is never {}: `{}`", descr, participle, name)).emit() }); } diff --git a/src/librustc_passes/stability.rs b/src/librustc_passes/stability.rs index 167590d64c9..ad9934d379a 100644 --- a/src/librustc_passes/stability.rs +++ b/src/librustc_passes/stability.rs @@ -343,7 +343,7 @@ impl<'a, 'tcx> MissingStabilityAnnotations<'a, 'tcx> { !self.tcx.sess.opts.test && stab.is_none() && self.access_levels.is_reachable(hir_id); if is_error { let def_id = self.tcx.hir().local_def_id(hir_id); - let descr = self.tcx.def_kind(def_id).descr(def_id); + let descr = self.tcx.def_kind(def_id).descr(def_id.to_def_id()); self.tcx.sess.span_err(span, &format!("{} has missing stability attribute", descr)); } } |
