From 4f92d3a11c11c18230e18c981ab0aaf95baef6e7 Mon Sep 17 00:00:00 2001
From: Huon Wilson <dbau.pp+github@gmail.com>
Date: Sat, 1 Jun 2013 00:39:02 +1000
Subject: [PATCH] rustc: adjust span for error message to not trim last letter

---
 src/librustc/middle/resolve.rs                     |  2 +-
 .../unresolved-extern-mod-suggestion.rs            | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 src/test/compile-fail/unresolved-extern-mod-suggestion.rs

diff --git a/src/librustc/middle/resolve.rs b/src/librustc/middle/resolve.rs
index 23645f7f04a3c..4d71055857784 100644
--- a/src/librustc/middle/resolve.rs
+++ b/src/librustc/middle/resolve.rs
@@ -3079,7 +3079,7 @@ pub impl Resolver {
                 self.session.span_err(imports[index].span, "unresolved import");
             } else {
                 let err = fmt!("unresolved import (maybe you meant `%s::*`?)",
-                               sn.slice(0, sn.len() - 1)); // -1 to adjust for semicolon
+                               sn.slice(0, sn.len()));
                 self.session.span_err(imports[index].span, err);
             }
         }
diff --git a/src/test/compile-fail/unresolved-extern-mod-suggestion.rs b/src/test/compile-fail/unresolved-extern-mod-suggestion.rs
new file mode 100644
index 0000000000000..f2b1203511cb6
--- /dev/null
+++ b/src/test/compile-fail/unresolved-extern-mod-suggestion.rs
@@ -0,0 +1,14 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+extern mod extra;
+use extra; //~ ERROR unresolved import (maybe you meant `extra::*`?)
+
+fn main() {}