language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 04:44:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Make AttrQuery copyable

Browse source
This commit is contained in:
Edwin Cheng 2020-05-01 20:58:24 +08:00
parent e4267967a8
commit 7bbdeb43a4
2 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
crates/ra_hir_def/src/attr.rs
View file

@ -140,6 +140,7 @@ impl Attr {
} }
} }
#[derive(Debug, Clone, Copy)]
pub struct AttrQuery<'a> { pub struct AttrQuery<'a> {
attrs: &'a Attrs, attrs: &'a Attrs,
key: &'static str, key: &'static str,

24
crates/ra_hir_def/src/nameres/raw.rs
View file

@ -404,16 +404,20 @@ impl RawItemsCollector {
let ast_id = self.source_ast_id_map.ast_id(&m); let ast_id = self.source_ast_id_map.ast_id(&m);
// FIXME: cfg_attr // FIXME: cfg_attr
let export = attrs.by_key("macro_export").exists(); let export_attr = attrs.by_key("macro_export");
let local_inner =
attrs.by_key("macro_export").tt_values().map(|it| &it.token_trees).flatten().any( let export = export_attr.exists();
|it| match it { let local_inner = if export {
tt::TokenTree::Leaf(tt::Leaf::Ident(ident)) => { export_attr.tt_values().map(|it| &it.token_trees).flatten().any(|it| match it {
ident.text.contains("local_inner_macros") tt::TokenTree::Leaf(tt::Leaf::Ident(ident)) => {
} ident.text.contains("local_inner_macros")
_ => false, }
}, _ => false,
); })
} else {
false
};
let builtin = attrs.by_key("rustc_builtin_macro").exists(); let builtin = attrs.by_key("rustc_builtin_macro").exists();
let m = self.raw_items.macros.alloc(MacroData { let m = self.raw_items.macros.alloc(MacroData {