about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-11-22 19:07:05 +0000
committerbors <bors@rust-lang.org>2022-11-22 19:07:05 +0000
commitf6f6d542d5b99d515f33dde221dc91c1c151573c (patch)
tree950f260a0c2e3fba8d1bb37247d80c4c64cfbc34
parent5595d7f5d5168477172dd2c2a958d445eed61422 (diff)
parent2cda73f617028712c097124f8f38ace4660c066d (diff)
downloadrust-f6f6d542d5b99d515f33dde221dc91c1c151573c.tar.gz
rust-f6f6d542d5b99d515f33dde221dc91c1c151573c.zip
Auto merge of #9930 - smoelius:use-walk_generic_arg, r=Alexendoo
Use `walk_generic_arg`

This is a tiny followup to to #9743, now that https://github.com/rust-lang/rust/pull/103692 has landed.

r? `@Alexendoo`

changelog: none
-rw-r--r--clippy_lints/src/lifetimes.rs11
1 files changed, 2 insertions, 9 deletions
diff --git a/clippy_lints/src/lifetimes.rs b/clippy_lints/src/lifetimes.rs
index d9acaa99c6d..897428797e5 100644
--- a/clippy_lints/src/lifetimes.rs
+++ b/clippy_lints/src/lifetimes.rs
@@ -3,7 +3,7 @@ use clippy_utils::trait_ref_of_method;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_hir::intravisit::nested_filter::{self as hir_nested_filter, NestedFilter};
 use rustc_hir::intravisit::{
-    walk_fn_decl, walk_generic_param, walk_generics, walk_impl_item_ref, walk_item, walk_param_bound,
+    walk_fn_decl, walk_generic_arg, walk_generic_param, walk_generics, walk_impl_item_ref, walk_item, walk_param_bound,
     walk_poly_trait_ref, walk_trait_ref, walk_ty, Visitor,
 };
 use rustc_hir::lang_items;
@@ -503,14 +503,7 @@ impl<'a, 'tcx> Visitor<'tcx> for RefVisitor<'a, 'tcx> {
         {
             self.lifetime_generic_arg_spans.entry(def_id).or_insert(l.span);
         }
-        // Replace with `walk_generic_arg` if/when https://github.com/rust-lang/rust/pull/103692 lands.
-        // walk_generic_arg(self, generic_arg);
-        match generic_arg {
-            GenericArg::Lifetime(lt) => self.visit_lifetime(lt),
-            GenericArg::Type(ty) => self.visit_ty(ty),
-            GenericArg::Const(ct) => self.visit_anon_const(&ct.value),
-            GenericArg::Infer(inf) => self.visit_infer(inf),
-        }
+        walk_generic_arg(self, generic_arg);
     }
 }