---

yaml
---
r: 227763
b: refs/heads/try
c: 11f0f47
h: refs/heads/master
i:
  227761: 37ef080
  227759: 14989f0
v: v3

Author: GuillaumeGomez

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: aca2057ed5fb7af3f8905b2bc01f72fa001c35c8
 refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
-refs/heads/try: 97e161573514f6f016a6e7e6db85e30d75258eb3
+refs/heads/try: 11f0f4722027272319a556528a9000ca67e9b35a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/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