---

yaml
---
r: 216663
b: refs/heads/stable
c: 4174aa4
h: refs/heads/master
i:
  216661: a58d745
  216659: c8a59d5
  216655: e65158b
v: v3

Author: cactorium

[refs]

@@ -29,5 +29,5 @@ refs/heads/tmp: 378a370ff2057afeb1eae86eb6e78c476866a4a6
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: a5286998df566e736b32f6795bfc3803bdaf453d
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: 4420f318080e116dc4bf75a1a3568fe8bf4157b7
+refs/heads/stable: 4174aa40f40e05195d73d3eb09b12d9359444f5d
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375

branches/stable/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##"