Skip to content

Commit 8d76f54

Browse files
committed
Use opt_def_id instead of having special branch
1 parent 5c99ae6 commit 8d76f54

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/librustc/middle/reachable.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,10 @@ impl<'a, 'tcx> Visitor<'tcx> for ReachableContext<'a, 'tcx> {
116116
Some(Def::Local(node_id)) | Some(Def::Upvar(node_id, ..)) => {
117117
self.reachable_symbols.insert(node_id);
118118
}
119-
Some(Def::Err) => {} // #56202: calling `def.def_id()` would be an error
120119
Some(def) => {
121-
let def_id = def.def_id();
122-
if let Some(node_id) = self.tcx.hir.as_local_node_id(def_id) {
120+
if let Some((node_id, def_id)) = def.opt_def_id().and_then(|def_id| {
121+
self.tcx.hir.as_local_node_id(def_id).map(|node_id| (node_id, def_id))
122+
}) {
123123
if self.def_id_represents_local_inlined_item(def_id) {
124124
self.worklist.push(node_id);
125125
} else {

0 commit comments

Comments
 (0)