diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-11-11 11:48:02 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-11-11 11:48:02 +0000 |
| commit | a599147b4232c0d4f6b071a3a96e86f903f4cf52 (patch) | |
| tree | fc8ddd1428c4be2babbdd713c852b31276a315f2 /crates/ra_hir/src/expr | |
| parent | ef2a9aedb6ac7f0b79e636cff7947935fecb909d (diff) | |
| parent | 8b7f853cc19d0940ec542e10bc23aa78455bbb3b (diff) | |
Merge #2200
2200: Add variables to HIR r=matklad a=matklad
Introduce a `hir::Variable`, which should cover locals, parameters and `self`. Unlike `PatId`, variable knows it's owner so it is self-contained, and should be more convenient to use from `ra_ide_api`.
The goal here is to hide more details about `Body` from hir, which should make it easier to move `Body` into `hir_def`. I don't think that `ra_ide_api` intrracts with bodies directly at the moment anyway, but the glue layer is based basically on `ast::BindPat`, which seems pretty brittle.
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/expr')
| -rw-r--r-- | crates/ra_hir/src/expr/scope.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_hir/src/expr/scope.rs b/crates/ra_hir/src/expr/scope.rs index 5a1eade2c..daf8d8d07 100644 --- a/crates/ra_hir/src/expr/scope.rs +++ b/crates/ra_hir/src/expr/scope.rs | |||
| @@ -17,7 +17,7 @@ impl_arena_id!(ScopeId); | |||
| 17 | 17 | ||
| 18 | #[derive(Debug, PartialEq, Eq)] | 18 | #[derive(Debug, PartialEq, Eq)] |
| 19 | pub struct ExprScopes { | 19 | pub struct ExprScopes { |
| 20 | body: Arc<Body>, | 20 | pub(crate) body: Arc<Body>, |
| 21 | scopes: Arena<ScopeId, ScopeData>, | 21 | scopes: Arena<ScopeId, ScopeData>, |
| 22 | scope_by_expr: FxHashMap<ExprId, ScopeId>, | 22 | scope_by_expr: FxHashMap<ExprId, ScopeId>, |
| 23 | } | 23 | } |