diff --git a/tests/integrations/basic-bin/tests/actual_tests/foomp.stderr b/tests/integrations/basic-bin/tests/actual_tests/foomp.stderr index f85efa95..0d1368ff 100644 --- 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 index 756f5220..e34df4f8 100644 --- 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 index 3c974645..dffb9019 100644 --- a/tests/integrations/basic-fail/Cargo.stdout +++ b/tests/integrations/basic-fail/Cargo.stdout @@ -46,7 +46,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 +88,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 +108,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 +168,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 +188,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`. @@ -242,18 +242,26 @@ error: `mismatched types` not found in diagnostics on line 8 | error: there were 1 unmatched diagnostics - --> tests/actual_tests/rustc_ice.rs:8:5 + --> tests/actual_tests/rustc_ice.rs:8:9 | 8 | add("42", 3); - | ^^^^^^^^^^^^ Ice: no errors reported for args + | ^^^^ Ice: mismatched types | full stderr: -error: internal compiler error: no errors reported for args - --> tests/actual_tests/rustc_ice.rs:8:5 +error: internal compiler error[E0308]: mismatched types + --> tests/actual_tests/rustc_ice.rs:8:9 | 8 | 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 { + | ^^^ thread 'rustc' panicked at compiler/rustc_errors/src/lib.rs: aborting due to `-Z treat-err-as-bug=1` @@ -375,7 +383,7 @@ error: expected one of `!` or `::`, found `` 7 | thing!(cake); | ^^^^ expected one of `!` or `::` -error: aborting due to previous error +error: aborting due to 1 previous error full stdout: @@ -627,7 +635,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 +665,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 +695,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 +725,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 +862,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/bad_pattern.stderr b/tests/integrations/basic-fail/tests/actual_tests/bad_pattern.stderr index 6bafa7c4..7bea44b7 100644 --- a/tests/integrations/basic-fail/tests/actual_tests/bad_pattern.stderr +++ b/tests/integrations/basic-fail/tests/actual_tests/bad_pattern.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/foomp2.stderr b/tests/integrations/basic-fail/tests/actual_tests/foomp2.stderr index c6895212..a2e5846f 100644 --- a/tests/integrations/basic-fail/tests/actual_tests/foomp2.stderr +++ b/tests/integrations/basic-fail/tests/actual_tests/foomp2.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/rustc_ice.stderr b/tests/integrations/basic-fail/tests/actual_tests/rustc_ice.stderr index b6ba943c..e8dbb87a 100644 --- a/tests/integrations/basic-fail/tests/actual_tests/rustc_ice.stderr +++ b/tests/integrations/basic-fail/tests/actual_tests/rustc_ice.stderr @@ -1,7 +1,15 @@ -error: internal compiler error: no errors reported for args - --> tests/actual_tests/rustc_ice.rs:8:5 +error: internal compiler error[E0308]: mismatched types + --> tests/actual_tests/rustc_ice.rs:8:9 | 8 | 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:1:8 + | +1 | pub fn add(left: usize, right: usize) -> usize { + | ^^^ thread 'rustc' panicked 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 index ba139b82..23f8688a 100644 --- 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 `` 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 index 9f785120..edc20dbe 100644 --- 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 index e38206a1..40809709 100644 --- 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 index 58bc8d1c..da590f39 100644 --- 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 index db5d321a..d8d1eef6 100644 --- 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 index 9467e2e5..2011cf55 100644 --- 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 index 2365cb2e..9d79a396 100644 --- 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/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_multiple_per_annotation.bar.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_multiple_per_annotation.bar.stderr index 4b7bfe82..29461bf8 100644 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_multiple_per_annotation.bar.stderr +++ b/tests/integrations/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/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_multiple_per_annotation.foo.stderr b/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_multiple_per_annotation.foo.stderr index 4b7bfe82..29461bf8 100644 --- a/tests/integrations/basic-fail/tests/actual_tests_bless/revisions_multiple_per_annotation.foo.stderr +++ b/tests/integrations/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 index d85e9441..6513fbef 100644 --- 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 index d85e9441..6513fbef 100644 --- 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 index b7c22de9..f5788fa4 100644 --- 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 index b7c22de9..f5788fa4 100644 --- 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 index eff13880..6187df41 100644 --- 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 index d97b6384..40263b9a 100644 --- 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 index 9579f326..ce88bca2 100644 --- 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 index 14b94f72..928b8c28 100644 --- 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 index 951fe00f..0bb36e22 100644 --- 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 index dc6b6bc1..2e2ae260 100644 --- 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 index 028d5aae..875044ef 100644 --- 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 index 53ceb720..9fe5222c 100644 --- 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 index 035a3e92..18189919 100644 --- 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 index a804a761..3304692a 100644 --- 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 index fa848385..c99c7c93 100644 --- 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`.