diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-08-12 17:31:42 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-08-12 17:31:42 +0100 |
commit | d583f2c46d22cf8d643ebf98be9cb7059a304431 (patch) | |
tree | 9d898eb9600b0c36a74e4f95238f679c683fa566 /crates/ra_hir_def/src/body | |
parent | 3d6889cba72a9d02199f7adaa2ecc69bc30af834 (diff) | |
parent | a1c187eef3ba08076aedb5154929f7eda8d1b424 (diff) |
Merge #5729
5729: Rename ra_syntax -> syntax
r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir_def/src/body')
-rw-r--r-- | crates/ra_hir_def/src/body/lower.rs | 4 | ||||
-rw-r--r-- | crates/ra_hir_def/src/body/scope.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir_def/src/body/lower.rs b/crates/ra_hir_def/src/body/lower.rs index 482393006..a26251cde 100644 --- a/crates/ra_hir_def/src/body/lower.rs +++ b/crates/ra_hir_def/src/body/lower.rs | |||
@@ -10,14 +10,14 @@ use hir_expand::{ | |||
10 | name::{name, AsName, Name}, | 10 | name::{name, AsName, Name}, |
11 | HirFileId, MacroDefId, MacroDefKind, | 11 | HirFileId, MacroDefId, MacroDefKind, |
12 | }; | 12 | }; |
13 | use ra_syntax::{ | 13 | use rustc_hash::FxHashMap; |
14 | use syntax::{ | ||
14 | ast::{ | 15 | ast::{ |
15 | self, ArgListOwner, ArrayExprKind, AstChildren, LiteralKind, LoopBodyOwner, NameOwner, | 16 | self, ArgListOwner, ArrayExprKind, AstChildren, LiteralKind, LoopBodyOwner, NameOwner, |
16 | SlicePatComponents, | 17 | SlicePatComponents, |
17 | }, | 18 | }, |
18 | AstNode, AstPtr, | 19 | AstNode, AstPtr, |
19 | }; | 20 | }; |
20 | use rustc_hash::FxHashMap; | ||
21 | use test_utils::mark; | 21 | use test_utils::mark; |
22 | 22 | ||
23 | use crate::{ | 23 | use crate::{ |
diff --git a/crates/ra_hir_def/src/body/scope.rs b/crates/ra_hir_def/src/body/scope.rs index f783e18b5..079f14c29 100644 --- a/crates/ra_hir_def/src/body/scope.rs +++ b/crates/ra_hir_def/src/body/scope.rs | |||
@@ -171,7 +171,7 @@ fn compute_expr_scopes(expr: ExprId, body: &Body, scopes: &mut ExprScopes, scope | |||
171 | mod tests { | 171 | mod tests { |
172 | use hir_expand::{name::AsName, InFile}; | 172 | use hir_expand::{name::AsName, InFile}; |
173 | use ra_db::{fixture::WithFixture, FileId, SourceDatabase}; | 173 | use ra_db::{fixture::WithFixture, FileId, SourceDatabase}; |
174 | use ra_syntax::{algo::find_node_at_offset, ast, AstNode}; | 174 | use syntax::{algo::find_node_at_offset, ast, AstNode}; |
175 | use test_utils::{assert_eq_text, extract_offset, mark}; | 175 | use test_utils::{assert_eq_text, extract_offset, mark}; |
176 | 176 | ||
177 | use crate::{db::DefDatabase, test_db::TestDB, FunctionId, ModuleDefId}; | 177 | use crate::{db::DefDatabase, test_db::TestDB, FunctionId, ModuleDefId}; |