mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ui tests with better error code usage

Browse Source
This commit is contained in:
Guillaume Gomez 2019-11-12 12:09:02 +01:00
parent cd274632f8
commit cfd4e9722e
31 changed files with 39 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/test/ui/asm/asm-bad-clobber.stderr
View File

@ -6,3 +6,4 @@ LL | asm!("xor %eax, %eax" : : : "{eax}");
error: aborting due to previous error
For more information about this error, try `rustc --explain E0664`.

2
src/test/ui/asm/asm-in-bad-modifier.stderr
View File

@ -12,3 +12,5 @@ LL | asm!("mov $1, $0" : "=r"(y) : "+r"(5));
error: aborting due to 2 previous errors
Some errors have detailed explanations: E0662, E0663.
For more information about an error, try `rustc --explain E0662`.

1
src/test/ui/asm/asm-out-no-modifier.stderr
View File

@ -6,3 +6,4 @@ LL | asm!("mov $1, $0" : "r"(x) : "r"(5));
error: aborting due to previous error
For more information about this error, try `rustc --explain E0661`.

1
src/test/ui/asm/issue-51431.stderr
View File

@ -6,3 +6,4 @@ LL | asm! {"mov $0,$1"::"0"("bx"),"1"(0x00)}
error: aborting due to previous error
For more information about this error, try `rustc --explain E0669`.

1
src/test/ui/bad/bad-intrinsic-monomorphization.stderr
View File

@ -18,3 +18,4 @@ LL | simd_add(a, b)
error: aborting due to 3 previous errors
For more information about this error, try `rustc --explain E0511`.

1
src/test/ui/error-codes/E0511.stderr
View File

@ -6,3 +6,4 @@ LL | unsafe { simd_add(0, 1); }
error: aborting due to previous error
For more information about this error, try `rustc --explain E0511`.

1
src/test/ui/error-codes/E0660.stderr
View File

@ -12,3 +12,4 @@ LL | asm!("nop" "nop" : "=r"(a));
error: aborting due to 2 previous errors
For more information about this error, try `rustc --explain E0660`.

3
src/test/ui/error-codes/E0661.stderr
View File

@ -12,4 +12,5 @@ LL | let a;
error: aborting due to 2 previous errors
For more information about this error, try `rustc --explain E0282`.
Some errors have detailed explanations: E0282, E0661.
For more information about an error, try `rustc --explain E0282`.

1
src/test/ui/error-codes/E0662.stderr
View File

@ -6,3 +6,4 @@ LL | : "=test"("a")
error: aborting due to previous error
For more information about this error, try `rustc --explain E0662`.

1
src/test/ui/error-codes/E0663.stderr
View File

@ -6,3 +6,4 @@ LL | : "+test"("a")
error: aborting due to previous error
For more information about this error, try `rustc --explain E0663`.

1
src/test/ui/error-codes/E0664.stderr
View File

@ -6,3 +6,4 @@ LL | : "{eax}"
error: aborting due to previous error
For more information about this error, try `rustc --explain E0664`.

1
src/test/ui/error-codes/E0665.stderr
View File

@ -6,3 +6,4 @@ LL | #[derive(Default)]
error: aborting due to previous error
For more information about this error, try `rustc --explain E0665`.

2
src/test/ui/explain.stdout
View File

