diff options
| author | bors <bors@rust-lang.org> | 2022-05-08 14:10:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-05-08 14:10:12 +0000 |
| commit | 1d018ce47ce8ee6047ca6f92b89fb5b97b2ee5eb (patch) | |
| tree | b62fa30799236a09dd882e2e610f4b3302a0ad12 /tests | |
| parent | 6d0378953eebdfafd7ff150fe2ab46bc6c645b3f (diff) | |
| parent | bca3d8a6b5f04fe2a6ca95ff22d07ee73ad80604 (diff) | |
| download | rust-1d018ce47ce8ee6047ca6f92b89fb5b97b2ee5eb.tar.gz rust-1d018ce47ce8ee6047ca6f92b89fb5b97b2ee5eb.zip | |
Auto merge of #96770 - flip1995:fix-trait-type-in-bounds, r=cjgillot
Track if a where bound comes from a impl Trait desugar With https://github.com/rust-lang/rust/pull/93803 `impl Trait` function arguments get desugared to hidden where bounds. However, Clippy needs to know if a bound was originally a `impl Trait` or an actual bound. This adds a field to the `WhereBoundPredicate` struct to keep track of this information during AST->HIR lowering. r? `@cjgillot` cc `@estebank` (as the reviewer of #93803)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ui/trait_duplication_in_bounds.stderr | 10 | ||||
| -rw-r--r-- | tests/ui/type_repetition_in_bounds.stderr | 10 |
2 files changed, 2 insertions, 18 deletions
diff --git a/tests/ui/trait_duplication_in_bounds.stderr b/tests/ui/trait_duplication_in_bounds.stderr index d0a4cfb8837..6f8c8e47dfb 100644 --- a/tests/ui/trait_duplication_in_bounds.stderr +++ b/tests/ui/trait_duplication_in_bounds.stderr @@ -67,13 +67,5 @@ LL | Self: Iterator<Item = Foo>, | = help: consider removing this trait bound -error: this trait bound is already specified in the where clause - --> $DIR/trait_duplication_in_bounds.rs:99:23 - | -LL | fn impl_trait(_: impl AsRef<str>, _: impl AsRef<str>) {} - | ^^^^^^^^^^ - | - = help: consider removing this trait bound - -error: aborting due to 9 previous errors +error: aborting due to 8 previous errors diff --git a/tests/ui/type_repetition_in_bounds.stderr b/tests/ui/type_repetition_in_bounds.stderr index abc25e59496..148c19c7d07 100644 --- a/tests/ui/type_repetition_in_bounds.stderr +++ b/tests/ui/type_repetition_in_bounds.stderr @@ -19,13 +19,5 @@ LL | Self: Copy + Default + Ord, | = help: consider combining the bounds: `Self: Clone + Copy + Default + Ord` -error: this type has already been used as a bound predicate - --> $DIR/type_repetition_in_bounds.rs:83:43 - | -LL | fn impl_trait(_: impl AsRef<str>, _: impl AsRef<str>) {} - | ^^^^^^^^^^ - | - = help: consider combining the bounds: `impl AsRef<str>: AsRef<str> + AsRef<str>` - -error: aborting due to 3 previous errors +error: aborting due to 2 previous errors |