From 0f3a54dd4d439a6598526144c4ecccee9c5f1362 Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Sat, 14 Mar 2020 20:24:18 +0100 Subject: wip --- crates/ra_hir_expand/src/db.rs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'crates/ra_hir_expand/src') diff --git a/crates/ra_hir_expand/src/db.rs b/crates/ra_hir_expand/src/db.rs index e7b81a1e6..ad4a0732e 100644 --- a/crates/ra_hir_expand/src/db.rs +++ b/crates/ra_hir_expand/src/db.rs @@ -31,8 +31,12 @@ impl TokenExpander { match self { TokenExpander::MacroRules(it) => it.expand(tt), // FIXME switch these to ExpandResult as well - TokenExpander::Builtin(it) => it.expand(db, id, tt).map_or_else(|e| (tt::Subtree::default(), Some(e)), |r| (r, None)), - TokenExpander::BuiltinDerive(it) => it.expand(db, id, tt).map_or_else(|e| (tt::Subtree::default(), Some(e)), |r| (r, None)), + TokenExpander::Builtin(it) => it + .expand(db, id, tt) + .map_or_else(|e| (tt::Subtree::default(), Some(e)), |r| (r, None)), + TokenExpander::BuiltinDerive(it) => it + .expand(db, id, tt) + .map_or_else(|e| (tt::Subtree::default(), Some(e)), |r| (r, None)), } } @@ -182,7 +186,7 @@ fn macro_expand_with_arg( if arg.is_some() { return ( None, - Some("hypothetical macro expansion not implemented for eager macro".to_owned()) + Some("hypothetical macro expansion not implemented for eager macro".to_owned()), ); } else { return (Some(db.lookup_intern_eager_expansion(id).subtree), None); @@ -252,9 +256,9 @@ pub fn parse_macro_with_arg( let parents = std::iter::successors(loc.kind.file_id().call_node(db), |it| { it.file_id.call_node(db) }) - .map(|n| format!("{:#}", n.value)) - .collect::>() - .join("\n"); + .map(|n| format!("{:#}", n.value)) + .collect::>() + .join("\n"); log::warn!( "fail on macro_parse: (reason: {} macro_call: {:#}) parents: {}", -- cgit v1.2.3