---

yaml
---
r: 210360
b: refs/heads/try
c: 4174aa4
h: refs/heads/master
v: v3

Author: cactorium

[refs]

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

branches/try/src/librustc/diagnostics.rs

@@ -307,18 +307,20 @@ a compile-time constant.
 
 E0308: r##"
 This error occurs when the compiler was unable to infer the concrete type of a
-variable. This error can occur for several cases, the most common of which is
-that there is a mismatch in the expected type that the compiler inferred, and
-the actual type that the user defined a variable as.
-
-let a: char = 7;    // An integral type can't be contained in a character, so
-                    // there is a mismatch.
-
-let b: u32 = 7;     // Either use the right type...
-let c = 7;          // ...or let the compiler infer it.
-
-let d: char = c;    // This also causes a mismatch because c is some sort
-                    // of number whereas d is definitely a character.
+variable. This error can occur for several cases, the most common of which is a
+mismatch in the expected type that the compiler inferred for a variable's
+initializing expression, and the actual type explicitly assigned to the
+variable.
+
+For example:
+
+let x: i32 = "I am not a number!";
+//     ~~~   ~~~~~~~~~~~~~~~~~~~~
+//      |             |
+//      |    initializing expression;
+//      |    compiler infers type `&str`
+//      |
+//    type `i32` assigned to variable `x`
 "##,
 
 E0309: r##"