Skip to content

Commit 7e3fd33

Browse files
nnethercotennethercote
committed
Remove unused argument from visit_poly_trait_ref.
1 parent 9ec5bda commit 7e3fd33

File tree

8 files changed

+21
-37
lines changed

8 files changed

+21
-37
lines changed

‎compiler/rustc_hir/src/intravisit.rs

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -388,8 +388,8 @@ pub trait Visitor<'v>: Sized {
388388
fn visit_param_bound(&mut self, bounds: &'v GenericBound<'v>) {
389389
walk_param_bound(self, bounds)
390390
}
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)
393393
}
394394
fn visit_variant_data(&mut self, s: &'v VariantData<'v>) {
395395
walk_struct_def(self, s)
@@ -495,11 +495,7 @@ pub fn walk_lifetime<'v, V: Visitor<'v>>(visitor: &mut V, lifetime: &'v Lifetime
495495
}
496496
}
497497

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>) {
503499
walk_list!(visitor, visit_generic_param, trait_ref.bound_generic_params);
504500
visitor.visit_trait_ref(&trait_ref.trait_ref);
505501
}
@@ -681,7 +677,7 @@ pub fn walk_ty<'v, V: Visitor<'v>>(visitor: &mut V, typ: &'v Ty<'v>) {
681677
}
682678
TyKind::TraitObject(bounds, ref lifetime, _syntax) => {
683679
for bound in bounds {
684-
visitor.visit_poly_trait_ref(bound, TraitBoundModifier::None);
680+
visitor.visit_poly_trait_ref(bound);
685681
}
686682
visitor.visit_lifetime(lifetime);
687683
}
@@ -807,8 +803,8 @@ pub fn walk_foreign_item<'v, V: Visitor<'v>>(visitor: &mut V, foreign_item: &'v
807803

808804
pub fn walk_param_bound<'v, V: Visitor<'v>>(visitor: &mut V, bound: &'v GenericBound<'v>) {
809805
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);
812808
}
813809
GenericBound::LangItemTrait(_, _span, hir_id, args) => {
814810
visitor.visit_id(hir_id);

‎compiler/rustc_infer/src/infer/error_reporting/nice_region_error/find_anon_type.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ impl<'tcx> Visitor<'tcx> for FindNestedTypeVisitor<'tcx> {
9191
hir::TyKind::TraitObject(bounds, ..) => {
9292
for bound in bounds {
9393
self.current_index.shift_in(1);
94-
self.visit_poly_trait_ref(bound, hir::TraitBoundModifier::None);
94+
self.visit_poly_trait_ref(bound);
9595
self.current_index.shift_out(1);
9696
}
9797
}

‎compiler/rustc_lint/src/late.rs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -258,13 +258,9 @@ impl<'tcx, T: LateLintPass<'tcx>> hir_visit::Visitor<'tcx> for LateContextAndPas
258258
hir_visit::walk_where_predicate(self, p);
259259
}
260260

261-
fn visit_poly_trait_ref(
262-
&mut self,
263-
t: &'tcx hir::PolyTraitRef<'tcx>,
264-
m: hir::TraitBoundModifier,
265-
) {
266-
lint_callback!(self, check_poly_trait_ref, t, m);
267-
hir_visit::walk_poly_trait_ref(self, t, m);
261+
fn visit_poly_trait_ref(&mut self, t: &'tcx hir::PolyTraitRef<'tcx>) {
262+
lint_callback!(self, check_poly_trait_ref, t);
263+
hir_visit::walk_poly_trait_ref(self, t);
268264
}
269265

270266
fn visit_trait_item(&mut self, trait_item: &'tcx hir::TraitItem<'tcx>) {

‎compiler/rustc_lint/src/passes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ macro_rules! late_lint_methods {
3131
fn check_ty(a: &$hir hir::Ty<$hir>);
3232
fn check_generic_param(a: &$hir hir::GenericParam<$hir>);
3333
fn check_generics(a: &$hir hir::Generics<$hir>);
34-
fn check_poly_trait_ref(a: &$hir hir::PolyTraitRef<$hir>, b: hir::TraitBoundModifier);
34+
fn check_poly_trait_ref(a: &$hir hir::PolyTraitRef<$hir>);
3535
fn check_fn(
3636
a: rustc_hir::intravisit::FnKind<$hir>,
3737
b: &$hir hir::FnDecl<$hir>,

‎compiler/rustc_resolve/src/late/lifetimes.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -682,7 +682,7 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
682682
let scope = Scope::TraitRefBoundary { s: self.scope };
683683
self.with(scope, |this| {
684684
for bound in bounds {
685-
this.visit_poly_trait_ref(bound, hir::TraitBoundModifier::None);
685+
this.visit_poly_trait_ref(bound);
686686
}
687687
});
688688
match lifetime.name {
@@ -1105,11 +1105,7 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
11051105
}
11061106
}
11071107

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>) {
11131109
debug!("visit_poly_trait_ref(trait_ref={:?})", trait_ref);
11141110

11151111
let (mut binders, scope_type) = self.poly_trait_ref_binder_info();

‎compiler/rustc_typeck/src/collect.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1346,16 +1346,12 @@ fn has_late_bound_regions<'tcx>(tcx: TyCtxt<'tcx>, node: Node<'tcx>) -> Option<S
13461346
}
13471347
}
13481348

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>) {
13541350
if self.has_late_bound_regions.is_some() {
13551351
return;
13561352
}
13571353
self.outer_index.shift_in(1);
1358-
intravisit::walk_poly_trait_ref(self, tr, m);
1354+
intravisit::walk_poly_trait_ref(self, tr);
13591355
self.outer_index.shift_out(1);
13601356
}
13611357

