Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-27 05:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Formatting

Browse source
This commit is contained in:
Wyatt Herkamp 2024-03-15 11:15:02 -04:00
parent f499564d0a
commit 4bd2f948bb
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/hir-def/src/nameres/collector.rs
View file

@ -17,8 +17,6 @@ use crate::macro_call_as_call_id_with_eager;
use crate::nameres::mod_resolution::ModDir;
use crate::item_tree::ItemTree;
use base_db::{CrateId, Dependency, FileId};
use cfg::{CfgExpr, CfgOptions};
use crate::item_tree::TreeId;

5
crates/hir-expand/src/db.rs
View file

@ -340,7 +340,7 @@ pub(crate) fn parse_with_map(
}
}
/// This is just to ensure the types of smart_macro_arg and macro_arg are the same
type MacroArgResult = (Arc<tt::Subtree>, SyntaxFixupUndoInfo, Span) ;
type MacroArgResult = (Arc<tt::Subtree>, SyntaxFixupUndoInfo, Span);
/// Imagine the word smart in quotes.
///
/// This resolves the [MacroCallId] to check if it is a derive macro if so get the [macro_arg] for the derive.
@ -553,8 +553,7 @@ fn macro_expand(
let (ExpandResult { value: tt, err }, span) = match loc.def.kind {
MacroDefKind::ProcMacro(..) => return db.expand_proc_macro(macro_call_id).map(CowArc::Arc),
_ => {
let (macro_arg, undo_info, span) =
smart_macro_arg(db, macro_call_id);
let (macro_arg, undo_info, span) = smart_macro_arg(db, macro_call_id);
let arg = &*macro_arg;
let res =