---

emberian · emberian · commit efb5bb7a9ceb · 2013-04-26T05:28:43.000-04:00
yaml --- r: 56450 b: refs/heads/auto c: 8dd9dc9 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: b085b51357769acb68f6ba10d30df5a98e04c418
+refs/heads/auto: 8dd9dc995efde11130042c942cb9d4de0bcc5a29
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
diff --git a/branches/auto/src/librustc/middle/resolve.rs b/branches/auto/src/librustc/middle/resolve.rs
@@ -3001,7 +3001,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));
+                               sn.slice(0, sn.len() - 1)); // -1 to adjust for semicolon
                 self.session.span_err(imports[index].span, err);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -3001,7 +3001,7 @@ pub impl Resolver {`
`3001`	`3001`	`self.session.span_err(imports[index].span, ~"unresolved import");`
`3002`	`3002`	`} else {`
`3003`	`3003`	let err = fmt!("unresolved import (maybe you meant `%s::*`?)",
`3004`		`- sn.slice(0, sn.len() - 1));`
	`3004`	`+ sn.slice(0, sn.len() - 1)); // -1 to adjust for semicolon`
`3005`	`3005`	`self.session.span_err(imports[index].span, err);`
`3006`	`3006`	`}`
`3007`	`3007`	`}`