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 | ed3164baf010592dda34da57c28fa8ae5e6c2ca6 (patch) | |
| tree | 23856ce2b2ca2384a8436c64770187144b14fef5 /compiler/rustc_lint/src | |
| parent | 8fbd92d0b95d847c68948d8dbbfaccb470db4f92 (diff) | |
| parent | dd1ff405e3a059836ffceee8490a630c4b9078d3 (diff) | |
| download | rust-ed3164baf010592dda34da57c28fa8ae5e6c2ca6.tar.gz rust-ed3164baf010592dda34da57c28fa8ae5e6c2ca6.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 'compiler/rustc_lint/src')
| -rw-r--r-- | compiler/rustc_lint/src/builtin.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_lint/src/builtin.rs b/compiler/rustc_lint/src/builtin.rs index 3564f15e210..524fb6556b9 100644 --- a/compiler/rustc_lint/src/builtin.rs +++ b/compiler/rustc_lint/src/builtin.rs @@ -36,7 +36,7 @@ use rustc_feature::{deprecated_attributes, AttributeGate, BuiltinAttribute, Gate use rustc_hir as hir; use rustc_hir::def::{DefKind, Res}; use rustc_hir::def_id::{DefId, LocalDefId, LocalDefIdSet, CRATE_DEF_ID}; -use rustc_hir::{ForeignItemKind, GenericParamKind, HirId, PatKind}; +use rustc_hir::{ForeignItemKind, GenericParamKind, HirId, PatKind, PredicateOrigin}; use rustc_index::vec::Idx; use rustc_middle::lint::LintDiagnosticBuilder; use rustc_middle::ty::layout::{LayoutError, LayoutOf}; @@ -2226,7 +2226,7 @@ impl<'tcx> LateLintPass<'tcx> for ExplicitOutlivesRequirements { Self::lifetimes_outliving_type(inferred_outlives, index), &predicate.bounds, predicate.span, - predicate.in_where_clause, + predicate.origin == PredicateOrigin::WhereClause, ) } _ => { |
