---

yaml
---
r: 206771
b: refs/heads/beta
c: aa529ef
h: refs/heads/master
i:
  206769: cde07fd
  206767: 6b1ddc1
v: v3

Author: meqif

[refs]

@@ -29,7 +29,7 @@ refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
 refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
-refs/heads/beta: ef030555c67988878e1a68743da25b5107bd2787
+refs/heads/beta: aa529ef52e54039fcfaa8aa7914be4c581179497
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 579e31929feff51dcaf8d444648eff8de735f91a

branches/beta/src/librustc_resolve/diagnostics.rs

@@ -53,17 +53,17 @@ has been imported into the current module.
 
 Wrong example:
 ```
-extern a;
-extern crate_a as a;
+extern crate a;
+extern crate crate_a as a;
 ```
 
 The solution is to choose a different name that doesn't conflict with any
 external crate imported into the current module.
 
 Correct example:
 ```
-extern a;
-extern crate_a as other_name;
+extern crate a;
+extern crate crate_a as other_name;
 ```
 "##,
 
@@ -72,7 +72,7 @@ The name for an item declaration conflicts with an external crate's name.
 
 For instance,
 ```
-extern abc;
+extern crate abc;
 
 struct abc;
 ```
@@ -82,15 +82,15 @@ There are two possible solutions:
 Solution #1: Rename the item.
 
 ```
-extern abc;
+extern crate abc;
 
 struct xyz;
 ```
 
 Solution #2: Import the crate with a different name.
 
 ```
-extern abc as xyz;
+extern crate abc as xyz;
 
 struct abc;
 ```