‎src/tools/clippy/clippy_lints/src/disallowed_types.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use clippy_utils::diagnostics::span_lint_and_then;
22

33
use rustc_data_structures::fx::FxHashMap;
44
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,
66
};
77
use rustc_lint::{LateContext, LateLintPass};
88
use rustc_session::{declare_tool_lint, impl_lint_pass};
@@ -120,7 +120,7 @@ impl<'tcx> LateLintPass<'tcx> for DisallowedTypes {
120120
}
121121
}
122122

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>) {
124124
self.check_res_emit(cx, &poly.trait_ref.path.res, poly.trait_ref.path.span);
125125
}
126126
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use rustc_hir::FnRetTy::Return;
1010
use rustc_hir::{
1111
BareFnTy, BodyId, FnDecl, GenericArg, GenericBound, GenericParam, GenericParamKind, Generics, Impl, ImplItem,
1212
ImplItemKind, Item, ItemKind, LangItem, Lifetime, LifetimeName, ParamName, PolyTraitRef, PredicateOrigin,
13-
TraitBoundModifier, TraitFn, TraitItem, TraitItemKind, Ty, TyKind, WherePredicate,
13+
TraitFn, TraitItem, TraitItemKind, Ty, TyKind, WherePredicate,
1414
};
1515
use rustc_lint::{LateContext, LateLintPass};
1616
use rustc_middle::hir::nested_filter as middle_nested_filter;
@@ -422,7 +422,7 @@ impl<'a, 'tcx> Visitor<'tcx> for RefVisitor<'a, 'tcx> {
422422
self.record(&Some(*lifetime));
423423
}
424424

425-
fn visit_poly_trait_ref(&mut self, poly_tref: &'tcx PolyTraitRef<'tcx>, tbm: TraitBoundModifier) {
425+
fn visit_poly_trait_ref(&mut self, poly_tref: &'tcx PolyTraitRef<'tcx>) {
426426
let trait_ref = &poly_tref.trait_ref;
427427
if CLOSURE_TRAIT_BOUNDS.iter().any(|&item| {
428428
self.cx
@@ -435,7 +435,7 @@ impl<'a, 'tcx> Visitor<'tcx> for RefVisitor<'a, 'tcx> {
435435
sub_visitor.visit_trait_ref(trait_ref);
436436
self.nested_elision_site_lts.append(&mut sub_visitor.all_lts());
437437
} else {
438-
walk_poly_trait_ref(self, poly_tref, tbm);
438+
walk_poly_trait_ref(self, poly_tref);
439439
}
440440
}
441441

@@ -466,7 +466,7 @@ impl<'a, 'tcx> Visitor<'tcx> for RefVisitor<'a, 'tcx> {
466466
self.unelided_trait_object_lifetime = true;
467467
}
468468
for bound in bounds {
469-
self.visit_poly_trait_ref(bound, TraitBoundModifier::None);
469+
self.visit_poly_trait_ref(bound);
470470
}
471471
},
472472
_ => walk_ty(self, ty),

0 commit comments

Comments
 (0)