mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor: simplify

Browse Source
This commit is contained in:
Aleksey Kladov 2021-12-28 16:51:17 +03:00
parent 56b51852c2
commit 177a183e85
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
crates/hir/src/semantics.rs
View File

@ -448,8 +448,8 @@ impl<'db> SemanticsImpl<'db> {
}
fn resolve_derive_macro(&self, attr: &ast::Attr) -> Option<Vec<MacroDef>> {
let macro_call_ids = self.derive_macro_calls(attr)?;
let res = macro_call_ids
let res = self
.derive_macro_calls(attr)?
.iter()
.map(|&call| {
let loc: MacroCallLoc = self.db.lookup_intern_macro_call(call);
@ -460,9 +460,8 @@ impl<'db> SemanticsImpl<'db> {
}
fn expand_derive_macro(&self, attr: &ast::Attr) -> Option<Vec<SyntaxNode>> {
let macro_call_ids = self.derive_macro_calls(attr)?;
let expansions: Vec<_> = macro_call_ids
let res: Vec<_> = self
.derive_macro_calls(attr)?
.iter()
.map(|call| call.as_file())
.flat_map(|file_id| {
@ -471,12 +470,7 @@ impl<'db> SemanticsImpl<'db> {
Some(node)
})
.collect();
if expansions.is_empty() {
None
} else {
Some(expansions)
}
Some(res)
}
fn derive_macro_calls(&self, attr: &ast::Attr) -> Option<Vec<MacroCallId>> {