aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_hir')
-rw-r--r--crates/ra_hir/Cargo.toml2
-rw-r--r--crates/ra_hir/src/code_model.rs6
-rw-r--r--crates/ra_hir/src/has_source.rs2
-rw-r--r--crates/ra_hir/src/semantics.rs4
-rw-r--r--crates/ra_hir/src/semantics/source_to_def.rs6
-rw-r--r--crates/ra_hir/src/source_analyzer.rs2
6 files changed, 11 insertions, 11 deletions
diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml
index 903406e84..ee5622a7d 100644
--- a/crates/ra_hir/Cargo.toml
+++ b/crates/ra_hir/Cargo.toml
@@ -17,7 +17,7 @@ arrayvec = "0.5.1"
17itertools = "0.9.0" 17itertools = "0.9.0"
18 18
19stdx = { path = "../stdx" } 19stdx = { path = "../stdx" }
20ra_syntax = { path = "../ra_syntax" } 20syntax = { path = "../syntax" }
21ra_db = { path = "../ra_db" } 21ra_db = { path = "../ra_db" }
22profile = { path = "../profile" } 22profile = { path = "../profile" }
23hir_expand = { path = "../ra_hir_expand", package = "ra_hir_expand" } 23hir_expand = { path = "../ra_hir_expand", package = "ra_hir_expand" }
diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs
index 5c0c6184a..98724c146 100644
--- a/crates/ra_hir/src/code_model.rs
+++ b/crates/ra_hir/src/code_model.rs
@@ -31,12 +31,12 @@ use hir_ty::{
31 InEnvironment, Substs, TraitEnvironment, Ty, TyDefId, TypeCtor, 31 InEnvironment, Substs, TraitEnvironment, Ty, TyDefId, TypeCtor,
32}; 32};
33use ra_db::{CrateId, Edition, FileId}; 33use ra_db::{CrateId, Edition, FileId};
34use ra_syntax::{ 34use rustc_hash::FxHashSet;
35use stdx::impl_from;
36use syntax::{
35 ast::{self, AttrsOwner, NameOwner}, 37 ast::{self, AttrsOwner, NameOwner},
36 AstNode, 38 AstNode,
37}; 39};
38use rustc_hash::FxHashSet;
39use stdx::impl_from;
40 40
41use crate::{ 41use crate::{
42 db::{DefDatabase, HirDatabase}, 42 db::{DefDatabase, HirDatabase},
diff --git a/crates/ra_hir/src/has_source.rs b/crates/ra_hir/src/has_source.rs
index 1c691d961..a50d4ff02 100644
--- a/crates/ra_hir/src/has_source.rs
+++ b/crates/ra_hir/src/has_source.rs
@@ -6,7 +6,7 @@ use hir_def::{
6 src::{HasChildSource, HasSource as _}, 6 src::{HasChildSource, HasSource as _},
7 Lookup, VariantId, 7 Lookup, VariantId,
8}; 8};
9use ra_syntax::ast; 9use syntax::ast;
10 10
11use crate::{ 11use crate::{
12 db::HirDatabase, Const, Enum, EnumVariant, Field, FieldSource, Function, ImplDef, MacroDef, 12 db::HirDatabase, Const, Enum, EnumVariant, Field, FieldSource, Function, ImplDef, MacroDef,
diff --git a/crates/ra_hir/src/semantics.rs b/crates/ra_hir/src/semantics.rs
index 7e3ec6315..2e0ef4408 100644
--- a/crates/ra_hir/src/semantics.rs
+++ b/crates/ra_hir/src/semantics.rs
@@ -12,11 +12,11 @@ use hir_expand::{hygiene::Hygiene, name::AsName, ExpansionInfo};
12use hir_ty::associated_type_shorthand_candidates; 12use hir_ty::associated_type_shorthand_candidates;
13use itertools::Itertools; 13use itertools::Itertools;
14use ra_db::{FileId, FileRange}; 14use ra_db::{FileId, FileRange};
15use ra_syntax::{ 15use rustc_hash::{FxHashMap, FxHashSet};
16use syntax::{
16 algo::{find_node_at_offset, skip_trivia_token}, 17 algo::{find_node_at_offset, skip_trivia_token},
17 ast, AstNode, Direction, SyntaxNode, SyntaxToken, TextRange, TextSize, 18 ast, AstNode, Direction, SyntaxNode, SyntaxToken, TextRange, TextSize,
18}; 19};
19use rustc_hash::{FxHashMap, FxHashSet};
20 20
21use crate::{ 21use crate::{
22 db::HirDatabase, 22 db::HirDatabase,
diff --git a/crates/ra_hir/src/semantics/source_to_def.rs b/crates/ra_hir/src/semantics/source_to_def.rs
index a6ff8b0bf..ab2fd0957 100644
--- a/crates/ra_hir/src/semantics/source_to_def.rs
+++ b/crates/ra_hir/src/semantics/source_to_def.rs
@@ -10,12 +10,12 @@ use hir_def::{
10}; 10};
11use hir_expand::{name::AsName, AstId, MacroDefKind}; 11use hir_expand::{name::AsName, AstId, MacroDefKind};
12use ra_db::FileId; 12use ra_db::FileId;
13use ra_syntax::{ 13use rustc_hash::FxHashMap;
14use stdx::impl_from;
15use syntax::{
14 ast::{self, NameOwner}, 16 ast::{self, NameOwner},
15 match_ast, AstNode, SyntaxNode, 17 match_ast, AstNode, SyntaxNode,
16}; 18};
17use rustc_hash::FxHashMap;
18use stdx::impl_from;
19 19
20use crate::{db::HirDatabase, InFile, MacroDefId}; 20use crate::{db::HirDatabase, InFile, MacroDefId};
21 21
diff --git a/crates/ra_hir/src/source_analyzer.rs b/crates/ra_hir/src/source_analyzer.rs
index d3d62debf..6b2de3a06 100644
--- a/crates/ra_hir/src/source_analyzer.rs
+++ b/crates/ra_hir/src/source_analyzer.rs
@@ -21,7 +21,7 @@ use hir_ty::{
21 diagnostics::{record_literal_missing_fields, record_pattern_missing_fields}, 21 diagnostics::{record_literal_missing_fields, record_pattern_missing_fields},
22 InferenceResult, Substs, Ty, 22 InferenceResult, Substs, Ty,
23}; 23};
24use ra_syntax::{ 24use syntax::{
25 ast::{self, AstNode}, 25 ast::{self, AstNode},
26 SyntaxNode, TextRange, TextSize, 26 SyntaxNode, TextRange, TextSize,
27}; 27};