---

yaml
---
r: 226101
b: refs/heads/stable
c: 11f0f47
h: refs/heads/master
i:
  226099: fecebaf
v: v3

Author: GuillaumeGomez

[refs]

@@ -29,6 +29,6 @@ refs/heads/tmp: e5d90d98402475b6e154ce216f9efcb80da1a747
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: 1fe32ca12c51afcd761d9962f51a74ff0d07a591
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: 97e161573514f6f016a6e7e6db85e30d75258eb3
+refs/heads/stable: 11f0f4722027272319a556528a9000ca67e9b35a
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b

branches/stable/src/librustc_typeck/diagnostics.rs

@@ -381,19 +381,19 @@ fn main() {
 "##,
 
 E0045: r##"
-Variadic parameters are only allowed in extern "C" code. Example of
-erroneous codes:
+Variadic parameters are only allowed in extern "C" code. Examples of
+erroneous code:
 
 ```
 extern "rust-call" { fn foo(x: u8, ...); }
 // or
 fn foo(x: u8, ...) {}
 ```
 
-To fix these codes, put them in extern "C" block:
+To fix such code, put them in extern "C" block:
 
 ```
-extern "C" { fn foo(x: u8, ...); }
+extern "C" fn foo (x: u8, ...);
 ```
 "##,
 
@@ -1551,7 +1551,6 @@ register_diagnostics! {
     E0219, // associated type defined in higher-ranked supertrait
     E0220, // associated type not found for type parameter
     E0221, // ambiguous associated type in bounds
-    E0222, // variadic function must have C calling convention
     E0223, // ambiguous associated type
     E0224, // at least one non-builtin train is required for an object type
     E0225, // only the builtin traits can be used as closure or object bounds