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.rs27
1 files changed, 20 insertions, 7 deletions
diff --git a/crates/hir-def/src/expr_store.rs b/crates/hir-def/src/expr_store.rs
index ca523622ec..497ed7d37f 100644
--- a/crates/hir-def/src/expr_store.rs
+++ b/crates/hir-def/src/expr_store.rs
@@ -520,7 +520,7 @@ impl ExpressionStore {
self.const_expr_origins().iter().map(|&(id, _)| id)
}
- /// Like [`Self::signature_const_expr_roots`], but also returns the origin
+ /// Like [`Self::expr_roots`], but also returns the origin
/// of each expression.
pub fn expr_roots_with_origins(&self) -> impl Iterator<Item = (ExprId, RootExprOrigin)> {
self.const_expr_origins().iter().map(|&(id, origin)| (id, origin))
@@ -642,9 +642,7 @@ impl ExpressionStore {
self.walk_exprs_in_pat(*pat, &mut f);
f(*expr);
}
- Expr::Block { statements, tail, .. }
- | Expr::Unsafe { statements, tail, .. }
- | Expr::Async { statements, tail, .. } => {
+ Expr::Block { statements, tail, .. } | Expr::Unsafe { statements, tail, .. } => {
for stmt in statements.iter() {
match stmt {
Statement::Let { initializer, else_branch, pat, .. } => {
@@ -677,6 +675,9 @@ impl ExpressionStore {
f(*expr);
arms.iter().for_each(|arm| {
f(arm.expr);
+ if let Some(guard) = arm.guard {
+ f(guard);
+ }
self.walk_exprs_in_pat(arm.pat, &mut f);
});
}
@@ -777,9 +778,7 @@ impl ExpressionStore {
Expr::Let { expr, .. } => {
f(*expr);
}
- Expr::Block { statements, tail, .. }
- | Expr::Unsafe { statements, tail, .. }
- | Expr::Async { statements, tail, .. } => {
+ Expr::Block { statements, tail, .. } | Expr::Unsafe { statements, tail, .. } => {
for stmt in statements.iter() {
match stmt {
Statement::Let { initializer, else_branch, .. } => {
@@ -923,6 +922,20 @@ impl ExpressionStore {
None => const { &Arena::new() }.iter(),
}
}
+
+ /// The coroutine associated with a coroutine closure.
+ #[inline]
+ pub fn coroutine_for_closure(coroutine_closure: ExprId) -> ExprId {
+ // We keep the async closure exactly one expr before.
+ ExprId::from_raw(la_arena::RawIdx::from_u32(coroutine_closure.into_raw().into_u32() - 1))
+ }
+
+ /// The opposite of [`Self::coroutine_for_closure()`].
+ #[inline]
+ pub fn closure_for_coroutine(coroutine: ExprId) -> ExprId {
+ // We keep the async closure exactly one expr before.
+ ExprId::from_raw(la_arena::RawIdx::from_u32(coroutine.into_raw().into_u32() + 1))
+ }
}
impl Index<ExprId> for ExpressionStore {