diff options
| author | bors <bors@rust-lang.org> | 2023-11-24 21:40:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-11-24 21:40:54 +0000 |
| commit | 37b2813a7be580ef59048a6bd08444c79e5cc97f (patch) | |
| tree | ca128703ba533ad8f1b98e29c4bfe297d7914554 /tests/ui/traits/inductive-overflow | |
| parent | 0f696e555f180bad960fdea8339c3a9b9edf844f (diff) | |
| parent | c73d392a01f26c8f83102b12e4d66d5a8d1f558b (diff) | |
| download | rust-37b2813a7be580ef59048a6bd08444c79e5cc97f.tar.gz rust-37b2813a7be580ef59048a6bd08444c79e5cc97f.zip | |
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`
Diffstat (limited to 'tests/ui/traits/inductive-overflow')
| -rw-r--r-- | tests/ui/traits/inductive-overflow/lifetime.stderr | 2 | ||||
| -rw-r--r-- | tests/ui/traits/inductive-overflow/simultaneous.stderr | 2 | ||||
| -rw-r--r-- | tests/ui/traits/inductive-overflow/supertrait.stderr | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/ui/traits/inductive-overflow/lifetime.stderr b/tests/ui/traits/inductive-overflow/lifetime.stderr index 7ab2864a8cf..b34bb0361f1 100644 --- a/tests/ui/traits/inductive-overflow/lifetime.stderr +++ b/tests/ui/traits/inductive-overflow/lifetime.stderr @@ -15,6 +15,6 @@ note: required by a bound in `is_send` LL | fn is_send<S: NotAuto>() {} | ^^^^^^^ required by this bound in `is_send` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0275`. diff --git a/tests/ui/traits/inductive-overflow/simultaneous.stderr b/tests/ui/traits/inductive-overflow/simultaneous.stderr index e3b4ec07d23..b9a746e44ba 100644 --- a/tests/ui/traits/inductive-overflow/simultaneous.stderr +++ b/tests/ui/traits/inductive-overflow/simultaneous.stderr @@ -17,6 +17,6 @@ note: required by a bound in `is_ee` LL | fn is_ee<T: Combo>(t: T) { | ^^^^^ required by this bound in `is_ee` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0275`. diff --git a/tests/ui/traits/inductive-overflow/supertrait.stderr b/tests/ui/traits/inductive-overflow/supertrait.stderr index b537ecf1721..f2dccbbbb2c 100644 --- a/tests/ui/traits/inductive-overflow/supertrait.stderr +++ b/tests/ui/traits/inductive-overflow/supertrait.stderr @@ -17,6 +17,6 @@ note: required by a bound in `copy` LL | fn copy<T: Magic>(x: T) -> (T, T) { (x, x) } | ^^^^^ required by this bound in `copy` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0275`. |