From d1819fb74714df5b72720367ecb90590ed3ac226 Mon Sep 17 00:00:00 2001
From: Tim Chevalier <chevalier@alum.wellesley.edu>
Date: Thu, 9 Jun 2011 10:02:48 -0700
Subject: [PATCH] Improve an error message in resolve

---
 src/comp/middle/resolve.rs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/comp/middle/resolve.rs b/src/comp/middle/resolve.rs
index 1bd7307a5abf..7dc744bf3e7d 100644
--- a/src/comp/middle/resolve.rs
+++ b/src/comp/middle/resolve.rs
@@ -903,9 +903,16 @@ fn lookup_glob_in_mod(&env e, @indexed_mod info, &span sp,
             ret some[def](matches.(0));
         } else {
             for (def match in matches) {
-                e.sess.span_note(e.ast_map.get
-                                 (ast::def_id_of_def(match)).span,
-                                 "'" + id + "' is defined here.");
+                alt (e.ast_map.find(ast::def_id_of_def(match))) {
+                    case (some(?it)) {
+                        e.sess.span_note(it.span,
+                           "'" + id + "' is defined here.");
+                    }
+                    case (_) {
+                        e.sess.bug("Internal error: imports and matches "
+                                   + "don't agree");
+                    }
+                }
             }
             e.sess.span_err(sp, "'" + id + "' is glob-imported from" +
                             " multiple different modules.");