---

yaml
---
r: 223256
b: refs/heads/auto
c: 5aa6c15
h: refs/heads/master
v: v3

Author: GuillaumeGomez

[refs]

@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 2a08cff97c94160ddd06cdec380bbde8bd4f1d1b
+refs/heads/auto: 5aa6c155a3a5de2aa5a358e3d4f8ca212dece98f
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
 refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/src/librustc_typeck/diagnostics.rs

@@ -1123,27 +1123,39 @@ You hit this error because the compiler lacks information to
 determine a type for this variable. Erroneous code example:
 
 ```
+fn demo(devil: fn () -> !) {
+    let x: &_ = devil();
+    // error: cannot determine a type for this local variable
+}
+
+fn oh_no() -> ! { panic!("the devil is in the details") }
+
 fn main() {
-    let x: &_; // error: cannot determine a type for this local variable
+    demo(oh_no);
 }
 ```
 
-You have two possibilities to solve this situation:
- * Give an explicit definition of the variable
- * Infer the variable
-
+To solve this situation, constrain the type of the variable.
 Examples:
 
 ```
-fn some_func(x: u32) {
+fn some_func(x: &u32) {
     // some code
 }
 
-fn main() {
-    let x = 0u32; // ok!
-    // or:
-    let x = 0;
+fn demo(devil: fn () -> !) {
+    let x: &u32 = devil();
+    // Here we defined the type at the variable creation
+
+    let x: &_ = devil();
     some_func(x);
+    // Here, the type is determined by the function argument type
+}
+
+fn oh_no() -> ! { panic!("the devil is in the details") }
+
+fn main() {
+    demo(oh_no);
 }
 ```
 "##,