---

yaml
---
r: 233886
b: refs/heads/beta
c: 9259418
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: 297b77d49b2961c682e11fafb975f27780ba5625
+refs/heads/beta: 9259418d26f3b9197efedf9aa01bbc3967bb9628
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 370fe2786109360f7c35b8ba552b83b773dd71d6
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/librustc_typeck/diagnostics.rs

@@ -3020,54 +3020,56 @@ parameters. You can read more about it in the API documentation:
 https://doc.rust-lang.org/std/marker/struct.PhantomData.html
 "##,
 
-E0444: r##"
-A platform-specific intrinsic function has wrong number of arguments.
+E0442: r##"
+Intrinsic argument(s) and/or return value have the wrong length.
 Erroneous code example:
 
 ```
 #[repr(simd)]
-struct f64x2(f64, f64);
+struct i8x16(i8, i8, i8, i8, i8, i8, i8, i8,
+             i8, i8, i8, i8, i8, i8, i8, i8);
+#[repr(simd)]
+struct i32x4(i32, i32, i32, i32);
+#[repr(simd)]
+struct i64x2(i64, i64);
 
 extern "platform-intrinsic" {
-    fn x86_mm_movemask_pd(x: f64x2, y: f64x2, z: f64x2) -> i32;
-    // error: platform-specific intrinsic has invalid number of arguments
+    fn x86_mm_adds_epi16(x: i8x16, y: i32x4) -> i64x2;
+    // error: intrinsic arguments/return value have wrong length
 }
 ```
 
-Please refer to the function declaration to see if it corresponds
-with yours. Example:
+To fix this error, please refer to the function declaration to give
+it the awaited types with the awaited length. Example:
 
 ```
 #[repr(simd)]
-struct f64x2(f64, f64);
+struct i16x8(i16, i16, i16, i16, i16, i16, i16, i16);
 
 extern "platform-intrinsic" {
-    fn x86_mm_movemask_pd(x: f64x2) -> i32; // ok!
+    fn x86_mm_adds_epi16(x: i16x8, y: i16x8) -> i16x8; // ok!
 }
 ```
 "##,
 
-E0442: r##"
-Intrinsic argument(s) and/or return value have the wrong length.
+E0443: r##"
+Intrinsic argument(s) and/or return value have the wrong type.
 Erroneous code example:
 
 ```
 #[repr(simd)]
-struct i8x16(i8, i8, i8, i8, i8, i8, i8, i8,
-             i8, i8, i8, i8, i8, i8, i8, i8);
-#[repr(simd)]
-struct i32x4(i32, i32, i32, i32);
+struct i16x8(i16, i16, i16, i16, i16, i16, i16, i16);
 #[repr(simd)]
-struct i64x2(i64, i64);
+struct i64x8(i64, i64, i64, i64, i64, i64, i64, i64);
 
 extern "platform-intrinsic" {
-    fn x86_mm_adds_epi16(x: i8x16, y: i32x4) -> i64x2;
-    // error: intrinsic arguments have wrong length
+    fn x86_mm_adds_epi16(x: i16x8, y: i16x8) -> i64x8;
+    // error: intrinsic argument/return value has wrong type
 }
 ```
 
 To fix this error, please refer to the function declaration to give
-it the awaited types with the awaited length. Example:
+it the awaited types. Example:
 
 ```
 #[repr(simd)]
@@ -3077,7 +3079,34 @@ extern "platform-intrinsic" {
     fn x86_mm_adds_epi16(x: i16x8, y: i16x8) -> i16x8; // ok!
 }
 ```
-"##
+"##,
+
+E0444: r##"
+A platform-specific intrinsic function has wrong number of arguments.
+Erroneous code example:
+
+```
+#[repr(simd)]
+struct f64x2(f64, f64);
+
+extern "platform-intrinsic" {
+    fn x86_mm_movemask_pd(x: f64x2, y: f64x2, z: f64x2) -> i32;
+    // error: platform-specific intrinsic has invalid number of arguments
+}
+```
+
+Please refer to the function declaration to see if it corresponds
+with yours. Example:
+
+```
+#[repr(simd)]
+struct f64x2(f64, f64);
+
+extern "platform-intrinsic" {
+    fn x86_mm_movemask_pd(x: f64x2) -> i32; // ok!
+}
+```
+"##,
 
 }
 
@@ -3163,6 +3192,4 @@ register_diagnostics! {
     E0439, // invalid `simd_shuffle`, needs length: `{}`
     E0440, // platform-specific intrinsic has wrong number of type parameters
     E0441, // unrecognized platform-specific intrinsic function
-    E0443, // intrinsic {} has wrong type: found `{}`, expected `{}` which
-           // was used for this vector type previously in this signature
 }