Merge pull request #189 from oli-obk/next_stable

Update for latest nightly
oli-obk · Feb 14, 2024 · 00d902c · 00d902c
2 parents b6d9ea6 + 1a49824
commit 00d902c
Show file tree

Hide file tree

Showing 27 changed files with 82 additions and 43 deletions.
diff --git a/tests/integrations/basic-bin/tests/actual_tests/foomp.stderr b/tests/integrations/basic-bin/tests/actual_tests/foomp.stderr
@@ -4,6 +4,6 @@ error[E0432]: unresolved import `basic_bin`
 1 | use basic_bin::add;
   |     ^^^^^^^^^ use of undeclared crate or module `basic_bin`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0432`.
diff --git a/tests/integrations/basic-fail-mode/tests/actual_tests/foomp.stderr b/tests/integrations/basic-fail-mode/tests/actual_tests/foomp.stderr
@@ -12,6 +12,6 @@ note: function defined here
 1 | pub fn add(left: usize, right: usize) -> usize {
   |        ^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/integrations/basic-fail/Cargo.stdout b/tests/integrations/basic-fail/Cargo.stdout
@@ -17,6 +17,21 @@ tests/actual_tests/rustc_ice.rs ... FAILED
 FAILED TEST: tests/actual_tests/bad_pattern.rs
 command: "rustc" "--error-format=json" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--out-dir" "$TMP "tests/actual_tests/bad_pattern.rs" "--edition" "2021"
 
+error: actual output differed from expected
+Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/bad_pattern.stderr` to the actual output
+--- tests/actual_tests/bad_pattern.stderr
++++ <stderr output>
+ error[E0308]: mismatched types
+  --> tests/actual_tests/bad_pattern.rs:4:9
+... 10 lines skipped ...
+   |        ^^^
+
+-error: aborting due to previous error
++error: aborting due to 1 previous error
+
+ For more information about this error, try `rustc --explain E0308`.
+
+
 error: `miesmätsched types` not found in diagnostics on line 4
  --> tests/actual_tests/bad_pattern.rs:5:17
   |
