---

yaml
---
r: 223280
b: refs/heads/beta
c: e52b94e
h: refs/heads/master
v: v3

Author: GuillaumeGomez

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: 67c11b0146d875260ffd7d44184221e42c01186c
+refs/heads/beta: e52b94e259b7f416ec584164e6803dcbf038b200
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 938f5d7af401e2d8238522fed4a612943b6e77fd
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/librustc_typeck/diagnostics.rs

@@ -384,13 +384,15 @@ E0044: r##"
 You can't use type parameters on foreign items. Example of erroneous code:
 
 ```
-extern { fn some_func<T>(); }
+extern { fn some_func<T>(x: T); }
 ```
 
-Just remove the type parameter to make this code works:
+To fix this, replace the type parameter with the specializations that you
+need:
 
 ```
-extern { fn some_func(); }
+extern { fn some_func_i32(x: i32); }
+extern { fn some_func_i64(x: i64); }
 ```
 
 E0045: r##"
@@ -754,7 +756,7 @@ Example of erroneous code:
 enum Foo { f };
 
 let u = Foo::f { value: 0i32 }; // error: Foo:f isn't a structure!
-// or even more simple:
+// or even simpler:
 let u = t { random_field: 0i32 }; //error: t isn't a structure!
 ```
 
@@ -772,7 +774,7 @@ enum Foo {
 
 fn main() {
     let u = Foo::f(Inner { value: 0i32 });
-    // or even more simple:
+    // or even simpler:
     let t = Inner { value: 0i32 };
 }
 ```
@@ -1533,9 +1535,6 @@ For more information see the [opt-in builtin traits RFC](https://github.com/rust
 }
 
 register_diagnostics! {
-    E0034, // multiple applicable methods in scope
-    E0035, // does not take type parameters
-    E0036, // incorrect number of type parameters given for this method
     E0068,
     E0074,
     E0075,