diff options
author | Aleksey Kladov <[email protected]> | 2020-03-25 14:33:01 +0000 |
---|---|---|
committer | Jonas Schievink <[email protected]> | 2020-06-24 15:52:37 +0100 |
commit | 1d75d11d6cbd8a2d4605fd185237ec2747b0687f (patch) | |
tree | 4cd2db564113d58c9c32d73b80b31964f2bdd3f9 /crates/ra_hir_def/src/body/lower.rs | |
parent | 1a3b507a007d0373a83bde203d780b860ea55ce1 (diff) |
Start item tree
Diffstat (limited to 'crates/ra_hir_def/src/body/lower.rs')
-rw-r--r-- | crates/ra_hir_def/src/body/lower.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/crates/ra_hir_def/src/body/lower.rs b/crates/ra_hir_def/src/body/lower.rs index f159f80af..113ec2b78 100644 --- a/crates/ra_hir_def/src/body/lower.rs +++ b/crates/ra_hir_def/src/body/lower.rs | |||
@@ -3,6 +3,7 @@ | |||
3 | 3 | ||
4 | use either::Either; | 4 | use either::Either; |
5 | use hir_expand::{ | 5 | use hir_expand::{ |
6 | db::AstDatabase, | ||
6 | hygiene::Hygiene, | 7 | hygiene::Hygiene, |
7 | name::{name, AsName, Name}, | 8 | name::{name, AsName, Name}, |
8 | HirFileId, MacroDefId, MacroDefKind, | 9 | HirFileId, MacroDefId, MacroDefKind, |
@@ -41,8 +42,8 @@ pub(crate) struct LowerCtx { | |||
41 | } | 42 | } |
42 | 43 | ||
43 | impl LowerCtx { | 44 | impl LowerCtx { |
44 | pub fn new(db: &dyn DefDatabase, file_id: HirFileId) -> Self { | 45 | pub fn new(db: &dyn AstDatabase, file_id: HirFileId) -> Self { |
45 | LowerCtx { hygiene: Hygiene::new(db.upcast(), file_id) } | 46 | LowerCtx { hygiene: Hygiene::new(db, file_id) } |
46 | } | 47 | } |
47 | pub fn with_hygiene(hygiene: &Hygiene) -> Self { | 48 | pub fn with_hygiene(hygiene: &Hygiene) -> Self { |
48 | LowerCtx { hygiene: hygiene.clone() } | 49 | LowerCtx { hygiene: hygiene.clone() } |
@@ -119,7 +120,7 @@ impl ExprCollector<'_> { | |||
119 | } | 120 | } |
120 | 121 | ||
121 | fn ctx(&self) -> LowerCtx { | 122 | fn ctx(&self) -> LowerCtx { |
122 | LowerCtx::new(self.db, self.expander.current_file_id) | 123 | LowerCtx::new(self.db.upcast(), self.expander.current_file_id) |
123 | } | 124 | } |
124 | 125 | ||
125 | fn alloc_expr(&mut self, expr: Expr, ptr: AstPtr<ast::Expr>) -> ExprId { | 126 | fn alloc_expr(&mut self, expr: Expr, ptr: AstPtr<ast::Expr>) -> ExprId { |