@@ -46,7 +61,7 @@ note: function defined here
 1 | pub fn add(left: usize, right: usize) -> usize {
   |        ^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
 
@@ -88,7 +103,7 @@ Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/ex
 +4 |
 +  |  ^
 +
-+error: aborting due to previous error
++error: aborting due to 1 previous error
 +
 
 
@@ -108,7 +123,7 @@ error: this file contains an unclosed delimiter
 4 |
   |  ^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 
 full stdout:
@@ -168,7 +183,7 @@ Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/fo
 +  |        ^^^
 
 -error: aborting doo to previous error
-+error: aborting due to previous error
++error: aborting due to 1 previous error
 
  For more information about this error, try `rustc --explain E0308`.
 
@@ -188,7 +203,7 @@ note: function defined here
 1 | pub fn add(left: usize, right: usize) -> usize {
   |        ^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
 
@@ -197,17 +212,41 @@ full stdout:
 
 
 FAILED TEST: tests/actual_tests/foomp2.rs
-command: "$CMD"
+command: "rustc" "--error-format=json" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--out-dir" "$TMP "tests/actual_tests/foomp2.rs" "--edition" "2021"
 
 error: actual output differed from expected
-Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/foomp2.fixed` to the actual output
---- tests/actual_tests/foomp2.fixed
-+++ <fixed output>
--this is just a test file showing that
--stray .fixed files are detected and blessed away
+Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/foomp2.stderr` to the actual output
+--- tests/actual_tests/foomp2.stderr
++++ <stderr output>
+ error[E0308]: mismatched types
+  --> tests/actual_tests/foomp2.rs:4:9
+... 10 lines skipped ...
+   |        ^^^
+
+-error: aborting due to previous error
++error: aborting due to 1 previous error
+
+ For more information about this error, try `rustc --explain E0308`.
 
 
 full stderr:
+error[E0308]: mismatched types
+ --> tests/actual_tests/foomp2.rs:4:9
+  |
+4 |     add("42", 3);
+  |     --- ^^^^ expected `usize`, found `&str`
+  |     |
+  |     arguments to this function are incorrect
+  |
+note: function defined here
+ --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC
+  |
+1 | pub fn add(left: usize, right: usize) -> usize {
+  |        ^^^
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0308`.
 
 full stdout:
 
@@ -375,7 +414,7 @@ error: expected one of `!` or `::`, found `<eof>`
 7 | thing!(cake);
   |        ^^^^ expected one of `!` or `::`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 
 full stdout:
@@ -627,7 +666,7 @@ error[E0601]: `main` function not found in crate `revisions_bad`
 10 | }
    |  ^ consider adding a `main` function to `tests/actual_tests_bless/revisions_bad.rs`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0601`.
 
@@ -657,7 +696,7 @@ help: consider cloning the value if the performance cost is acceptable
 11 |     x.clone();
    |      ++++++++
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0382`.
 
@@ -687,7 +726,7 @@ help: consider cloning the value if the performance cost is acceptable
 11 |     x.clone();
    |      ++++++++
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0382`.
 
@@ -717,7 +756,7 @@ help: consider cloning the value if the performance cost is acceptable
 10 |     x.clone();
    |      ++++++++
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0382`.
 
@@ -854,7 +893,7 @@ error[E0601]: `main` function not found in crate `revisions_bad`
 10 | }
    |  ^ consider adding a `main` function to `tests/actual_tests_bless_yolo/revisions_bad.rs`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0601`.
 

diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/aux_proc_macro_no_main.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/aux_proc_macro_no_main.stderr
@@ -4,5 +4,5 @@ error: expected one of `!` or `::`, found `<eof>`
 7 | thing!(cake);
   |        ^^^^ expected one of `!` or `::`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/foomp_aux.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/foomp_aux.stderr
@@ -12,6 +12,6 @@ note: function defined here
 1 | pub fn add(_: u8, _: u8) {}
   |        ^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions.bar.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions.bar.stderr
@@ -12,6 +12,6 @@ note: function defined here
 1  | pub fn add(left: usize, right: usize) -> usize {
    |        ^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions.foo.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions.foo.stderr
@@ -12,6 +12,6 @@ note: function defined here
 1 | pub fn add(left: usize, right: usize) -> usize {
   |        ^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_bad.bar.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_bad.bar.stderr
@@ -4,6 +4,6 @@ error[E0601]: `main` function not found in crate `revisions_bad`
 10 | }
    |  ^ consider adding a `main` function to `tests/actual_tests_bless/revisions_bad.rs`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0601`.
diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_bad.foo.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_bad.foo.stderr
@@ -12,6 +12,6 @@ note: function defined here
 1 | pub fn add(left: usize, right: usize) -> usize {
   |        ^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_filter2.bar.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_filter2.bar.stderr
@@ -12,6 +12,6 @@ note: function defined here
 1  | pub fn add(left: usize, right: usize) -> usize {
    |        ^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/...grations/basic-fail/tests/actual_tests_bless/revisions_multiple_per_annotation.bar.stderr b/...grations/basic-fail/tests/actual_tests_bless/revisions_multiple_per_annotation.bar.stderr
@@ -12,6 +12,6 @@ note: function defined here
 1 | pub fn add(left: usize, right: usize) -> usize {
   |        ^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/...grations/basic-fail/tests/actual_tests_bless/revisions_multiple_per_annotation.foo.stderr b/...grations/basic-fail/tests/actual_tests_bless/revisions_multiple_per_annotation.foo.stderr
@@ -12,6 +12,6 @@ note: function defined here
 1 | pub fn add(left: usize, right: usize) -> usize {
   |        ^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_same_everywhere.bar.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_same_everywhere.bar.stderr
@@ -12,6 +12,6 @@ note: function defined here
 1 | pub fn add(left: usize, right: usize) -> usize {
   |        ^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_same_everywhere.foo.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_same_everywhere.foo.stderr
@@ -12,6 +12,6 @@ note: function defined here
 1 | pub fn add(left: usize, right: usize) -> usize {
   |        ^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.a.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.a.stderr
@@ -4,5 +4,5 @@ error: expected `,` following `match` arm
 6 |         0 => String::new()
   |                           ^ help: missing a comma here to end this `match` arm: `,`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.b.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail-revisions.b.stderr
@@ -4,5 +4,5 @@ error: expected `,` following `match` arm
 6 |         0 => String::new()
   |                           ^ help: missing a comma here to end this `match` arm: `,`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/rustfix-fail.stderr
@@ -4,5 +4,5 @@ error: expected `,` following `match` arm
 5 |         0 => String::new()
   |                           ^ help: missing a comma here to end this `match` arm: `,`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/revisions_bad.bar.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/revisions_bad.bar.stderr
@@ -4,6 +4,6 @@ error[E0601]: `main` function not found in crate `revisions_bad`
 10 | }
    |  ^ consider adding a `main` function to `tests/actual_tests_bless_yolo/revisions_bad.rs`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0601`.
diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/revisions_bad.foo.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/revisions_bad.foo.stderr
@@ -12,6 +12,6 @@ note: function defined here
 1 | pub fn add(left: usize, right: usize) -> usize {
   |        ^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.stderr
@@ -7,6 +7,6 @@ error[E0308]: mismatched types
   |             |        expected `String`, found integer
   |             expected due to this
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/integrations/basic/tests/actual_tests/aux_derive.stderr b/tests/integrations/basic/tests/actual_tests/aux_derive.stderr
@@ -27,6 +27,6 @@ error[E0384]: cannot assign twice to immutable variable `x`
 8 |     x = Foo;
   |     ^^^^^^^ cannot assign twice to immutable variable
 
-error: aborting due to previous error; 2 warnings emitted
+error: aborting due to 1 previous error; 2 warnings emitted
 
 For more information about this error, try `rustc --explain E0384`.
diff --git a/tests/integrations/basic/tests/actual_tests/aux_proc_macro.stderr b/tests/integrations/basic/tests/actual_tests/aux_proc_macro.stderr
@@ -4,6 +4,6 @@ error[E0425]: cannot find value `cake` in this scope
 6 |     thing!(cake);
   |            ^^^^ not found in this scope
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0425`.
diff --git a/tests/integrations/basic/tests/actual_tests/foomp-rustfix.stderr b/tests/integrations/basic/tests/actual_tests/foomp-rustfix.stderr
@@ -13,5 +13,5 @@ note: the lint level is defined here
   |         ^^^^^^^^
   = note: `#[deny(unused_mut)]` implied by `#[deny(warnings)]`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/integrations/basic/tests/actual_tests/foomp.stderr b/tests/integrations/basic/tests/actual_tests/foomp.stderr
@@ -12,6 +12,6 @@ note: function defined here
 1 | pub fn add(left: usize, right: usize) -> usize {
   |        ^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/integrations/basic/tests/actual_tests/match_diagnostic_code.stderr b/tests/integrations/basic/tests/actual_tests/match_diagnostic_code.stderr
@@ -11,6 +11,6 @@ help: change the type of the numeric literal from `u32` to `i32`
 2 |     let _x: i32 = 0i32;
   |                    ~~~
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/integrations/basic/tests/actual_tests/no_rustfix.stderr b/tests/integrations/basic/tests/actual_tests/no_rustfix.stderr
@@ -13,5 +13,5 @@ note: the lint level is defined here
   |         ^^^^^^^^
   = note: `#[deny(unused_mut)]` implied by `#[deny(warnings)]`
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/tests/integrations/basic/tests/actual_tests/subdir/aux_proc_macro.stderr b/tests/integrations/basic/tests/actual_tests/subdir/aux_proc_macro.stderr
@@ -4,6 +4,6 @@ error[E0425]: cannot find value `cake` in this scope
 6 |     thing!(cake);
   |            ^^^^ not found in this scope
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0425`.