language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 22:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Switch AstDatabase::exapnd_proc_macro to ExpandResult

Browse source
This commit is contained in:
Lukas Wirth 2021-08-20 14:34:46 +02:00
parent 269de9abe3
commit 82728eb757
3 changed files with 18 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/hir_expand/src/builtin_attr.rs
View file

@ -1,5 +1,6 @@
//! Builtin attributes.
use mbe::ExpandResult;
use syntax::ast;
use crate::{db::AstDatabase, name, AstId, CrateId, MacroCallId, MacroDefId, MacroDefKind};
@ -18,7 +19,7 @@ macro_rules! register_builtin {
id: MacroCallId,
tt: &tt::Subtree,
item: &tt::Subtree,
) -> Result<tt::Subtree, mbe::ExpandError> {
) -> ExpandResult<tt::Subtree> {
let expander = match *self {
$( BuiltinAttrExpander::$variant => $expand, )*
};
@ -64,6 +65,6 @@ fn dummy_attr_expand(
_id: MacroCallId,
_tt: &tt::Subtree,
item: &tt::Subtree,
) -> Result<tt::Subtree, mbe::ExpandError> {
Ok(item.clone())
) -> ExpandResult<tt::Subtree> {
ExpandResult::ok(item.clone())
}