Merge #1986

1986: don't special case module attrs r=matklad a=matklad

bors r+

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

1 files changed, 17 insertions, 7 deletions

diff --git a/crates/ra_hir/src/attr.rs b/crates/ra_hir/src/attr.rs
index f67e80bfd..bd159a566 100644
--- a/crates/ra_hir/src/attr.rs
+++ b/crates/ra_hir/src/attr.rs
@@ -63,14 +63,24 @@ impl Attr {
         self.path.as_ident().map_or(false, |s| s.to_string() == name)
     }
 
+    // FIXME: handle cfg_attr :-)
     pub(crate) fn as_cfg(&self) -> Option<&Subtree> {
-        if self.is_simple_atom("cfg") {
-            match &self.input {
-                Some(AttrInput::TokenTree(subtree)) => Some(subtree),
-                _ => None,
-            }
-        } else {
-            None
+        if !self.is_simple_atom("cfg") {
+            return None;
+        }
+        match &self.input {
+            Some(AttrInput::TokenTree(subtree)) => Some(subtree),
+            _ => None,
+        }
+    }
+
+    pub(crate) fn as_path(&self) -> Option<&SmolStr> {
+        if !self.is_simple_atom("path") {
+            return None;
+        }
+        match &self.input {
+            Some(AttrInput::Literal(it)) => Some(it),
+            _ => None,
         }
     }