Skip to content

Commit d1819fb

Browse files
committed
Improve an error message in resolve
1 parent b34a97d commit d1819fb

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

src/comp/middle/resolve.rs

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -903,9 +903,16 @@ fn lookup_glob_in_mod(&env e, @indexed_mod info, &span sp,
903903
ret some[def](matches.(0));
904904
} else {
905905
for (def match in matches) {
906-
e.sess.span_note(e.ast_map.get
907-
(ast::def_id_of_def(match)).span,
908-
"'" + id + "' is defined here.");
906+
alt (e.ast_map.find(ast::def_id_of_def(match))) {
907+
case (some(?it)) {
908+
e.sess.span_note(it.span,
909+
"'" + id + "' is defined here.");
910+
}
911+
case (_) {
912+
e.sess.bug("Internal error: imports and matches "
913+
+ "don't agree");
914+
}
915+
}
909916
}
910917
e.sess.span_err(sp, "'" + id + "' is glob-imported from" +
911918
" multiple different modules.");

0 commit comments

Comments
 (0)