Remove unused argument from visit_poly_trait_ref.

nnethercote · nnethercote · commit 7e3fd33a6652 · 2022-09-12T13:51:10.000+10:00
diff --git a/compiler/rustc_hir/src/intravisit.rs b/compiler/rustc_hir/src/intravisit.rs
@@ -388,8 +388,8 @@ pub trait Visitor<'v>: Sized {
     fn visit_param_bound(&mut self, bounds: &'v GenericBound<'v>) {
         walk_param_bound(self, bounds)
     }
-    fn visit_poly_trait_ref(&mut self, t: &'v PolyTraitRef<'v>, m: TraitBoundModifier) {
-        walk_poly_trait_ref(self, t, m)
+    fn visit_poly_trait_ref(&mut self, t: &'v PolyTraitRef<'v>) {
+        walk_poly_trait_ref(self, t)
     }
     fn visit_variant_data(&mut self, s: &'v VariantData<'v>) {
         walk_struct_def(self, s)
@@ -495,11 +495,7 @@ pub fn walk_lifetime<'v, V: Visitor<'v>>(visitor: &mut V, lifetime: &'v Lifetime
     }
 }
 
-pub fn walk_poly_trait_ref<'v, V: Visitor<'v>>(
-    visitor: &mut V,
-    trait_ref: &'v PolyTraitRef<'v>,
-    _modifier: TraitBoundModifier,
-) {
+pub fn walk_poly_trait_ref<'v, V: Visitor<'v>>(visitor: &mut V, trait_ref: &'v PolyTraitRef<'v>) {
     walk_list!(visitor, visit_generic_param, trait_ref.bound_generic_params);
     visitor.visit_trait_ref(&trait_ref.trait_ref);
 }
@@ -681,7 +677,7 @@ pub fn walk_ty<'v, V: Visitor<'v>>(visitor: &mut V, typ: &'v Ty<'v>) {
         }
         TyKind::TraitObject(bounds, ref lifetime, _syntax) => {
             for bound in bounds {
-                visitor.visit_poly_trait_ref(bound, TraitBoundModifier::None);
+                visitor.visit_poly_trait_ref(bound);
             }
             visitor.visit_lifetime(lifetime);
         }
@@ -807,8 +803,8 @@ pub fn walk_foreign_item<'v, V: Visitor<'v>>(visitor: &mut V, foreign_item: &'v
 
 pub fn walk_param_bound<'v, V: Visitor<'v>>(visitor: &mut V, bound: &'v GenericBound<'v>) {
     match *bound {
-        GenericBound::Trait(ref typ, modifier) => {
-            visitor.visit_poly_trait_ref(typ, modifier);
+        GenericBound::Trait(ref typ, _modifier) => {
+            visitor.visit_poly_trait_ref(typ);
         }
         GenericBound::LangItemTrait(_, _span, hir_id, args) => {
             visitor.visit_id(hir_id);
diff --git a/compiler/rustc_infer/src/infer/error_reporting/nice_region_error/find_anon_type.rs b/compiler/rustc_infer/src/infer/error_reporting/nice_region_error/find_anon_type.rs
@@ -91,7 +91,7 @@ impl<'tcx> Visitor<'tcx> for FindNestedTypeVisitor<'tcx> {
             hir::TyKind::TraitObject(bounds, ..) => {
                 for bound in bounds {
                     self.current_index.shift_in(1);
-                    self.visit_poly_trait_ref(bound, hir::TraitBoundModifier::None);
+                    self.visit_poly_trait_ref(bound);
                     self.current_index.shift_out(1);
                 }
             }
diff --git a/compiler/rustc_lint/src/late.rs b/compiler/rustc_lint/src/late.rs
@@ -258,13 +258,9 @@ impl<'tcx, T: LateLintPass<'tcx>> hir_visit::Visitor<'tcx> for LateContextAndPas
         hir_visit::walk_where_predicate(self, p);
     }
 
-    fn visit_poly_trait_ref(
-        &mut self,
-        t: &'tcx hir::PolyTraitRef<'tcx>,
-        m: hir::TraitBoundModifier,
-    ) {
-        lint_callback!(self, check_poly_trait_ref, t, m);
-        hir_visit::walk_poly_trait_ref(self, t, m);
+    fn visit_poly_trait_ref(&mut self, t: &'tcx hir::PolyTraitRef<'tcx>) {
+        lint_callback!(self, check_poly_trait_ref, t);
+        hir_visit::walk_poly_trait_ref(self, t);
     }
 
     fn visit_trait_item(&mut self, trait_item: &'tcx hir::TraitItem<'tcx>) {
diff --git a/compiler/rustc_lint/src/passes.rs b/compiler/rustc_lint/src/passes.rs
@@ -31,7 +31,7 @@ macro_rules! late_lint_methods {
             fn check_ty(a: &$hir hir::Ty<$hir>);
             fn check_generic_param(a: &$hir hir::GenericParam<$hir>);
             fn check_generics(a: &$hir hir::Generics<$hir>);
-            fn check_poly_trait_ref(a: &$hir hir::PolyTraitRef<$hir>, b: hir::TraitBoundModifier);
+            fn check_poly_trait_ref(a: &$hir hir::PolyTraitRef<$hir>);
             fn check_fn(
                 a: rustc_hir::intravisit::FnKind<$hir>,
                 b: &$hir hir::FnDecl<$hir>,
diff --git a/compiler/rustc_resolve/src/late/lifetimes.rs b/compiler/rustc_resolve/src/late/lifetimes.rs
@@ -682,7 +682,7 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
                 let scope = Scope::TraitRefBoundary { s: self.scope };
                 self.with(scope, |this| {
                     for bound in bounds {
-                        this.visit_poly_trait_ref(bound, hir::TraitBoundModifier::None);
+                        this.visit_poly_trait_ref(bound);
                     }
                 });
                 match lifetime.name {
@@ -1105,11 +1105,7 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
         }
     }
 
-    fn visit_poly_trait_ref(
-        &mut self,
-        trait_ref: &'tcx hir::PolyTraitRef<'tcx>,
-        _modifier: hir::TraitBoundModifier,
-    ) {
+    fn visit_poly_trait_ref(&mut self, trait_ref: &'tcx hir::PolyTraitRef<'tcx>) {
         debug!("visit_poly_trait_ref(trait_ref={:?})", trait_ref);
 
         let (mut binders, scope_type) = self.poly_trait_ref_binder_info();
diff --git a/compiler/rustc_typeck/src/collect.rs b/compiler/rustc_typeck/src/collect.rs
@@ -1346,16 +1346,12 @@ fn has_late_bound_regions<'tcx>(tcx: TyCtxt<'tcx>, node: Node<'tcx>) -> Option<S
             }
         }
 
-        fn visit_poly_trait_ref(
-            &mut self,
-            tr: &'tcx hir::PolyTraitRef<'tcx>,
-            m: hir::TraitBoundModifier,
-        ) {
+        fn visit_poly_trait_ref(&mut self, tr: &'tcx hir::PolyTraitRef<'tcx>) {
             if self.has_late_bound_regions.is_some() {
                 return;
             }
             self.outer_index.shift_in(1);
-            intravisit::walk_poly_trait_ref(self, tr, m);
+            intravisit::walk_poly_trait_ref(self, tr);
             self.outer_index.shift_out(1);
         }
 
diff --git a/src/tools/clippy/clippy_lints/src/disallowed_types.rs b/src/tools/clippy/clippy_lints/src/disallowed_types.rs
@@ -2,7 +2,7 @@ use clippy_utils::diagnostics::span_lint_and_then;
 
 use rustc_data_structures::fx::FxHashMap;
 use rustc_hir::{
-    def::Res, def_id::DefId, Item, ItemKind, PolyTraitRef, PrimTy, TraitBoundModifier, Ty, TyKind, UseKind,
+    def::Res, def_id::DefId, Item, ItemKind, PolyTraitRef, PrimTy, Ty, TyKind, UseKind,
 };
 use rustc_lint::{LateContext, LateLintPass};
 use rustc_session::{declare_tool_lint, impl_lint_pass};
@@ -120,7 +120,7 @@ impl<'tcx> LateLintPass<'tcx> for DisallowedTypes {
         }
     }
 
-    fn check_poly_trait_ref(&mut self, cx: &LateContext<'tcx>, poly: &'tcx PolyTraitRef<'tcx>, _: TraitBoundModifier) {
+    fn check_poly_trait_ref(&mut self, cx: &LateContext<'tcx>, poly: &'tcx PolyTraitRef<'tcx>) {
         self.check_res_emit(cx, &poly.trait_ref.path.res, poly.trait_ref.path.span);
     }
 }
diff --git a/src/tools/clippy/clippy_lints/src/lifetimes.rs b/src/tools/clippy/clippy_lints/src/lifetimes.rs
@@ -10,7 +10,7 @@ use rustc_hir::FnRetTy::Return;
 use rustc_hir::{
     BareFnTy, BodyId, FnDecl, GenericArg, GenericBound, GenericParam, GenericParamKind, Generics, Impl, ImplItem,
     ImplItemKind, Item, ItemKind, LangItem, Lifetime, LifetimeName, ParamName, PolyTraitRef, PredicateOrigin,
-    TraitBoundModifier, TraitFn, TraitItem, TraitItemKind, Ty, TyKind, WherePredicate,
+    TraitFn, TraitItem, TraitItemKind, Ty, TyKind, WherePredicate,
 };
 use rustc_lint::{LateContext, LateLintPass};
 use rustc_middle::hir::nested_filter as middle_nested_filter;
@@ -422,7 +422,7 @@ impl<'a, 'tcx> Visitor<'tcx> for RefVisitor<'a, 'tcx> {
         self.record(&Some(*lifetime));
     }
 
-    fn visit_poly_trait_ref(&mut self, poly_tref: &'tcx PolyTraitRef<'tcx>, tbm: TraitBoundModifier) {
+    fn visit_poly_trait_ref(&mut self, poly_tref: &'tcx PolyTraitRef<'tcx>) {
         let trait_ref = &poly_tref.trait_ref;
         if CLOSURE_TRAIT_BOUNDS.iter().any(|&item| {
             self.cx
@@ -435,7 +435,7 @@ impl<'a, 'tcx> Visitor<'tcx> for RefVisitor<'a, 'tcx> {
             sub_visitor.visit_trait_ref(trait_ref);
             self.nested_elision_site_lts.append(&mut sub_visitor.all_lts());
         } else {
-            walk_poly_trait_ref(self, poly_tref, tbm);
+            walk_poly_trait_ref(self, poly_tref);
         }
     }
 
@@ -466,7 +466,7 @@ impl<'a, 'tcx> Visitor<'tcx> for RefVisitor<'a, 'tcx> {
                     self.unelided_trait_object_lifetime = true;
                 }
                 for bound in bounds {
-                    self.visit_poly_trait_ref(bound, TraitBoundModifier::None);
+                    self.visit_poly_trait_ref(bound);
                 }
             },
             _ => walk_ty(self, ty),

Original file line number	Diff line number	Diff line change
`@@ -388,8 +388,8 @@ pub trait Visitor<'v>: Sized {`
`388`	`388`	`fn visit_param_bound(&mut self, bounds: &'v GenericBound<'v>) {`
`389`	`389`	`walk_param_bound(self, bounds)`
`390`	`390`	`}`
`391`		`- fn visit_poly_trait_ref(&mut self, t: &'v PolyTraitRef<'v>, m: TraitBoundModifier) {`
`392`		`- walk_poly_trait_ref(self, t, m)`
	`391`	`+ fn visit_poly_trait_ref(&mut self, t: &'v PolyTraitRef<'v>) {`
	`392`	`+ walk_poly_trait_ref(self, t)`
`393`	`393`	`}`
`394`	`394`	`fn visit_variant_data(&mut self, s: &'v VariantData<'v>) {`
`395`	`395`	`walk_struct_def(self, s)`
`@@ -495,11 +495,7 @@ pub fn walk_lifetime<'v, V: Visitor<'v>>(visitor: &mut V, lifetime: &'v Lifetime`
`495`	`495`	`}`
`496`	`496`	`}`
`497`	`497`
`498`		`-pub fn walk_poly_trait_ref<'v, V: Visitor<'v>>(`
`499`		`- visitor: &mut V,`
`500`		`- trait_ref: &'v PolyTraitRef<'v>,`
`501`		`- _modifier: TraitBoundModifier,`
`502`		`-) {`
	`498`	`+pub fn walk_poly_trait_ref<'v, V: Visitor<'v>>(visitor: &mut V, trait_ref: &'v PolyTraitRef<'v>) {`
`503`	`499`	`walk_list!(visitor, visit_generic_param, trait_ref.bound_generic_params);`
`504`	`500`	`visitor.visit_trait_ref(&trait_ref.trait_ref);`
`505`	`501`	`}`
`@@ -681,7 +677,7 @@ pub fn walk_ty<'v, V: Visitor<'v>>(visitor: &mut V, typ: &'v Ty<'v>) {`
`681`	`677`	`}`
`682`	`678`	`TyKind::TraitObject(bounds, ref lifetime, _syntax) => {`
`683`	`679`	`for bound in bounds {`
`684`		`- visitor.visit_poly_trait_ref(bound, TraitBoundModifier::None);`
	`680`	`+ visitor.visit_poly_trait_ref(bound);`
`685`	`681`	`}`
`686`	`682`	`visitor.visit_lifetime(lifetime);`
`687`	`683`	`}`
`@@ -807,8 +803,8 @@ pub fn walk_foreign_item<'v, V: Visitor<'v>>(visitor: &mut V, foreign_item: &'v`
`807`	`803`
`808`	`804`	`pub fn walk_param_bound<'v, V: Visitor<'v>>(visitor: &mut V, bound: &'v GenericBound<'v>) {`
`809`	`805`	`match *bound {`
`810`		`- GenericBound::Trait(ref typ, modifier) => {`
`811`		`- visitor.visit_poly_trait_ref(typ, modifier);`
	`806`	`+ GenericBound::Trait(ref typ, _modifier) => {`
	`807`	`+ visitor.visit_poly_trait_ref(typ);`
`812`	`808`	`}`
`813`	`809`	`GenericBound::LangItemTrait(_, _span, hir_id, args) => {`
`814`	`810`	`visitor.visit_id(hir_id);`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ impl<'tcx> Visitor<'tcx> for FindNestedTypeVisitor<'tcx> {`
`91`	`91`	`hir::TyKind::TraitObject(bounds, ..) => {`
`92`	`92`	`for bound in bounds {`
`93`	`93`	`self.current_index.shift_in(1);`
`94`		`- self.visit_poly_trait_ref(bound, hir::TraitBoundModifier::None);`
	`94`	`+ self.visit_poly_trait_ref(bound);`
`95`	`95`	`self.current_index.shift_out(1);`
`96`	`96`	`}`
`97`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -682,7 +682,7 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {`
`682`	`682`	`let scope = Scope::TraitRefBoundary { s: self.scope };`
`683`	`683`	`self.with(scope, \|this\| {`
`684`	`684`	`for bound in bounds {`
`685`		`- this.visit_poly_trait_ref(bound, hir::TraitBoundModifier::None);`
	`685`	`+ this.visit_poly_trait_ref(bound);`
`686`	`686`	`}`
`687`	`687`	`});`
`688`	`688`	`match lifetime.name {`
`@@ -1105,11 +1105,7 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {`
`1105`	`1105`	`}`
`1106`	`1106`	`}`
`1107`	`1107`
`1108`		`- fn visit_poly_trait_ref(`
`1109`		`- &mut self,`
`1110`		`- trait_ref: &'tcx hir::PolyTraitRef<'tcx>,`
`1111`		`- _modifier: hir::TraitBoundModifier,`
`1112`		`- ) {`
	`1108`	`+ fn visit_poly_trait_ref(&mut self, trait_ref: &'tcx hir::PolyTraitRef<'tcx>) {`
`1113`	`1109`	`debug!("visit_poly_trait_ref(trait_ref={:?})", trait_ref);`
`1114`	`1110`
`1115`	`1111`	`let (mut binders, scope_type) = self.poly_trait_ref_binder_info();`
Original file line number	Diff line number	Diff line change
`@@ -1346,16 +1346,12 @@ fn has_late_bound_regions<'tcx>(tcx: TyCtxt<'tcx>, node: Node<'tcx>) -> Option<S`
`1346`	`1346`	`}`
`1347`	`1347`	`}`
`1348`	`1348`
`1349`		`- fn visit_poly_trait_ref(`
`1350`		`- &mut self,`
`1351`		`- tr: &'tcx hir::PolyTraitRef<'tcx>,`
`1352`		`- m: hir::TraitBoundModifier,`
`1353`		`- ) {`
	`1349`	`+ fn visit_poly_trait_ref(&mut self, tr: &'tcx hir::PolyTraitRef<'tcx>) {`
`1354`	`1350`	`if self.has_late_bound_regions.is_some() {`
`1355`	`1351`	`return;`
`1356`	`1352`	`}`
`1357`	`1353`	`self.outer_index.shift_in(1);`
`1358`		`- intravisit::walk_poly_trait_ref(self, tr, m);`
	`1354`	`+ intravisit::walk_poly_trait_ref(self, tr);`
`1359`	`1355`	`self.outer_index.shift_out(1);`
`1360`	`1356`	`}`
`1361`	`1357`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ use clippy_utils::diagnostics::span_lint_and_then;`
`2`	`2`
`3`	`3`	`use rustc_data_structures::fx::FxHashMap;`
`4`	`4`	`use rustc_hir::{`
`5`		`- def::Res, def_id::DefId, Item, ItemKind, PolyTraitRef, PrimTy, TraitBoundModifier, Ty, TyKind, UseKind,`
	`5`	`+ def::Res, def_id::DefId, Item, ItemKind, PolyTraitRef, PrimTy, Ty, TyKind, UseKind,`
`6`	`6`	`};`
`7`	`7`	`use rustc_lint::{LateContext, LateLintPass};`
`8`	`8`	`use rustc_session::{declare_tool_lint, impl_lint_pass};`
`@@ -120,7 +120,7 @@ impl<'tcx> LateLintPass<'tcx> for DisallowedTypes {`
`120`	`120`	`}`
`121`	`121`	`}`
`122`	`122`
`123`		`- fn check_poly_trait_ref(&mut self, cx: &LateContext<'tcx>, poly: &'tcx PolyTraitRef<'tcx>, _: TraitBoundModifier) {`
	`123`	`+ fn check_poly_trait_ref(&mut self, cx: &LateContext<'tcx>, poly: &'tcx PolyTraitRef<'tcx>) {`
`124`	`124`	`self.check_res_emit(cx, &poly.trait_ref.path.res, poly.trait_ref.path.span);`
`125`	`125`	`}`
`126`	`126`	`}`