---

yaml
---
r: 221074
b: refs/heads/tmp
c: 56b450b
h: refs/heads/master
v: v3

Author: AlisdairO

[refs]

@@ -25,7 +25,7 @@ refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
 refs/heads/beta: c8bab9d06a179028a0d5129aa62f09d694d9cc49
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: 6c74779a5c4fb1c0bf5d395c8b0c27d296f7ca48
+refs/heads/tmp: 56b450b2912d1fe1f2c88d05e79f85f78ff2ec98
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: e58601ab085591c71a27ae82137fc313222c2270
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828

branches/tmp/src/librustc_resolve/diagnostics.rs

@@ -94,8 +94,8 @@ mod bar {
 "##,
 
 E0253: r##"
-Attempt was made to import an unimportable value.  This can happen when
-trying to import a function from a trait.  An example of this error:
+Attempt was made to import an unimportable value. This can happen when
+trying to import a function from a trait. An example of this error:
 
 ```
 mod foo {
@@ -106,8 +106,8 @@ mod foo {
 use foo::MyTrait::doSomething;
 ```
 
-In general, it's not legal to directly import functions from a crate or
-concrete type.
+In general, it's not legal to directly import methods belonging to a
+trait or concrete type.
 "##,
 
 E0255: r##"