---

yaml
---
r: 235567
b: refs/heads/stable
c: 4ea02b7
h: refs/heads/master
i:
  235565: 89b0842
  235563: 236b47d
  235559: 49642bd
  235551: b01f3bb
v: v3

Author: AlisdairO

[refs]

@@ -29,7 +29,7 @@ refs/heads/tmp: afae2ff723393b3ab4ccffef6ac7c6d1809e2da0
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: f859507de8c410b648d934d8f5ec1c52daac971d
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: 44f29fbdbc5edf067c272851d38e32a747613597
+refs/heads/stable: 4ea02b72b77a7d077e6a249564314c39a597ded0
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
 refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/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 {