diff options
author | Aleksey Kladov <[email protected]> | 2019-10-30 15:06:08 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-10-30 15:06:08 +0000 |
commit | e34e71c62d9b4cf0ab237969e03ecde893ab347b (patch) | |
tree | 92b54891047977e6483e430a467d8e561ea3bc53 | |
parent | c1ed9ccc4ed7dfff3abb6eb01d7c311c8e31108c (diff) |
remove forward pointer for attrs
-rw-r--r-- | crates/ra_hir/src/attr.rs | 1 | ||||
-rw-r--r-- | crates/ra_hir/src/impl_block.rs | 3 | ||||
-rw-r--r-- | crates/ra_hir/src/lib.rs | 1 | ||||
-rw-r--r-- | crates/ra_hir/src/nameres/collector.rs | 3 |
4 files changed, 2 insertions, 6 deletions
diff --git a/crates/ra_hir/src/attr.rs b/crates/ra_hir/src/attr.rs deleted file mode 100644 index 988a671b8..000000000 --- a/crates/ra_hir/src/attr.rs +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | pub use hir_def::attr::*; | ||
diff --git a/crates/ra_hir/src/impl_block.rs b/crates/ra_hir/src/impl_block.rs index 8584686fd..518330713 100644 --- a/crates/ra_hir/src/impl_block.rs +++ b/crates/ra_hir/src/impl_block.rs | |||
@@ -3,7 +3,7 @@ | |||
3 | use rustc_hash::FxHashMap; | 3 | use rustc_hash::FxHashMap; |
4 | use std::sync::Arc; | 4 | use std::sync::Arc; |
5 | 5 | ||
6 | use hir_def::type_ref::TypeRef; | 6 | use hir_def::{attr::Attr, type_ref::TypeRef}; |
7 | use ra_arena::{impl_arena_id, map::ArenaMap, Arena, RawId}; | 7 | use ra_arena::{impl_arena_id, map::ArenaMap, Arena, RawId}; |
8 | use ra_cfg::CfgOptions; | 8 | use ra_cfg::CfgOptions; |
9 | use ra_syntax::{ | 9 | use ra_syntax::{ |
@@ -12,7 +12,6 @@ use ra_syntax::{ | |||
12 | }; | 12 | }; |
13 | 13 | ||
14 | use crate::{ | 14 | use crate::{ |
15 | attr::Attr, | ||
16 | code_model::{Module, ModuleSource}, | 15 | code_model::{Module, ModuleSource}, |
17 | db::{AstDatabase, DefDatabase, HirDatabase}, | 16 | db::{AstDatabase, DefDatabase, HirDatabase}, |
18 | generics::HasGenericParams, | 17 | generics::HasGenericParams, |
diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs index fabe6eff6..f765490b0 100644 --- a/crates/ra_hir/src/lib.rs +++ b/crates/ra_hir/src/lib.rs | |||
@@ -39,7 +39,6 @@ mod adt; | |||
39 | mod traits; | 39 | mod traits; |
40 | mod type_alias; | 40 | mod type_alias; |
41 | mod ty; | 41 | mod ty; |
42 | mod attr; | ||
43 | mod impl_block; | 42 | mod impl_block; |
44 | mod expr; | 43 | mod expr; |
45 | mod lang_item; | 44 | mod lang_item; |
diff --git a/crates/ra_hir/src/nameres/collector.rs b/crates/ra_hir/src/nameres/collector.rs index 1f3849dc7..2f342870b 100644 --- a/crates/ra_hir/src/nameres/collector.rs +++ b/crates/ra_hir/src/nameres/collector.rs | |||
@@ -1,6 +1,6 @@ | |||
1 | //! FIXME: write short doc here | 1 | //! FIXME: write short doc here |
2 | 2 | ||
3 | use hir_def::{name, nameres::raw}; | 3 | use hir_def::{attr::Attr, name, nameres::raw}; |
4 | use ra_cfg::CfgOptions; | 4 | use ra_cfg::CfgOptions; |
5 | use ra_db::FileId; | 5 | use ra_db::FileId; |
6 | use ra_syntax::{ast, SmolStr}; | 6 | use ra_syntax::{ast, SmolStr}; |
@@ -8,7 +8,6 @@ use rustc_hash::FxHashMap; | |||
8 | use test_utils::tested_by; | 8 | use test_utils::tested_by; |
9 | 9 | ||
10 | use crate::{ | 10 | use crate::{ |
11 | attr::Attr, | ||
12 | db::DefDatabase, | 11 | db::DefDatabase, |
13 | ids::{AstItemDef, LocationCtx, MacroCallId, MacroCallLoc, MacroDefId, MacroFileKind}, | 12 | ids::{AstItemDef, LocationCtx, MacroCallId, MacroCallLoc, MacroDefId, MacroFileKind}, |
14 | nameres::{ | 13 | nameres::{ |