@ -1,4 +1,4 @@
Per [RFC 401][rfc401], if you have a function declaration `foo`:
er [RFC 401][rfc401], if you have a function declaration `foo`:
```
// For the purposes of this explanation, all of these

1
src/test/ui/inline-asm-bad-constraint.stderr
View File

@ -18,3 +18,4 @@ LL | asm!("addb $1, $0" : "={rax}"((0i32, rax)));
error: aborting due to 3 previous errors
For more information about this error, try `rustc --explain E0668`.

1
src/test/ui/inline-asm-bad-operand.stderr
View File

@ -42,3 +42,4 @@ LL | ... "r"("hello e0669"));
error: aborting due to 7 previous errors
For more information about this error, try `rustc --explain E0669`.

1
src/test/ui/issues/issue-37433.stderr
View File

@ -6,3 +6,4 @@ LL | asm!("" :: "r"(""));
error: aborting due to previous error
For more information about this error, try `rustc --explain E0669`.

1
src/test/ui/issues/issue-53787-inline-assembler-macro.stderr
View File

@ -6,3 +6,4 @@ LL | fake_jump!("FirstFunc");
error: aborting due to previous error
For more information about this error, try `rustc --explain E0669`.

12
src/test/ui/json-bom-plus-crlf-multifile.stderr
View File

@ -1,5 +1,4 @@
{"message":"mismatched types","code":{"code":"E0308","explanation":"
This error occurs when the compiler was unable to infer the concrete type of a
{"message":"mismatched types","code":{"code":"E0308","explanation":"This error occurs when the compiler was unable to infer the concrete type of a
variable. It can occur for several cases, the most common of which is a
mismatch in the expected type that the compiler inferred for a variable's
initializing expression, and the actual type explicitly assigned to the
@ -19,8 +18,7 @@ let x: i32 = \"I am not a number!\";
"},"level":"error","spans":[{"file_name":"$DIR/json-bom-plus-crlf-multifile-aux.rs","byte_start":621,"byte_end":622,"line_start":17,"line_end":17,"column_start":22,"column_end":23,"is_primary":true,"text":[{"text":" let s : String = 1; // Error in the middle of line.","highlight_start":22,"highlight_end":23}],"label":"expected struct `std::string::String`, found integer","suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"expected type `std::string::String`
found type `{integer}`","code":null,"level":"note","spans":[],"children":[],"rendered":null},{"message":"try using a conversion method","code":null,"level":"help","spans":[{"file_name":"$DIR/json-bom-plus-crlf-multifile-aux.rs","byte_start":621,"byte_end":622,"line_start":17,"line_end":17,"column_start":22,"column_end":23,"is_primary":true,"text":[{"text":" let s : String = 1; // Error in the middle of line.","highlight_start":22,"highlight_end":23}],"label":null,"suggested_replacement":"1.to_string()","suggestion_applicability":"MaybeIncorrect","expansion":null}],"children":[],"rendered":null}],"rendered":"$DIR/json-bom-plus-crlf-multifile-aux.rs:17:22: error[E0308]: mismatched types
"}
{"message":"mismatched types","code":{"code":"E0308","explanation":"
This error occurs when the compiler was unable to infer the concrete type of a
{"message":"mismatched types","code":{"code":"E0308","explanation":"This error occurs when the compiler was unable to infer the concrete type of a
variable. It can occur for several cases, the most common of which is a
mismatch in the expected type that the compiler inferred for a variable's
initializing expression, and the actual type explicitly assigned to the
@ -40,8 +38,7 @@ let x: i32 = \"I am not a number!\";
"},"level":"error","spans":[{"file_name":"$DIR/json-bom-plus-crlf-multifile-aux.rs","byte_start":681,"byte_end":682,"line_start":19,"line_end":19,"column_start":22,"column_end":23,"is_primary":true,"text":[{"text":" let s : String = 1","highlight_start":22,"highlight_end":23}],"label":"expected struct `std::string::String`, found integer","suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"expected type `std::string::String`
found type `{integer}`","code":null,"level":"note","spans":[],"children":[],"rendered":null},{"message":"try using a conversion method","code":null,"level":"help","spans":[{"file_name":"$DIR/json-bom-plus-crlf-multifile-aux.rs","byte_start":681,"byte_end":682,"line_start":19,"line_end":19,"column_start":22,"column_end":23,"is_primary":true,"text":[{"text":" let s : String = 1","highlight_start":22,"highlight_end":23}],"label":null,"suggested_replacement":"1.to_string()","suggestion_applicability":"MaybeIncorrect","expansion":null}],"children":[],"rendered":null}],"rendered":"$DIR/json-bom-plus-crlf-multifile-aux.rs:19:22: error[E0308]: mismatched types
"}
{"message":"mismatched types","code":{"code":"E0308","explanation":"
This error occurs when the compiler was unable to infer the concrete type of a
{"message":"mismatched types","code":{"code":"E0308","explanation":"This error occurs when the compiler was unable to infer the concrete type of a
variable. It can occur for several cases, the most common of which is a
mismatch in the expected type that the compiler inferred for a variable's
initializing expression, and the actual type explicitly assigned to the
@ -61,8 +58,7 @@ let x: i32 = \"I am not a number!\";
"},"level":"error","spans":[{"file_name":"$DIR/json-bom-plus-crlf-multifile-aux.rs","byte_start":745,"byte_end":746,"line_start":23,"line_end":23,"column_start":1,"column_end":2,"is_primary":true,"text":[{"text":"1; // Error after the newline.","highlight_start":1,"highlight_end":2}],"label":"expected struct `std::string::String`, found integer","suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"expected type `std::string::String`
found type `{integer}`","code":null,"level":"note","spans":[],"children":[],"rendered":null},{"message":"try using a conversion method","code":null,"level":"help","spans":[{"file_name":"$DIR/json-bom-plus-crlf-multifile-aux.rs","byte_start":745,"byte_end":746,"line_start":23,"line_end":23,"column_start":1,"column_end":2,"is_primary":true,"text":[{"text":"1; // Error after the newline.","highlight_start":1,"highlight_end":2}],"label":null,"suggested_replacement":"1.to_string()","suggestion_applicability":"MaybeIncorrect","expansion":null}],"children":[],"rendered":null}],"rendered":"$DIR/json-bom-plus-crlf-multifile-aux.rs:23:1: error[E0308]: mismatched types
"}
{"message":"mismatched types","code":{"code":"E0308","explanation":"
This error occurs when the compiler was unable to infer the concrete type of a
{"message":"mismatched types","code":{"code":"E0308","explanation":"This error occurs when the compiler was unable to infer the concrete type of a
variable. It can occur for several cases, the most common of which is a
mismatch in the expected type that the compiler inferred for a variable's
initializing expression, and the actual type explicitly assigned to the

12
src/test/ui/json-bom-plus-crlf.stderr
View File

@ -1,5 +1,4 @@
{"message":"mismatched types","code":{"code":"E0308","explanation":"
This error occurs when the compiler was unable to infer the concrete type of a
{"message":"mismatched types","code":{"code":"E0308","explanation":"This error occurs when the compiler was unable to infer the concrete type of a
variable. It can occur for several cases, the most common of which is a
mismatch in the expected type that the compiler inferred for a variable's
initializing expression, and the actual type explicitly assigned to the
@ -19,8 +18,7 @@ let x: i32 = \"I am not a number!\";
"},"level":"error","spans":[{"file_name":"$DIR/json-bom-plus-crlf.rs","byte_start":621,"byte_end":622,"line_start":17,"line_end":17,"column_start":22,"column_end":23,"is_primary":true,"text":[{"text":" let s : String = 1; // Error in the middle of line.","highlight_start":22,"highlight_end":23}],"label":"expected struct `std::string::String`, found integer","suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"expected type `std::string::String`
found type `{integer}`","code":null,"level":"note","spans":[],"children":[],"rendered":null},{"message":"try using a conversion method","code":null,"level":"help","spans":[{"file_name":"$DIR/json-bom-plus-crlf.rs","byte_start":621,"byte_end":622,"line_start":17,"line_end":17,"column_start":22,"column_end":23,"is_primary":true,"text":[{"text":" let s : String = 1; // Error in the middle of line.","highlight_start":22,"highlight_end":23}],"label":null,"suggested_replacement":"1.to_string()","suggestion_applicability":"MaybeIncorrect","expansion":null}],"children":[],"rendered":null}],"rendered":"$DIR/json-bom-plus-crlf.rs:17:22: error[E0308]: mismatched types
"}
{"message":"mismatched types","code":{"code":"E0308","explanation":"
This error occurs when the compiler was unable to infer the concrete type of a
{"message":"mismatched types","code":{"code":"E0308","explanation":"This error occurs when the compiler was unable to infer the concrete type of a
variable. It can occur for several cases, the most common of which is a
mismatch in the expected type that the compiler inferred for a variable's
initializing expression, and the actual type explicitly assigned to the
@ -40,8 +38,7 @@ let x: i32 = \"I am not a number!\";
"},"level":"error","spans":[{"file_name":"$DIR/json-bom-plus-crlf.rs","byte_start":681,"byte_end":682,"line_start":19,"line_end":19,"column_start":22,"column_end":23,"is_primary":true,"text":[{"text":" let s : String = 1","highlight_start":22,"highlight_end":23}],"label":"expected struct `std::string::String`, found integer","suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"expected type `std::string::String`
found type `{integer}`","code":null,"level":"note","spans":[],"children":[],"rendered":null},{"message":"try using a conversion method","code":null,"level":"help","spans":[{"file_name":"$DIR/json-bom-plus-crlf.rs","byte_start":681,"byte_end":682,"line_start":19,"line_end":19,"column_start":22,"column_end":23,"is_primary":true,"text":[{"text":" let s : String = 1","highlight_start":22,"highlight_end":23}],"label":null,"suggested_replacement":"1.to_string()","suggestion_applicability":"MaybeIncorrect","expansion":null}],"children":[],"rendered":null}],"rendered":"$DIR/json-bom-plus-crlf.rs:19:22: error[E0308]: mismatched types
"}
{"message":"mismatched types","code":{"code":"E0308","explanation":"
This error occurs when the compiler was unable to infer the concrete type of a
{"message":"mismatched types","code":{"code":"E0308","explanation":"This error occurs when the compiler was unable to infer the concrete type of a
variable. It can occur for several cases, the most common of which is a
mismatch in the expected type that the compiler inferred for a variable's
initializing expression, and the actual type explicitly assigned to the
@ -61,8 +58,7 @@ let x: i32 = \"I am not a number!\";
"},"level":"error","spans":[{"file_name":"$DIR/json-bom-plus-crlf.rs","byte_start":745,"byte_end":746,"line_start":23,"line_end":23,"column_start":1,"column_end":2,"is_primary":true,"text":[{"text":"1; // Error after the newline.","highlight_start":1,"highlight_end":2}],"label":"expected struct `std::string::String`, found integer","suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"expected type `std::string::String`
found type `{integer}`","code":null,"level":"note","spans":[],"children":[],"rendered":null},{"message":"try using a conversion method","code":null,"level":"help","spans":[{"file_name":"$DIR/json-bom-plus-crlf.rs","byte_start":745,"byte_end":746,"line_start":23,"line_end":23,"column_start":1,"column_end":2,"is_primary":true,"text":[{"text":"1; // Error after the newline.","highlight_start":1,"highlight_end":2}],"label":null,"suggested_replacement":"1.to_string()","suggestion_applicability":"MaybeIncorrect","expansion":null}],"children":[],"rendered":null}],"rendered":"$DIR/json-bom-plus-crlf.rs:23:1: error[E0308]: mismatched types
"}
{"message":"mismatched types","code":{"code":"E0308","explanation":"
This error occurs when the compiler was unable to infer the concrete type of a
{"message":"mismatched types","code":{"code":"E0308","explanation":"This error occurs when the compiler was unable to infer the concrete type of a
variable. It can occur for several cases, the most common of which is a
mismatch in the expected type that the compiler inferred for a variable's
initializing expression, and the actual type explicitly assigned to the

3
src/test/ui/json-short.stderr
View File

@ -1,5 +1,4 @@
{"message":"`main` function not found in crate `json_short`","code":{"code":"E0601","explanation":"
No `main` function was found in a binary crate. To fix this error, add a
{"message":"`main` function not found in crate `json_short`","code":{"code":"E0601","explanation":"No `main` function was found in a binary crate. To fix this error, add a
`main` function. For example:
```

