bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir-def/src/expr_store.rs')
-rw-r--r--crates/hir-def/src/expr_store.rs40
1 files changed, 24 insertions, 16 deletions
diff --git a/crates/hir-def/src/expr_store.rs b/crates/hir-def/src/expr_store.rs
index 6ec78235fe..dec911f716 100644
--- a/crates/hir-def/src/expr_store.rs
+++ b/crates/hir-def/src/expr_store.rs
@@ -947,7 +947,7 @@ impl ExpressionStore {
}
}
-pub trait StoreVisitor {
+pub trait StoreVisitor: Sized {
fn on_expr(&mut self, expr: ExprId) {
let _ = expr;
}
@@ -963,6 +963,26 @@ pub trait StoreVisitor {
fn on_lifetime(&mut self, lifetime: LifetimeRefId) {
let _ = lifetime;
}
+
+ fn on_generic_args(&mut self, args: &GenericArgs) {
+ visit_generic_args(self, args);
+ }
+}
+
+pub(crate) fn visit_generic_args<V: StoreVisitor>(visitor: &mut V, args: &GenericArgs) {
+ let GenericArgs { args, bindings, parenthesized: _, has_self_type: _ } = args;
+ for arg in args {
+ match arg {
+ GenericArg::Type(arg) => visitor.on_type(*arg),
+ GenericArg::Const(ConstRef { expr }) => visitor.on_anon_const_expr(*expr),
+ GenericArg::Lifetime(arg) => visitor.on_lifetime(*arg),
+ }
+ }
+ for AssociatedTypeBinding { name: _, args, type_ref, bounds } in bindings {
+ visitor.on_generic_args_opt(args);
+ visitor.on_type_opt(*type_ref);
+ visitor.on_type_bounds(bounds);
+ }
}
impl<V: StoreVisitor> StoreVisitor for &mut V {
@@ -981,25 +1001,13 @@ impl<V: StoreVisitor> StoreVisitor for &mut V {
fn on_lifetime(&mut self, lifetime: LifetimeRefId) {
V::on_lifetime(self, lifetime);
}
-}
-trait StoreVisitorExt: StoreVisitor {
fn on_generic_args(&mut self, args: &GenericArgs) {
- let GenericArgs { args, bindings, parenthesized: _, has_self_type: _ } = args;
- for arg in args {
- match arg {
- GenericArg::Type(arg) => self.on_type(*arg),
- GenericArg::Const(ConstRef { expr }) => self.on_anon_const_expr(*expr),
- GenericArg::Lifetime(arg) => self.on_lifetime(*arg),
- }
- }
- for AssociatedTypeBinding { name: _, args, type_ref, bounds } in bindings {
- self.on_generic_args_opt(args);
- self.on_type_opt(*type_ref);
- self.on_type_bounds(bounds);
- }
+ V::on_generic_args(self, args);
}
+}
+trait StoreVisitorExt: StoreVisitor {
fn on_type_bound(&mut self, bound: &TypeBound) {
match bound {
TypeBound::Path(path_id, _) => self.on_type(path_id.type_ref()),