Skip to content

Commit e65c741

Browse files
committed
Add delay_span_bug and increase idiomaticity
1 parent 55b0f14 commit e65c741

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/librustc/middle/expr_use_visitor.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -558,9 +558,8 @@ impl<'a, 'gcx, 'tcx> ExprUseVisitor<'a, 'gcx, 'tcx> {
558558
}
559559
ty::TyError => { }
560560
_ => {
561-
let type_dependent_defs = self.mc.tables.type_dependent_defs();
562-
if type_dependent_defs.contains_key(call.hir_id) {
563-
let def_id = type_dependent_defs[call.hir_id].def_id();
561+
if let Some(def) = self.mc.tables.type_dependent_defs().get(call.hir_id) {
562+
let def_id = def.def_id();
564563
let call_scope = region::Scope::Node(call.hir_id.local_id);
565564
match OverloadedCallType::from_method_id(self.tcx(), def_id) {
566565
FnMutOverloadedCall => {
@@ -579,6 +578,8 @@ impl<'a, 'gcx, 'tcx> ExprUseVisitor<'a, 'gcx, 'tcx> {
579578
}
580579
FnOnceOverloadedCall => self.consume_expr(callee),
581580
}
581+
} else {
582+
self.tcx().sess.delay_span_bug(call.span, "no type-dependent def for overloaded call");
582583
}
583584
}
584585
}

0 commit comments

Comments
 (0)