diff options
| author | bors <bors@rust-lang.org> | 2024-09-04 22:58:51 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-09-04 22:58:51 +0000 |
| commit | 009e73825af0e59ad4fc603562e038b3dbd6593a (patch) | |
| tree | 5015384a0ad20ed06a185717c3155722515a218d /tests/ui/coherence/normalize-for-errors.rs | |
| parent | 4ac7bcbaad8d6fd7a51bdf1b696cbc3ba4c796cf (diff) | |
| parent | 2e005112fdd15af33f76eb2fd839c4f7f646d3ac (diff) | |
| download | rust-009e73825af0e59ad4fc603562e038b3dbd6593a.tar.gz rust-009e73825af0e59ad4fc603562e038b3dbd6593a.zip | |
Auto merge of #129936 - matthiaskrgr:rollup-0s8xycb, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #127692 (Suggest `impl Trait` for References to Bare Trait in Function Header) - #128701 (Don't Suggest Labeling `const` and `unsafe` Blocks ) - #128934 (Non-exhaustive structs may be empty) - #129630 (Document the broken C ABI of `wasm32-unknown-unknown`) - #129863 (update comment regarding TargetOptions.features) - #129896 (do not attempt to prove unknowable goals) - #129926 (Move `SanityCheck` and `MirPass`) - #129928 (rustc_driver_impl: remove some old dead logic) - #129930 (include 1.80.1 release notes on master) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'tests/ui/coherence/normalize-for-errors.rs')
| -rw-r--r-- | tests/ui/coherence/normalize-for-errors.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/ui/coherence/normalize-for-errors.rs b/tests/ui/coherence/normalize-for-errors.rs index 4188389a3ad..c17bb766b5b 100644 --- a/tests/ui/coherence/normalize-for-errors.rs +++ b/tests/ui/coherence/normalize-for-errors.rs @@ -18,6 +18,6 @@ impl<S: Iterator> MyTrait<S> for (Box<<(MyType,) as Mirror>::Assoc>, S::Item) {} //~^ ERROR conflicting implementations of trait `MyTrait<_>` for type `(Box<(MyType,)>, //~| NOTE conflicting implementation for `(Box<(MyType,)>, //~| NOTE upstream crates may add a new impl of trait `std::marker::Copy` for type `std::boxed::Box<(MyType,)>` in future versions -//[next]~| NOTE upstream crates may add a new impl of trait `std::clone::Clone` for type `(MyType,)` in future versions +//[next]~| NOTE upstream crates may add a new impl of trait `std::clone::Clone` for type `std::boxed::Box<(MyType,)>` in future versions fn main() {} |