diff options
Diffstat (limited to 'crates/ra_hir_def')
-rw-r--r-- | crates/ra_hir_def/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ra_hir_def/src/adt.rs | 2 | ||||
-rw-r--r-- | crates/ra_hir_def/src/attr.rs | 2 | ||||
-rw-r--r-- | crates/ra_hir_def/src/body.rs | 2 | ||||
-rw-r--r-- | crates/ra_hir_def/src/nameres/collector.rs | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/crates/ra_hir_def/Cargo.toml b/crates/ra_hir_def/Cargo.toml index ba7916c30..e7d3c4d5b 100644 --- a/crates/ra_hir_def/Cargo.toml +++ b/crates/ra_hir_def/Cargo.toml | |||
@@ -29,7 +29,7 @@ profile = { path = "../profile" } | |||
29 | hir_expand = { path = "../ra_hir_expand", package = "ra_hir_expand" } | 29 | hir_expand = { path = "../ra_hir_expand", package = "ra_hir_expand" } |
30 | test_utils = { path = "../test_utils" } | 30 | test_utils = { path = "../test_utils" } |
31 | mbe = { path = "../mbe" } | 31 | mbe = { path = "../mbe" } |
32 | ra_cfg = { path = "../ra_cfg" } | 32 | cfg = { path = "../cfg" } |
33 | tt = { path = "../tt" } | 33 | tt = { path = "../tt" } |
34 | 34 | ||
35 | [dev-dependencies] | 35 | [dev-dependencies] |
diff --git a/crates/ra_hir_def/src/adt.rs b/crates/ra_hir_def/src/adt.rs index c83219d77..d69ff2fc7 100644 --- a/crates/ra_hir_def/src/adt.rs +++ b/crates/ra_hir_def/src/adt.rs | |||
@@ -23,7 +23,7 @@ use crate::{ | |||
23 | EnumId, HasModule, LocalEnumVariantId, LocalFieldId, Lookup, ModuleId, StructId, UnionId, | 23 | EnumId, HasModule, LocalEnumVariantId, LocalFieldId, Lookup, ModuleId, StructId, UnionId, |
24 | VariantId, | 24 | VariantId, |
25 | }; | 25 | }; |
26 | use ra_cfg::CfgOptions; | 26 | use cfg::CfgOptions; |
27 | 27 | ||
28 | /// Note that we use `StructData` for unions as well! | 28 | /// Note that we use `StructData` for unions as well! |
29 | #[derive(Debug, Clone, PartialEq, Eq)] | 29 | #[derive(Debug, Clone, PartialEq, Eq)] |
diff --git a/crates/ra_hir_def/src/attr.rs b/crates/ra_hir_def/src/attr.rs index 36dc8b816..1e5b06ca0 100644 --- a/crates/ra_hir_def/src/attr.rs +++ b/crates/ra_hir_def/src/attr.rs | |||
@@ -5,7 +5,7 @@ use std::{ops, sync::Arc}; | |||
5 | use either::Either; | 5 | use either::Either; |
6 | use hir_expand::{hygiene::Hygiene, AstId, InFile}; | 6 | use hir_expand::{hygiene::Hygiene, AstId, InFile}; |
7 | use mbe::ast_to_token_tree; | 7 | use mbe::ast_to_token_tree; |
8 | use ra_cfg::{CfgExpr, CfgOptions}; | 8 | use cfg::{CfgExpr, CfgOptions}; |
9 | use syntax::{ | 9 | use syntax::{ |
10 | ast::{self, AstNode, AttrsOwner}, | 10 | ast::{self, AstNode, AttrsOwner}, |
11 | SmolStr, | 11 | SmolStr, |
diff --git a/crates/ra_hir_def/src/body.rs b/crates/ra_hir_def/src/body.rs index 7c33966a7..3568513d1 100644 --- a/crates/ra_hir_def/src/body.rs +++ b/crates/ra_hir_def/src/body.rs | |||
@@ -9,7 +9,7 @@ use arena::{map::ArenaMap, Arena}; | |||
9 | use drop_bomb::DropBomb; | 9 | use drop_bomb::DropBomb; |
10 | use either::Either; | 10 | use either::Either; |
11 | use hir_expand::{ast_id_map::AstIdMap, hygiene::Hygiene, AstId, HirFileId, InFile, MacroDefId}; | 11 | use hir_expand::{ast_id_map::AstIdMap, hygiene::Hygiene, AstId, HirFileId, InFile, MacroDefId}; |
12 | use ra_cfg::CfgOptions; | 12 | use cfg::CfgOptions; |
13 | use ra_db::CrateId; | 13 | use ra_db::CrateId; |
14 | use rustc_hash::FxHashMap; | 14 | use rustc_hash::FxHashMap; |
15 | use syntax::{ast, AstNode, AstPtr}; | 15 | use syntax::{ast, AstNode, AstPtr}; |
diff --git a/crates/ra_hir_def/src/nameres/collector.rs b/crates/ra_hir_def/src/nameres/collector.rs index f7270ec91..fa2dadfc5 100644 --- a/crates/ra_hir_def/src/nameres/collector.rs +++ b/crates/ra_hir_def/src/nameres/collector.rs | |||
@@ -11,7 +11,7 @@ use hir_expand::{ | |||
11 | proc_macro::ProcMacroExpander, | 11 | proc_macro::ProcMacroExpander, |
12 | HirFileId, MacroCallId, MacroDefId, MacroDefKind, | 12 | HirFileId, MacroCallId, MacroDefId, MacroDefKind, |
13 | }; | 13 | }; |
14 | use ra_cfg::CfgOptions; | 14 | use cfg::CfgOptions; |
15 | use ra_db::{CrateId, FileId, ProcMacroId}; | 15 | use ra_db::{CrateId, FileId, ProcMacroId}; |
16 | use rustc_hash::FxHashMap; | 16 | use rustc_hash::FxHashMap; |
17 | use syntax::ast; | 17 | use syntax::ast; |