---

yaml
---
r: 220878
b: refs/heads/auto
c: 4ea02b7
h: refs/heads/master
v: v3

Author: AlisdairO

[refs]

@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 44f29fbdbc5edf067c272851d38e32a747613597
+refs/heads/auto: 4ea02b72b77a7d077e6a249564314c39a597ded0
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
 refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/src/librustc_resolve/diagnostics.rs

@@ -95,7 +95,7 @@ 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:
+trying to import a method from a trait. An example of this error:
 
 ```
 mod foo {