3 files changed, 12 insertions, 15 deletions

diff --git a/crates/ra_hir/src/code_model/attrs.rs b/crates/ra_hir/src/code_model/attrs.rs
index 9923cde81..96da8c88c 100644
--- a/crates/ra_hir/src/code_model/attrs.rs
+++ b/crates/ra_hir/src/code_model/attrs.rs
@@ -5,7 +5,7 @@ use crate::{
     Adt, Const, Enum, EnumVariant, FieldSource, Function, HasSource, MacroDef, Module, Static,
     Struct, StructField, Trait, TypeAlias, Union,
 };
-use hir_def::attr::Attr;
+use hir_def::attr::{Attr, Attrs};
 use hir_expand::hygiene::Hygiene;
 use ra_syntax::ast;
 
@@ -36,19 +36,16 @@ impl_froms!(
     MacroDef
 );
 
-pub trait Attrs {
-    fn attrs(&self, db: &impl HirDatabase) -> hir_def::attr::Attrs;
+pub trait HasAttrs {
+    fn attrs(&self, db: &impl HirDatabase) -> Attrs;
 }
 
-pub(crate) fn attributes_query(
-    db: &(impl DefDatabase + AstDatabase),
-    def: AttrDef,
-) -> hir_def::attr::Attrs {
+pub(crate) fn attributes_query(db: &(impl DefDatabase + AstDatabase), def: AttrDef) -> Attrs {
     match def {
         AttrDef::Module(it) => {
             let src = match it.declaration_source(db) {
                 Some(it) => it,
-                None => return hir_def::attr::Attrs::default(),
+                None => return Attrs::default(),
             };
             let hygiene = Hygiene::new(db, src.file_id);
             Attr::from_attrs_owner(&src.value, &hygiene)
@@ -59,7 +56,7 @@ pub(crate) fn attributes_query(
                 let hygiene = Hygiene::new(db, src.file_id);
                 Attr::from_attrs_owner(&named, &hygiene)
             }
-            FieldSource::Pos(..) => hir_def::attr::Attrs::default(),
+            FieldSource::Pos(..) => Attrs::default(),
         },
         AttrDef::Adt(it) => match it {
             Adt::Struct(it) => attrs_from_ast(it, db),
@@ -76,7 +73,7 @@ pub(crate) fn attributes_query(
     }
 }
 
-fn attrs_from_ast<T, D>(node: T, db: &D) -> hir_def::attr::Attrs
+fn attrs_from_ast<T, D>(node: T, db: &D) -> Attrs
 where
     T: HasSource,
     T::Ast: ast::AttrsOwner,
@@ -87,8 +84,8 @@ where
     Attr::from_attrs_owner(&src.value, &hygiene)
 }
 
-impl<T: Into<AttrDef> + Copy> Attrs for T {
-    fn attrs(&self, db: &impl HirDatabase) -> hir_def::attr::Attrs {
+impl<T: Into<AttrDef> + Copy> HasAttrs for T {
+    fn attrs(&self, db: &impl HirDatabase) -> Attrs {
         db.attrs((*self).into())
     }
 }
diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs
index 8c6834392..915ca46fb 100644
--- a/crates/ra_hir/src/lib.rs
+++ b/crates/ra_hir/src/lib.rs
@@ -52,7 +52,7 @@ mod marks;
 
 pub use crate::{
     code_model::{
-        attrs::{AttrDef, Attrs},
+        attrs::{AttrDef, HasAttrs},
         docs::{DocDef, Docs, Documentation},
         src::{HasBodySource, HasSource},
         Adt, AssocItem, Const, ConstData, Container, Crate, CrateDependency, DefWithBody, Enum,
diff --git a/crates/ra_ide_api/src/completion/presentation.rs b/crates/ra_ide_api/src/completion/presentation.rs
index cbaf169bf..bd464d193 100644
--- a/crates/ra_ide_api/src/completion/presentation.rs
+++ b/crates/ra_ide_api/src/completion/presentation.rs
@@ -1,6 +1,6 @@
 //! This modules takes care of rendering various definitions as completion items.
 
-use hir::{db::HirDatabase, Attrs, Docs, HasSource, HirDisplay, ScopeDef, Ty, TypeWalk};
+use hir::{db::HirDatabase, Docs, HasAttrs, HasSource, HirDisplay, ScopeDef, Ty, TypeWalk};
 use join_to_string::join;
 use ra_syntax::ast::NameOwner;
 use test_utils::tested_by;
@@ -285,7 +285,7 @@ impl Completions {
     }
 }
 
-fn is_deprecated(node: impl Attrs, db: &impl HirDatabase) -> bool {
+fn is_deprecated(node: impl HasAttrs, db: &impl HirDatabase) -> bool {
     node.attrs(db).has_atom("deprecated")
 }