summaryrefslogtreecommitdiffstats
path: root/src/tools/clippy/clippy_lints/src/use_self.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools/clippy/clippy_lints/src/use_self.rs')
-rw-r--r--src/tools/clippy/clippy_lints/src/use_self.rs206
1 files changed, 103 insertions, 103 deletions
diff --git a/src/tools/clippy/clippy_lints/src/use_self.rs b/src/tools/clippy/clippy_lints/src/use_self.rs
index c3fe16ad5..fa033838e 100644
--- a/src/tools/clippy/clippy_lints/src/use_self.rs
+++ b/src/tools/clippy/clippy_lints/src/use_self.rs
@@ -2,7 +2,6 @@ use clippy_config::msrvs::{self, Msrv};
use clippy_utils::diagnostics::span_lint_and_sugg;
use clippy_utils::is_from_proc_macro;
use clippy_utils::ty::same_type_and_consts;
-use if_chain::if_chain;
use rustc_data_structures::fx::FxHashSet;
use rustc_errors::Applicability;
use rustc_hir::def::{CtorOf, DefKind, Res};
@@ -14,7 +13,7 @@ use rustc_hir::{
};
use rustc_hir_analysis::hir_ty_to_ty;
use rustc_lint::{LateContext, LateLintPass};
-use rustc_session::{declare_tool_lint, impl_lint_pass};
+use rustc_session::impl_lint_pass;
use rustc_span::Span;
declare_clippy_lint! {
@@ -93,32 +92,40 @@ impl<'tcx> LateLintPass<'tcx> for UseSelf {
// relevant for linting, since this is the self type of the `impl` we're currently in. To
// avoid linting on nested items, we push `StackItem::NoCheck` on the stack to signal, that
// we're in an `impl` or nested item, that we don't want to lint
- let stack_item = if_chain! {
- if let ItemKind::Impl(Impl { self_ty, generics,.. }) = item.kind;
- if let TyKind::Path(QPath::Resolved(_, item_path)) = self_ty.kind;
- let parameters = &item_path.segments.last().expect(SEGMENTS_MSG).args;
- if parameters.as_ref().map_or(true, |params| {
- params.parenthesized == GenericArgsParentheses::No
+ let stack_item = if let ItemKind::Impl(Impl { self_ty, generics, .. }) = item.kind
+ && let TyKind::Path(QPath::Resolved(_, item_path)) = self_ty.kind
+ && let parameters = &item_path.segments.last().expect(SEGMENTS_MSG).args
+ && parameters.as_ref().map_or(true, |params| {
+ params.parenthesized == GenericArgsParentheses::No
&& !params.args.iter().any(|arg| matches!(arg, GenericArg::Lifetime(_)))
- });
- if !item.span.from_expansion();
- if !is_from_proc_macro(cx, item); // expensive, should be last check
- then {
- // Self cannot be used inside const generic parameters
- let types_to_skip = generics.params.iter().filter_map(|param| {
- match param {
- GenericParam { kind: GenericParamKind::Const { ty: Ty { hir_id, ..}, ..}, ..} => Some(*hir_id),
- _ => None,
- }
- }).chain(std::iter::once(self_ty.hir_id)).collect();
- StackItem::Check {
- impl_id: item.owner_id.def_id,
- in_body: 0,
- types_to_skip,
- }
- } else {
- StackItem::NoCheck
+ })
+ && !item.span.from_expansion()
+ && !is_from_proc_macro(cx, item)
+ // expensive, should be last check
+ {
+ // Self cannot be used inside const generic parameters
+ let types_to_skip = generics
+ .params
+ .iter()
+ .filter_map(|param| match param {
+ GenericParam {
+ kind:
+ GenericParamKind::Const {
+ ty: Ty { hir_id, .. }, ..
+ },
+ ..
+ } => Some(*hir_id),
+ _ => None,
+ })
+ .chain(std::iter::once(self_ty.hir_id))
+ .collect();
+ StackItem::Check {
+ impl_id: item.owner_id.def_id,
+ in_body: 0,
+ types_to_skip,
}
+ } else {
+ StackItem::NoCheck
};
self.stack.push(stack_item);
}
@@ -132,56 +139,54 @@ impl<'tcx> LateLintPass<'tcx> for UseSelf {
fn check_impl_item(&mut self, cx: &LateContext<'_>, impl_item: &hir::ImplItem<'_>) {
// We want to skip types in trait `impl`s that aren't declared as `Self` in the trait
// declaration. The collection of those types is all this method implementation does.
- if_chain! {
- if let ImplItemKind::Fn(FnSig { decl, .. }, ..) = impl_item.kind;
- if let Some(&mut StackItem::Check {
+ if let ImplItemKind::Fn(FnSig { decl, .. }, ..) = impl_item.kind
+ && let Some(&mut StackItem::Check {
impl_id,
ref mut types_to_skip,
..
- }) = self.stack.last_mut();
- if let Some(impl_trait_ref) = cx.tcx.impl_trait_ref(impl_id);
- then {
- // `self_ty` is the semantic self type of `impl <trait> for <type>`. This cannot be
- // `Self`.
- let self_ty = impl_trait_ref.instantiate_identity().self_ty();
+ }) = self.stack.last_mut()
+ && let Some(impl_trait_ref) = cx.tcx.impl_trait_ref(impl_id)
+ {
+ // `self_ty` is the semantic self type of `impl <trait> for <type>`. This cannot be
+ // `Self`.
+ let self_ty = impl_trait_ref.instantiate_identity().self_ty();
- // `trait_method_sig` is the signature of the function, how it is declared in the
- // trait, not in the impl of the trait.
- let trait_method = cx
- .tcx
- .associated_item(impl_item.owner_id)
- .trait_item_def_id
- .expect("impl method matches a trait method");
- let trait_method_sig = cx.tcx.fn_sig(trait_method).instantiate_identity();
- let trait_method_sig = cx.tcx.erase_late_bound_regions(trait_method_sig);
+ // `trait_method_sig` is the signature of the function, how it is declared in the
+ // trait, not in the impl of the trait.
+ let trait_method = cx
+ .tcx
+ .associated_item(impl_item.owner_id)
+ .trait_item_def_id
+ .expect("impl method matches a trait method");
+ let trait_method_sig = cx.tcx.fn_sig(trait_method).instantiate_identity();
+ let trait_method_sig = cx.tcx.instantiate_bound_regions_with_erased(trait_method_sig);
- // `impl_inputs_outputs` is an iterator over the types (`hir::Ty`) declared in the
- // implementation of the trait.
- let output_hir_ty = if let FnRetTy::Return(ty) = &decl.output {
- Some(&**ty)
- } else {
- None
- };
- let impl_inputs_outputs = decl.inputs.iter().chain(output_hir_ty);
+ // `impl_inputs_outputs` is an iterator over the types (`hir::Ty`) declared in the
+ // implementation of the trait.
+ let output_hir_ty = if let FnRetTy::Return(ty) = &decl.output {
+ Some(&**ty)
+ } else {
+ None
+ };
+ let impl_inputs_outputs = decl.inputs.iter().chain(output_hir_ty);
- // `impl_hir_ty` (of type `hir::Ty`) represents the type written in the signature.
- //
- // `trait_sem_ty` (of type `ty::Ty`) is the semantic type for the signature in the
- // trait declaration. This is used to check if `Self` was used in the trait
- // declaration.
- //
- // If `any`where in the `trait_sem_ty` the `self_ty` was used verbatim (as opposed
- // to `Self`), we want to skip linting that type and all subtypes of it. This
- // avoids suggestions to e.g. replace `Vec<u8>` with `Vec<Self>`, in an `impl Trait
- // for u8`, when the trait always uses `Vec<u8>`.
- //
- // See also https://github.com/rust-lang/rust-clippy/issues/2894.
- for (impl_hir_ty, trait_sem_ty) in impl_inputs_outputs.zip(trait_method_sig.inputs_and_output) {
- if trait_sem_ty.walk().any(|inner| inner == self_ty.into()) {
- let mut visitor = SkipTyCollector::default();
- visitor.visit_ty(impl_hir_ty);
- types_to_skip.extend(visitor.types_to_skip);
- }
+ // `impl_hir_ty` (of type `hir::Ty`) represents the type written in the signature.
+ //
+ // `trait_sem_ty` (of type `ty::Ty`) is the semantic type for the signature in the
+ // trait declaration. This is used to check if `Self` was used in the trait
+ // declaration.
+ //
+ // If `any`where in the `trait_sem_ty` the `self_ty` was used verbatim (as opposed
+ // to `Self`), we want to skip linting that type and all subtypes of it. This
+ // avoids suggestions to e.g. replace `Vec<u8>` with `Vec<Self>`, in an `impl Trait
+ // for u8`, when the trait always uses `Vec<u8>`.
+ //
+ // See also https://github.com/rust-lang/rust-clippy/issues/2894.
+ for (impl_hir_ty, trait_sem_ty) in impl_inputs_outputs.zip(trait_method_sig.inputs_and_output) {
+ if trait_sem_ty.walk().any(|inner| inner == self_ty.into()) {
+ let mut visitor = SkipTyCollector::default();
+ visitor.visit_ty(impl_hir_ty);
+ types_to_skip.extend(visitor.types_to_skip);
}
}
}
@@ -203,41 +208,38 @@ impl<'tcx> LateLintPass<'tcx> for UseSelf {
}
fn check_ty(&mut self, cx: &LateContext<'_>, hir_ty: &hir::Ty<'_>) {
- if_chain! {
- if !hir_ty.span.from_expansion();
- if self.msrv.meets(msrvs::TYPE_ALIAS_ENUM_VARIANTS);
- if let Some(&StackItem::Check {
+ if !hir_ty.span.from_expansion()
+ && self.msrv.meets(msrvs::TYPE_ALIAS_ENUM_VARIANTS)
+ && let Some(&StackItem::Check {
impl_id,
in_body,
ref types_to_skip,
- }) = self.stack.last();
- if let TyKind::Path(QPath::Resolved(_, path)) = hir_ty.kind;
- if !matches!(
+ }) = self.stack.last()
+ && let TyKind::Path(QPath::Resolved(_, path)) = hir_ty.kind
+ && !matches!(
path.res,
- Res::SelfTyParam { .. }
- | Res::SelfTyAlias { .. }
- | Res::Def(DefKind::TyParam, _)
- );
- if !types_to_skip.contains(&hir_ty.hir_id);
- let ty = if in_body > 0 {
+ Res::SelfTyParam { .. } | Res::SelfTyAlias { .. } | Res::Def(DefKind::TyParam, _)
+ )
+ && !types_to_skip.contains(&hir_ty.hir_id)
+ && let ty = if in_body > 0 {
cx.typeck_results().node_type(hir_ty.hir_id)
} else {
hir_ty_to_ty(cx.tcx, hir_ty)
- };
- if same_type_and_consts(ty, cx.tcx.type_of(impl_id).instantiate_identity());
- then {
- span_lint(cx, hir_ty.span);
}
+ && same_type_and_consts(ty, cx.tcx.type_of(impl_id).instantiate_identity())
+ {
+ span_lint(cx, hir_ty.span);
}
}
fn check_expr(&mut self, cx: &LateContext<'_>, expr: &Expr<'_>) {
- if_chain! {
- if !expr.span.from_expansion();
- if self.msrv.meets(msrvs::TYPE_ALIAS_ENUM_VARIANTS);
- if let Some(&StackItem::Check { impl_id, .. }) = self.stack.last();
- if cx.typeck_results().expr_ty(expr) == cx.tcx.type_of(impl_id).instantiate_identity();
- then {} else { return; }
+ if !expr.span.from_expansion()
+ && self.msrv.meets(msrvs::TYPE_ALIAS_ENUM_VARIANTS)
+ && let Some(&StackItem::Check { impl_id, .. }) = self.stack.last()
+ && cx.typeck_results().expr_ty(expr) == cx.tcx.type_of(impl_id).instantiate_identity()
+ {
+ } else {
+ return;
}
match expr.kind {
ExprKind::Struct(QPath::Resolved(_, path), ..) => check_path(cx, path),
@@ -252,18 +254,16 @@ impl<'tcx> LateLintPass<'tcx> for UseSelf {
}
fn check_pat(&mut self, cx: &LateContext<'_>, pat: &Pat<'_>) {
- if_chain! {
- if !pat.span.from_expansion();
- if self.msrv.meets(msrvs::TYPE_ALIAS_ENUM_VARIANTS);
- if let Some(&StackItem::Check { impl_id, .. }) = self.stack.last();
+ if !pat.span.from_expansion()
+ && self.msrv.meets(msrvs::TYPE_ALIAS_ENUM_VARIANTS)
+ && let Some(&StackItem::Check { impl_id, .. }) = self.stack.last()
// get the path from the pattern
- if let PatKind::Path(QPath::Resolved(_, path))
+ && let PatKind::Path(QPath::Resolved(_, path))
| PatKind::TupleStruct(QPath::Resolved(_, path), _, _)
- | PatKind::Struct(QPath::Resolved(_, path), _, _) = pat.kind;
- if cx.typeck_results().pat_ty(pat) == cx.tcx.type_of(impl_id).instantiate_identity();
- then {
- check_path(cx, path);
- }
+ | PatKind::Struct(QPath::Resolved(_, path), _, _) = pat.kind
+ && cx.typeck_results().pat_ty(pat) == cx.tcx.type_of(impl_id).instantiate_identity()
+ {
+ check_path(cx, path);
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-24 10:50:29 +0000