---

yaml
---
r: 210658
b: refs/heads/try
c: ef03055
h: refs/heads/master
v: v3

Author: meqif

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 3e561f05c00cd180ec02db4ccab2840a4aba93d2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
-refs/heads/try: 60ec4ab220385be1ad2aef237733d7f38c2196b3
+refs/heads/try: ef030555c67988878e1a68743da25b5107bd2787
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/librustc_resolve/diagnostics.rs

@@ -19,7 +19,7 @@ E0154: r##"
 Imports (`use` statements) are not allowed after non-item statements, such as
 variable declarations and expression statements.
 
-Wrong example:
+Here is an example that demonstrates the error:
 ```
 fn f() {
     // Variable declaration before import
@@ -104,7 +104,7 @@ http://doc.rust-lang.org/reference.html#statements
 E0317: r##"
 User-defined types or type parameters cannot shadow the primitive types.
 This error indicates you tried to define a type, struct or enum with the same
-name as an existing primitive type, and is therefore invalid.
+name as an existing primitive type.
 
 See the Types section of the reference for more information about the primitive
 types: