---

yaml
---
r: 60327
b: refs/heads/master
c: 8a69dba
h: refs/heads/master
i:
  60325: c706cb8
  60323: 7a928e3
  60319: 71a2d74
v: v3

Author: emberian

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 3bfc1ca91d6f46bcfad71f0096b3f5a49718d421
+refs/heads/master: 8a69dba84a1be53949d0c24452b9910c7119ed68
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/try: c50a9d5b664478e533ba1d1d353213d70c8ad589

trunk/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 => {