From e34e71c62d9b4cf0ab237969e03ecde893ab347b Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Wed, 30 Oct 2019 18:06:08 +0300
Subject: [PATCH] remove forward pointer for attrs

---
 crates/ra_hir/src/attr.rs              | 1 -
 crates/ra_hir/src/impl_block.rs        | 3 +--
 crates/ra_hir/src/lib.rs               | 1 -
 crates/ra_hir/src/nameres/collector.rs | 3 +--
 4 files changed, 2 insertions(+), 6 deletions(-)
 delete mode 100644 crates/ra_hir/src/attr.rs

diff --git a/crates/ra_hir/src/attr.rs b/crates/ra_hir/src/attr.rs
deleted file mode 100644
index 988a671b81..0000000000
--- a/crates/ra_hir/src/attr.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub use hir_def::attr::*;
diff --git a/crates/ra_hir/src/impl_block.rs b/crates/ra_hir/src/impl_block.rs
index 8584686fd0..5183307132 100644
--- a/crates/ra_hir/src/impl_block.rs
+++ b/crates/ra_hir/src/impl_block.rs
@@ -3,7 +3,7 @@
 use rustc_hash::FxHashMap;
 use std::sync::Arc;
 
-use hir_def::type_ref::TypeRef;
+use hir_def::{attr::Attr, type_ref::TypeRef};
 use ra_arena::{impl_arena_id, map::ArenaMap, Arena, RawId};
 use ra_cfg::CfgOptions;
 use ra_syntax::{
@@ -12,7 +12,6 @@ use ra_syntax::{
 };
 
 use crate::{
-    attr::Attr,
     code_model::{Module, ModuleSource},
     db::{AstDatabase, DefDatabase, HirDatabase},
     generics::HasGenericParams,
diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs
index fabe6eff66..f765490b01 100644
--- a/crates/ra_hir/src/lib.rs
+++ b/crates/ra_hir/src/lib.rs
@@ -39,7 +39,6 @@ mod adt;
 mod traits;
 mod type_alias;
 mod ty;
-mod attr;
 mod impl_block;
 mod expr;
 mod lang_item;
diff --git a/crates/ra_hir/src/nameres/collector.rs b/crates/ra_hir/src/nameres/collector.rs
index 1f3849dc76..2f342870b1 100644
--- a/crates/ra_hir/src/nameres/collector.rs
+++ b/crates/ra_hir/src/nameres/collector.rs
@@ -1,6 +1,6 @@
 //! FIXME: write short doc here
 
-use hir_def::{name, nameres::raw};
+use hir_def::{attr::Attr, name, nameres::raw};
 use ra_cfg::CfgOptions;
 use ra_db::FileId;
 use ra_syntax::{ast, SmolStr};
@@ -8,7 +8,6 @@ use rustc_hash::FxHashMap;
 use test_utils::tested_by;
 
 use crate::{
-    attr::Attr,
     db::DefDatabase,
     ids::{AstItemDef, LocationCtx, MacroCallId, MacroCallLoc, MacroDefId, MacroFileKind},
     nameres::{