Merge #2351

2351: Rename Atts trait r=matklad a=matklad



Co-authored-by: Aleksey Kladov <[email protected]>

3 files changed, 15 insertions, 16 deletions

diff --git a/crates/ra_hir/src/code_model/attrs.rs b/crates/ra_hir/src/code_model/attrs.rs
index 9e304217c..96da8c88c 100644
--- a/crates/ra_hir/src/code_model/attrs.rs
+++ b/crates/ra_hir/src/code_model/attrs.rs
@@ -5,10 +5,9 @@ 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;
-use std::sync::Arc;
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
 pub enum AttrDef {
@@ -37,17 +36,17 @@ impl_froms!(
     MacroDef
 );
 
-pub trait Attrs {
-    fn attrs(&self, db: &impl HirDatabase) -> Option<Arc<[Attr]>>;
+pub trait HasAttrs {
+    fn attrs(&self, db: &impl HirDatabase) -> Attrs;
 }
 
-pub(crate) fn attributes_query(
-    db: &(impl DefDatabase + AstDatabase),
-    def: AttrDef,
-) -> Option<Arc<[Attr]>> {
+pub(crate) fn attributes_query(db: &(impl DefDatabase + AstDatabase), def: AttrDef) -> Attrs {
     match def {
         AttrDef::Module(it) => {
-            let src = it.declaration_source(db)?;
+            let src = match it.declaration_source(db) {
+                Some(it) => it,
+                None => return Attrs::default(),
+            };
             let hygiene = Hygiene::new(db, src.file_id);
             Attr::from_attrs_owner(&src.value, &hygiene)
         }
@@ -57,7 +56,7 @@ pub(crate) fn attributes_query(
                 let hygiene = Hygiene::new(db, src.file_id);
                 Attr::from_attrs_owner(&named, &hygiene)
             }
-            FieldSource::Pos(..) => None,
+            FieldSource::Pos(..) => Attrs::default(),
         },
         AttrDef::Adt(it) => match it {
             Adt::Struct(it) => attrs_from_ast(it, db),
@@ -74,7 +73,7 @@ pub(crate) fn attributes_query(
     }
 }
 
-fn attrs_from_ast<T, D>(node: T, db: &D) -> Option<Arc<[Attr]>>
+fn attrs_from_ast<T, D>(node: T, db: &D) -> Attrs
 where
     T: HasSource,
     T::Ast: ast::AttrsOwner,
@@ -85,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) -> Option<Arc<[Attr]>> {
+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/db.rs b/crates/ra_hir/src/db.rs
index ed0d68001..1f63be3b9 100644
--- a/crates/ra_hir/src/db.rs
+++ b/crates/ra_hir/src/db.rs
@@ -2,7 +2,7 @@
 
 use std::sync::Arc;
 
-use hir_def::attr::Attr;
+use hir_def::attr::Attrs;
 use ra_db::salsa;
 use ra_syntax::SmolStr;
 
@@ -61,7 +61,7 @@ pub trait DefDatabase: HirDebugDatabase + DefDatabase2 {
     fn documentation(&self, def: crate::DocDef) -> Option<crate::Documentation>;
 
     #[salsa::invoke(crate::code_model::attrs::attributes_query)]
-    fn attrs(&self, def: crate::AttrDef) -> Option<Arc<[Attr]>>;
+    fn attrs(&self, def: crate::AttrDef) -> Attrs;
 }
 
 #[salsa::query_group(HirDatabaseStorage)]
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,