aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
Diffstat (limited to 'crates')
-rw-r--r--crates/ra_hir/src/attr.rs1
-rw-r--r--crates/ra_hir/src/impl_block.rs3
-rw-r--r--crates/ra_hir/src/lib.rs1
-rw-r--r--crates/ra_hir/src/nameres/collector.rs3
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 @@
1pub 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 @@
3use rustc_hash::FxHashMap; 3use rustc_hash::FxHashMap;
4use std::sync::Arc; 4use std::sync::Arc;
5 5
6use hir_def::type_ref::TypeRef; 6use hir_def::{attr::Attr, type_ref::TypeRef};
7use ra_arena::{impl_arena_id, map::ArenaMap, Arena, RawId}; 7use ra_arena::{impl_arena_id, map::ArenaMap, Arena, RawId};
8use ra_cfg::CfgOptions; 8use ra_cfg::CfgOptions;
9use ra_syntax::{ 9use ra_syntax::{
@@ -12,7 +12,6 @@ use ra_syntax::{
12}; 12};
13 13
14use crate::{ 14use 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;
39mod traits; 39mod traits;
40mod type_alias; 40mod type_alias;
41mod ty; 41mod ty;
42mod attr;
43mod impl_block; 42mod impl_block;
44mod expr; 43mod expr;
45mod lang_item; 44mod 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
3use hir_def::{name, nameres::raw}; 3use hir_def::{attr::Attr, name, nameres::raw};
4use ra_cfg::CfgOptions; 4use ra_cfg::CfgOptions;
5use ra_db::FileId; 5use ra_db::FileId;
6use ra_syntax::{ast, SmolStr}; 6use ra_syntax::{ast, SmolStr};
@@ -8,7 +8,6 @@ use rustc_hash::FxHashMap;
8use test_utils::tested_by; 8use test_utils::tested_by;
9 9
10use crate::{ 10use 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::{