---

yaml
---
r: 61313
b: refs/heads/try
c: 8a69dba
h: refs/heads/master
i:
  61311: 9f2e87b
v: v3

Author: emberian

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2d28d645422c1617be58c8ca7ad9a457264ca850
-refs/heads/try: 3bfc1ca91d6f46bcfad71f0096b3f5a49718d421
+refs/heads/try: 8a69dba84a1be53949d0c24452b9910c7119ed68
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librustc/middle/resolve.rs

@@ -2596,11 +2596,17 @@ pub impl Resolver {
         match module_prefix_result {
             Failed => {
                 let mpath = self.idents_to_str(module_path);
-                let idx = str::rfind(self.idents_to_str(module_path), |c| { c == ':' }).unwrap();
-                self.session.span_err(span, fmt!("unresolved import: could not find `%s` in `%s`",
-                                                 str::substr(mpath, idx, mpath.len() - idx),
-                                                 // idx - 1 to account for the extra semicolon
-                                                 str::substr(mpath, 0, idx - 1)));
+                match str::rfind(self.idents_to_str(module_path), |c| { c == ':' }) {
+                    Some(idx) => {
+                        self.session.span_err(span, fmt!("unresolved import: could not find `%s` \
+                                                         in `%s`", str::substr(mpath, idx,
+                                                                               mpath.len() - idx),
+                                                         // idx - 1 to account for the extra
+                                                         // colon
+                                                         str::substr(mpath, 0, idx - 1)));
+                    },
+                    None => (),
+                };
                 return Failed;
             }
             Indeterminate => {