diff options
Diffstat (limited to 'crates/ra_hir_def/src/body')
-rw-r--r-- | crates/ra_hir_def/src/body/lower.rs | 6 | ||||
-rw-r--r-- | crates/ra_hir_def/src/body/scope.rs | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/crates/ra_hir_def/src/body/lower.rs b/crates/ra_hir_def/src/body/lower.rs index 6238de606..e8c58ed32 100644 --- a/crates/ra_hir_def/src/body/lower.rs +++ b/crates/ra_hir_def/src/body/lower.rs | |||
@@ -24,8 +24,8 @@ use crate::{ | |||
24 | builtin_type::{BuiltinFloat, BuiltinInt}, | 24 | builtin_type::{BuiltinFloat, BuiltinInt}, |
25 | db::DefDatabase, | 25 | db::DefDatabase, |
26 | expr::{ | 26 | expr::{ |
27 | ArithOp, Array, BinaryOp, BindingAnnotation, CmpOp, Expr, ExprId, Literal, LogicOp, | 27 | dummy_expr_id, ArithOp, Array, BinaryOp, BindingAnnotation, CmpOp, Expr, ExprId, Literal, |
28 | MatchArm, Ordering, Pat, PatId, RecordFieldPat, RecordLitField, Statement, | 28 | LogicOp, MatchArm, Ordering, Pat, PatId, RecordFieldPat, RecordLitField, Statement, |
29 | }, | 29 | }, |
30 | item_scope::BuiltinShadowMode, | 30 | item_scope::BuiltinShadowMode, |
31 | path::GenericArgs, | 31 | path::GenericArgs, |
@@ -51,7 +51,7 @@ pub(super) fn lower( | |||
51 | exprs: Arena::default(), | 51 | exprs: Arena::default(), |
52 | pats: Arena::default(), | 52 | pats: Arena::default(), |
53 | params: Vec::new(), | 53 | params: Vec::new(), |
54 | body_expr: ExprId::dummy(), | 54 | body_expr: dummy_expr_id(), |
55 | item_scope: Default::default(), | 55 | item_scope: Default::default(), |
56 | }, | 56 | }, |
57 | } | 57 | } |
diff --git a/crates/ra_hir_def/src/body/scope.rs b/crates/ra_hir_def/src/body/scope.rs index 7c3db8869..4d489f692 100644 --- a/crates/ra_hir_def/src/body/scope.rs +++ b/crates/ra_hir_def/src/body/scope.rs | |||
@@ -2,7 +2,7 @@ | |||
2 | use std::sync::Arc; | 2 | use std::sync::Arc; |
3 | 3 | ||
4 | use hir_expand::name::Name; | 4 | use hir_expand::name::Name; |
5 | use ra_arena::{impl_arena_id, Arena, RawId}; | 5 | use ra_arena::{Arena, Idx}; |
6 | use rustc_hash::FxHashMap; | 6 | use rustc_hash::FxHashMap; |
7 | 7 | ||
8 | use crate::{ | 8 | use crate::{ |
@@ -12,13 +12,11 @@ use crate::{ | |||
12 | DefWithBodyId, | 12 | DefWithBodyId, |
13 | }; | 13 | }; |
14 | 14 | ||
15 | #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] | 15 | pub type ScopeId = Idx<ScopeData>; |
16 | pub struct ScopeId(RawId); | ||
17 | impl_arena_id!(ScopeId); | ||
18 | 16 | ||
19 | #[derive(Debug, PartialEq, Eq)] | 17 | #[derive(Debug, PartialEq, Eq)] |
20 | pub struct ExprScopes { | 18 | pub struct ExprScopes { |
21 | scopes: Arena<ScopeId, ScopeData>, | 19 | scopes: Arena<ScopeData>, |
22 | scope_by_expr: FxHashMap<ExprId, ScopeId>, | 20 | scope_by_expr: FxHashMap<ExprId, ScopeId>, |
23 | } | 21 | } |
24 | 22 | ||