3
src/test/ui/lint/use_suggestion_json.stderr
View File

@ -2,8 +2,7 @@
"message": "cannot find type `Iter` in this scope",
"code": {
"code": "E0412",
"explanation": "
The type name used is not in scope.
"explanation": "The type name used is not in scope.
Erroneous code examples:

1
src/test/ui/macros/macros-nonfatal-errors.stderr
View File

@ -89,3 +89,4 @@ LL | trace_macros!(invalid);
error: aborting due to 14 previous errors
For more information about this error, try `rustc --explain E0665`.

1
src/test/ui/non-integer-atomic.stderr
View File

@ -96,3 +96,4 @@ LL | intrinsics::atomic_cxchg(p, v, v);
error: aborting due to 16 previous errors
For more information about this error, try `rustc --explain E0511`.

1
src/test/ui/simd-intrinsic/simd-intrinsic-generic-arithmetic-saturating.stderr
View File

@ -12,3 +12,4 @@ LL | simd_saturating_sub(z, z);
error: aborting due to 2 previous errors
For more information about this error, try `rustc --explain E0511`.

1
src/test/ui/simd-intrinsic/simd-intrinsic-generic-arithmetic.stderr
View File

@ -84,3 +84,4 @@ LL | simd_xor(z, z);
error: aborting due to 14 previous errors
For more information about this error, try `rustc --explain E0511`.

1
src/test/ui/simd-intrinsic/simd-intrinsic-generic-bitmask.stderr
View File

@ -30,3 +30,4 @@ LL | let _: u128 = simd_bitmask(m64);
error: aborting due to 5 previous errors
For more information about this error, try `rustc --explain E0511`.

1
src/test/ui/simd-intrinsic/simd-intrinsic-generic-cast.stderr
View File

@ -24,3 +24,4 @@ LL | simd_cast::<_, i32x8>(x);
error: aborting due to 4 previous errors
For more information about this error, try `rustc --explain E0511`.

1
src/test/ui/simd-intrinsic/simd-intrinsic-generic-comparison.stderr
View File

@ -108,3 +108,4 @@ LL | simd_ge::<_, i16x8>(x, x);
error: aborting due to 18 previous errors
For more information about this error, try `rustc --explain E0511`.

1
src/test/ui/simd-intrinsic/simd-intrinsic-generic-elements.stderr
View File

@ -90,3 +90,4 @@ LL | simd_shuffle8::<_, i32x2>(x, x, [0; 8]);
error: aborting due to 15 previous errors
For more information about this error, try `rustc --explain E0511`.

1
src/test/ui/simd-intrinsic/simd-intrinsic-generic-reduction.stderr
View File

@ -60,3 +60,4 @@ LL | let _: bool = simd_reduce_any(z);
error: aborting due to 10 previous errors
For more information about this error, try `rustc --explain E0511`.

1
src/test/ui/simd-intrinsic/simd-intrinsic-generic-select.stderr
View File

@ -48,3 +48,4 @@ LL | simd_select_bitmask("x", x, x);
error: aborting due to 8 previous errors
For more information about this error, try `rustc --explain E0511`.