Adapt clippy.

Author: cjgillot

src/tools/clippy/clippy_lints/src/extra_unused_type_parameters.rs

@@ -6,7 +6,7 @@ use rustc_errors::Applicability;
 use rustc_hir::intravisit::{Visitor, walk_impl_item, walk_item, walk_param_bound, walk_ty};
 use rustc_hir::{
 BodyId,ExprKind,GenericBound,GenericParam,GenericParamKind,Generics,ImplItem,ImplItemKind,Item,ItemKind,
-PredicateOrigin,Ty,TyKind,WherePredicate,
+PredicateOrigin,Ty,WherePredicate,
 };
 use rustc_lint::{LateContext,LateLintPass,LintContext};
 use rustc_middle::hir::nested_filter;
@@ -199,12 +199,6 @@ impl<'tcx> Visitor<'tcx> for TypeWalker<'_, 'tcx> {
 fnvisit_ty(&mutself,t:&'tcxTy<'tcx>){
 ifletSome((def_id, _)) = t.peel_refs().as_generic_param(){
 self.ty_params.remove(&def_id);
-}elseifletTyKind::OpaqueDef(id, _) = t.kind{
-// Explicitly walk OpaqueDef. Normally `walk_ty` would do the job, but it calls
-// `visit_nested_item`, which checks that `Self::NestedFilter::INTER` is set. We're
-// using `OnlyBodies`, so the check ends up failing and the type isn't fully walked.
-let item = self.nested_visit_map().item(id);
-walk_item(self, item);
 }else{
 walk_ty(self, t);
 }

src/tools/clippy/clippy_lints/src/implied_bounds_in_impls.rs

@@ -3,7 +3,7 @@ use clippy_utils::source::snippet;
 use rustc_errors::{Applicability,SuggestionStyle};
 use rustc_hir::def_id::DefId;
 use rustc_hir::{
-AssocItemConstraint,GenericArg,GenericBound,GenericBounds,ItemKind,PredicateOrigin,TraitBoundModifier,
+AssocItemConstraint,GenericArg,GenericBound,GenericBounds,PredicateOrigin,TraitBoundModifier,
 TyKind,WherePredicate,
 };
 use rustc_hir_analysis::lower_ty;
@@ -342,11 +342,8 @@ impl<'tcx> LateLintPass<'tcx> for ImpliedBoundsInImpls {
 }
 }
 
-fncheck_ty(&mutself,cx:&LateContext<'_>,ty:&rustc_hir::Ty<'_>){
-ifletTyKind::OpaqueDef(item_id, ..) = ty.kind
- && let item = cx.tcx.hir().item(item_id)
- && letItemKind::OpaqueTy(opaque_ty) = item.kind
-{
+fncheck_ty(&mutself,cx:&LateContext<'tcx>,ty:&rustc_hir::Ty<'tcx>){
+ifletTyKind::OpaqueDef(opaque_ty, ..) = ty.kind{
 check(cx, opaque_ty.bounds);
 }
 }

src/tools/clippy/clippy_lints/src/len_zero.rs

@@ -308,11 +308,7 @@ enum LenOutput {
 
 fnextract_future_output<'tcx>(cx:&LateContext<'tcx>,ty:Ty<'tcx>) -> Option<&'tcxPathSegment<'tcx>>{
 iflet ty::Alias(_, alias_ty) = ty.kind()
- && letSome(Node::Item(item)) = cx.tcx.hir().get_if_local(alias_ty.def_id)
- && letItem{
-kind:ItemKind::OpaqueTy(opaque),
- ..
-} = item
+ && letSome(Node::OpaqueTy(opaque)) = cx.tcx.hir().get_if_local(alias_ty.def_id)
  && letOpaqueTyOrigin::AsyncFn{ .. } = opaque.origin
  && let[GenericBound::Trait(trait_ref, _)] = &opaque.bounds
  && letSome(segment) = trait_ref.trait_ref.path.segments.last()

src/tools/clippy/clippy_lints/src/lifetimes.rs

@@ -6,7 +6,7 @@ use rustc_errors::Applicability;
 use rustc_hir::FnRetTy::Return;
 use rustc_hir::intravisit::nested_filter::{selfas hir_nested_filter,NestedFilter};
 use rustc_hir::intravisit::{
-Visitor, walk_fn_decl, walk_generic_args, walk_generics, walk_impl_item_ref,walk_item,walk_param_bound,
+Visitor, walk_fn_decl, walk_generic_args, walk_generics, walk_impl_item_ref, walk_param_bound,
  walk_poly_trait_ref, walk_trait_ref, walk_ty, walk_where_predicate,
 };
 use rustc_hir::{
@@ -420,11 +420,9 @@ impl<'tcx> Visitor<'tcx> for RefVisitor<'_, 'tcx> {
 
 fnvisit_ty(&mutself,ty:&'tcxTy<'_>){
 match ty.kind{
-TyKind::OpaqueDef(item, bounds) => {
-let map = self.cx.tcx.hir();
-let item = map.item(item);
+TyKind::OpaqueDef(opaque, bounds) => {
 let len = self.lts.len();
-walk_item(self, item);
+self.visit_opaque_ty(opaque);
 self.lts.truncate(len);
 self.lts.extend(bounds.iter().filter_map(|bound| match bound {
 GenericArg::Lifetime(&l) => Some(l),

src/tools/clippy/clippy_lints/src/manual_async_fn.rs

@@ -4,7 +4,7 @@ use rustc_errors::Applicability;
 use rustc_hir::intravisit::FnKind;
 use rustc_hir::{
 Block,Body,Closure,ClosureKind,CoroutineDesugaring,CoroutineKind,CoroutineSource,Expr,ExprKind,FnDecl,
-FnRetTy,GenericArg,GenericBound,ImplItem,Item,ItemKind,LifetimeName,Node,TraitRef,Ty,TyKind,
+FnRetTy,GenericArg,GenericBound,ImplItem,Item,LifetimeName,Node,TraitRef,Ty,TyKind,
 };
 use rustc_lint::{LateContext,LateLintPass};
 use rustc_session::declare_lint_pass;
@@ -105,9 +105,7 @@ fn future_trait_ref<'tcx>(
 cx:&LateContext<'tcx>,
 ty:&'tcxTy<'tcx>,
 ) -> Option<(&'tcxTraitRef<'tcx>,Vec<LifetimeName>)>{
-ifletTyKind::OpaqueDef(item_id, bounds) = ty.kind
- && let item = cx.tcx.hir().item(item_id)
- && letItemKind::OpaqueTy(opaque) = &item.kind
+ifletTyKind::OpaqueDef(opaque, bounds) = ty.kind
  && letSome(trait_ref) = opaque.bounds.iter().find_map(|bound| {
 ifletGenericBound::Trait(poly, _) = bound {
 Some(&poly.trait_ref)

src/tools/clippy/clippy_lints/src/missing_doc.rs

@@ -193,8 +193,7 @@ impl<'tcx> LateLintPass<'tcx> for MissingDoc {
  | hir::ItemKind::Trait(..)
  | hir::ItemKind::TraitAlias(..)
  | hir::ItemKind::TyAlias(..)
- | hir::ItemKind::Union(..)
- | hir::ItemKind::OpaqueTy(..) => {},
+ | hir::ItemKind::Union(..) => {}
  hir::ItemKind::ExternCrate(..)
  | hir::ItemKind::ForeignMod{ .. }
  | hir::ItemKind::GlobalAsm(..)

src/tools/clippy/clippy_lints/src/missing_inline.rs

@@ -130,7 +130,6 @@ impl<'tcx> LateLintPass<'tcx> for MissingInline {
  | hir::ItemKind::GlobalAsm(..)
  | hir::ItemKind::TyAlias(..)
  | hir::ItemKind::Union(..)
- | hir::ItemKind::OpaqueTy(..)
  | hir::ItemKind::ExternCrate(..)
  | hir::ItemKind::ForeignMod{ .. }
  | hir::ItemKind::Impl{ .. }

src/tools/clippy/clippy_lints/src/use_self.rs

@@ -85,10 +85,6 @@ const SEGMENTS_MSG: &str = "segments should be composed of at least 1 element";
 
 impl<'tcx>LateLintPass<'tcx>forUseSelf{
 fncheck_item(&mutself,cx:&LateContext<'tcx>,item:&Item<'tcx>){
-ifmatches!(item.kind,ItemKind::OpaqueTy(_)){
-// skip over `ItemKind::OpaqueTy` in order to lint `foo() -> impl <..>`
-return;
-}
 // We push the self types of `impl`s on a stack here. Only the top type on the stack is
 // 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
@@ -130,10 +126,8 @@ impl<'tcx> LateLintPass<'tcx> for UseSelf {
 self.stack.push(stack_item);
 }
 
-fncheck_item_post(&mutself, _:&LateContext<'_>,item:&Item<'_>){
-if !matches!(item.kind,ItemKind::OpaqueTy(_)){
-self.stack.pop();
-}
+fncheck_item_post(&mutself, _:&LateContext<'_>, _:&Item<'_>){
+self.stack.pop();
 }
 
 fncheck_impl_item(&mutself,cx:&LateContext<'_>,impl_item:&hir::ImplItem<'_>){