---

yaml
---
r: 140660
b: refs/heads/try2
c: 9cbab89
h: refs/heads/master
v: v3

Author: emberian

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 0afcd3421577283be7150aca5fdf13b8f8d60b0f
+refs/heads/try2: 9cbab89076c48bffd966303a1cf2856df2b00dcc
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -2487,7 +2487,7 @@ pub impl Resolver {
                     if module_name == ~"???" {
                         self.session.span_err(span {lo: span.lo, hi: span.lo +
                                               BytePos(str::len(*segment_name)), expn_info:
-                                              span.expn_info}, fmt!("unresolved import.  maybe \
+                                              span.expn_info}, fmt!("unresolved import. maybe \
                                                                     a missing 'extern mod %s'?",
                                                                     *segment_name));
                         return Failed;

branches/try2/src/test/compile-fail/issue-1697.rs

@@ -10,7 +10,7 @@
 
 // Testing that we don't fail abnormally after hitting the errors
 
-use unresolved::*; //~ ERROR unresolved name
+use unresolved::*; //~ ERROR unresolved import. maybe a missing
 //~^ ERROR failed to resolve import
 
 fn main() {