Skip to content

Commit c2c3e90

Browse files
committed
---
yaml --- r: 2993 b: refs/heads/master c: d1819fb h: refs/heads/master i: 2991: c690f9c v: v3
1 parent cda82fa commit c2c3e90

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: b34a97de39e3b34d5121d9b6eb5ad91d22cd2d04
2+
refs/heads/master: d1819fb74714df5b72720367ecb90590ed3ac226

trunk/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)