Skip to content

Commit ba845ef

Browse files
committed
Auto merge of #118138 - Nilstrieb:one-previous-error, r=WaffleLapkin
Fixes error count display is different when there's only one error left Supersedes #114759 ### What did I do? I did the small change in `rustc_errors` by hand. Then I did the other changes in `/compiler` by hand, those were just find replace on `*.rs` in the workspace. The changes in run-make are find replace for `run-make` in the workspace. All other changes are blessed using `x test TEST --bless`. I blessed the tests that were blessed in #114759. ### how to review this nightmare ping bors with an `r+`. You should check that my logic is sound and maybe quickly scroll through the diff, but fully verifying it seems fairly hard to impossible. I did my best to do this correctly. Thank you `@adrianEffe` for bringing this up and your initial implementation. cc `@flip1995,` you said you want to do a subtree sync asap cc `@RalfJung` maybe you want to do a quick subtree sync afterwards as well for Miri r? `@WaffleLapkin`
2 parents a30ac6a + 5d394e7 commit ba845ef

File tree

121 files changed

+121
-121
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+121
-121
lines changed

tests/ui-internal/default_deprecation_reason.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ LL | #![deny(clippy::internal)]
1818
= note: `#[deny(clippy::default_deprecation_reason)]` implied by `#[deny(clippy::internal)]`
1919
= note: this error originates in the macro `declare_deprecated_lint` (in Nightly builds, run with -Z macro-backtrace for more info)
2020

21-
error: aborting due to previous error
21+
error: aborting due to 1 previous error
2222

tests/ui-internal/default_lint.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ LL | #![deny(clippy::internal)]
1717
= note: `#[deny(clippy::default_lint)]` implied by `#[deny(clippy::internal)]`
1818
= note: this error originates in the macro `$crate::declare_tool_lint` which comes from the expansion of the macro `declare_tool_lint` (in Nightly builds, run with -Z macro-backtrace for more info)
1919

20-
error: aborting due to previous error
20+
error: aborting due to 1 previous error
2121

tests/ui-internal/lint_without_lint_pass.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ LL | #![deny(clippy::internal)]
1717
= note: `#[deny(clippy::lint_without_lint_pass)]` implied by `#[deny(clippy::internal)]`
1818
= note: this error originates in the macro `declare_tool_lint` (in Nightly builds, run with -Z macro-backtrace for more info)
1919

20-
error: aborting due to previous error
20+
error: aborting due to 1 previous error
2121

tests/ui-internal/outer_expn_data.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ LL | #![deny(clippy::internal)]
1111
| ^^^^^^^^^^^^^^^^
1212
= note: `#[deny(clippy::outer_expn_expn_data)]` implied by `#[deny(clippy::internal)]`
1313

14-
error: aborting due to previous error
14+
error: aborting due to 1 previous error
1515

tests/ui-toml/bad_toml/conf_bad_toml.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ error: error reading Clippy's configuration file: expected `.`, `=`
44
LL | fn this_is_obviously(not: a, toml: file) {
55
| ^
66

7-
error: aborting due to previous error
7+
error: aborting due to 1 previous error
88

tests/ui-toml/bad_toml_type/conf_bad_type.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ error: error reading Clippy's configuration file: invalid type: integer `42`, ex
44
LL | disallowed-names = 42
55
| ^^
66

7-
error: aborting due to previous error
7+
error: aborting due to 1 previous error
88

tests/ui-toml/conf_deprecated_key/conf_deprecated_key.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ LL | fn cognitive_complexity() {
2020
= note: `-D clippy::cognitive-complexity` implied by `-D warnings`
2121
= help: to override `-D warnings` add `#[allow(clippy::cognitive_complexity)]`
2222

23-
error: aborting due to previous error; 2 warnings emitted
23+
error: aborting due to 1 previous error; 2 warnings emitted
2424

tests/ui-toml/decimal_literal_representation/decimal_literal_representation.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ LL | let _ = 16777215;
77
= note: `-D clippy::decimal-literal-representation` implied by `-D warnings`
88
= help: to override `-D warnings` add `#[allow(clippy::decimal_literal_representation)]`
99

10-
error: aborting due to previous error
10+
error: aborting due to 1 previous error
1111

tests/ui-toml/disallowed_names_replace/disallowed_names.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ LL | let ducks = ["quack", "quack"];
77
= note: `-D clippy::disallowed-names` implied by `-D warnings`
88
= help: to override `-D warnings` add `#[allow(clippy::disallowed_names)]`
99

10-
error: aborting due to previous error
10+
error: aborting due to 1 previous error
1111

tests/ui-toml/disallowed_script_idents/disallowed_script_idents.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ LL | let カウンタ = 10;
77
= note: `-D clippy::disallowed-script-idents` implied by `-D warnings`
88
= help: to override `-D warnings` add `#[allow(clippy::disallowed_script_idents)]`
99

10-
error: aborting due to previous error
10+
error: aborting due to 1 previous error
1111

0 commit comments

Comments
 (0)