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

Remove redundant Option from eager macro fns

Browse source
This commit is contained in:
Jonas Schievink 2022-01-21 12:58:06 +01:00
parent df53403863
commit e5ed43b1dc
2 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
crates/hir_expand/src/builtin_fn_macro.rs
View file

@ -42,7 +42,7 @@ macro_rules! register_builtin {
db: &dyn AstDatabase, db: &dyn AstDatabase,
arg_id: MacroCallId, arg_id: MacroCallId,
tt: &tt::Subtree, tt: &tt::Subtree,
) -> ExpandResult<Option<ExpandedEager>> { ) -> ExpandResult<ExpandedEager> {
let expander = match *self { let expander = match *self {
$( EagerExpander::$e_kind => $e_expand, )* $( EagerExpander::$e_kind => $e_expand, )*
}; };
@ -60,7 +60,7 @@ macro_rules! register_builtin {
}; };
} }
#[derive(Debug)] #[derive(Debug, Default)]
pub struct ExpandedEager { pub struct ExpandedEager {
pub(crate) subtree: tt::Subtree, pub(crate) subtree: tt::Subtree,
/// The included file ID of the include macro. /// The included file ID of the include macro.
@ -362,7 +362,7 @@ fn compile_error_expand(
_db: &dyn AstDatabase, _db: &dyn AstDatabase,
_id: MacroCallId, _id: MacroCallId,
tt: &tt::Subtree, tt: &tt::Subtree,
) -> ExpandResult<Option<ExpandedEager>> { ) -> ExpandResult<ExpandedEager> {
let err = match &*tt.token_trees { let err = match &*tt.token_trees {
[tt::TokenTree::Leaf(tt::Leaf::Literal(it))] => { [tt::TokenTree::Leaf(tt::Leaf::Literal(it))] => {
let text = it.text.as_str(); let text = it.text.as_str();
@ -376,14 +376,14 @@ fn compile_error_expand(
_ => mbe::ExpandError::BindingError("`compile_error!` argument must be a string".into()), _ => mbe::ExpandError::BindingError("`compile_error!` argument must be a string".into()),
}; };
ExpandResult { value: Some(ExpandedEager::new(quote! {})), err: Some(err) } ExpandResult { value: ExpandedEager::new(quote! {}), err: Some(err) }
} }
fn concat_expand( fn concat_expand(
_db: &dyn AstDatabase, _db: &dyn AstDatabase,
_arg_id: MacroCallId, _arg_id: MacroCallId,
tt: &tt::Subtree, tt: &tt::Subtree,
) -> ExpandResult<Option<ExpandedEager>> { ) -> ExpandResult<ExpandedEager> {
let mut err = None; let mut err = None;
let mut text = String::new(); let mut text = String::new();
for (i, mut t) in tt.token_trees.iter().enumerate() { for (i, mut t) in tt.token_trees.iter().enumerate() {
@ -418,14 +418,14 @@ fn concat_expand(
} }
} }
} }
ExpandResult { value: Some(ExpandedEager::new(quote!(#text))), err } ExpandResult { value: ExpandedEager::new(quote!(#text)), err }
} }
fn concat_idents_expand( fn concat_idents_expand(
_db: &dyn AstDatabase, _db: &dyn AstDatabase,
_arg_id: MacroCallId, _arg_id: MacroCallId,
tt: &tt::Subtree, tt: &tt::Subtree,
) -> ExpandResult<Option<ExpandedEager>> { ) -> ExpandResult<ExpandedEager> {
let mut err = None; let mut err = None;
let mut ident = String::new(); let mut ident = String::new();
for (i, t) in tt.token_trees.iter().enumerate() { for (i, t) in tt.token_trees.iter().enumerate() {
@ -440,7 +440,7 @@ fn concat_idents_expand(
} }
} }
let ident = tt::Ident { text: ident.into(), id: tt::TokenId::unspecified() }; let ident = tt::Ident { text: ident.into(), id: tt::TokenId::unspecified() };
ExpandResult { value: Some(ExpandedEager::new(quote!(#ident))), err } ExpandResult { value: ExpandedEager::new(quote!(#ident)), err }
} }
fn relative_file( fn relative_file(
@ -476,7 +476,7 @@ fn include_expand(
db: &dyn AstDatabase, db: &dyn AstDatabase,
arg_id: MacroCallId, arg_id: MacroCallId,
tt: &tt::Subtree, tt: &tt::Subtree,
) -> ExpandResult<Option<ExpandedEager>> { ) -> ExpandResult<ExpandedEager> {
let res = (|| { let res = (|| {
let path = parse_string(tt)?; let path = parse_string(tt)?;
let file_id = relative_file(db, arg_id, &path, false)?; let file_id = relative_file(db, arg_id, &path, false)?;
@ -488,7 +488,7 @@ fn include_expand(
match res { match res {
Ok((subtree, file_id)) => { Ok((subtree, file_id)) => {
ExpandResult::ok(Some(ExpandedEager { subtree, included_file: Some(file_id) })) ExpandResult::ok(ExpandedEager { subtree, included_file: Some(file_id) })
} }
Err(e) => ExpandResult::only_err(e), Err(e) => ExpandResult::only_err(e),
} }
@ -498,7 +498,7 @@ fn include_bytes_expand(
_db: &dyn AstDatabase, _db: &dyn AstDatabase,
_arg_id: MacroCallId, _arg_id: MacroCallId,
tt: &tt::Subtree, tt: &tt::Subtree,
) -> ExpandResult<Option<ExpandedEager>> { ) -> ExpandResult<ExpandedEager> {
if let Err(e) = parse_string(tt) { if let Err(e) = parse_string(tt) {
return ExpandResult::only_err(e); return ExpandResult::only_err(e);
} }
@ -511,14 +511,14 @@ fn include_bytes_expand(
id: tt::TokenId::unspecified(), id: tt::TokenId::unspecified(),
}))], }))],
}; };
ExpandResult::ok(Some(ExpandedEager::new(res))) ExpandResult::ok(ExpandedEager::new(res))
} }
fn include_str_expand( fn include_str_expand(
db: &dyn AstDatabase, db: &dyn AstDatabase,
arg_id: MacroCallId, arg_id: MacroCallId,
tt: &tt::Subtree, tt: &tt::Subtree,
) -> ExpandResult<Option<ExpandedEager>> { ) -> ExpandResult<ExpandedEager> {
let path = match parse_string(tt) { let path = match parse_string(tt) {
Ok(it) => it, Ok(it) => it,
Err(e) => return ExpandResult::only_err(e), Err(e) => return ExpandResult::only_err(e),
@ -531,14 +531,14 @@ fn include_str_expand(
let file_id = match relative_file(db, arg_id, &path, true) { let file_id = match relative_file(db, arg_id, &path, true) {
Ok(file_id) => file_id, Ok(file_id) => file_id,
Err(_) => { Err(_) => {
return ExpandResult::ok(Some(ExpandedEager::new(quote!("")))); return ExpandResult::ok(ExpandedEager::new(quote!("")));
} }
}; };
let text = db.file_text(file_id); let text = db.file_text(file_id);
let text = &*text; let text = &*text;
ExpandResult::ok(Some(ExpandedEager::new(quote!(#text)))) ExpandResult::ok(ExpandedEager::new(quote!(#text)))
} }
fn get_env_inner(db: &dyn AstDatabase, arg_id: MacroCallId, key: &str) -> Option<String> { fn get_env_inner(db: &dyn AstDatabase, arg_id: MacroCallId, key: &str) -> Option<String> {
@ -550,7 +550,7 @@ fn env_expand(
db: &dyn AstDatabase, db: &dyn AstDatabase,
arg_id: MacroCallId, arg_id: MacroCallId,
tt: &tt::Subtree, tt: &tt::Subtree,
) -> ExpandResult<Option<ExpandedEager>> { ) -> ExpandResult<ExpandedEager> {
let key = match parse_string(tt) { let key = match parse_string(tt) {
Ok(it) => it, Ok(it) => it,
Err(e) => return ExpandResult::only_err(e), Err(e) => return ExpandResult::only_err(e),
@ -574,14 +574,14 @@ fn env_expand(
}); });
let expanded = quote! { #s }; let expanded = quote! { #s };
ExpandResult { value: Some(ExpandedEager::new(expanded)), err } ExpandResult { value: ExpandedEager::new(expanded), err }
} }
fn option_env_expand( fn option_env_expand(
db: &dyn AstDatabase, db: &dyn AstDatabase,
arg_id: MacroCallId, arg_id: MacroCallId,
tt: &tt::Subtree, tt: &tt::Subtree,
) -> ExpandResult<Option<ExpandedEager>> { ) -> ExpandResult<ExpandedEager> {
let key = match parse_string(tt) { let key = match parse_string(tt) {
Ok(it) => it, Ok(it) => it,
Err(e) => return ExpandResult::only_err(e), Err(e) => return ExpandResult::only_err(e),
@ -592,5 +592,5 @@ fn option_env_expand(
Some(s) => quote! { std::option::Some(#s) }, Some(s) => quote! { std::option::Some(#s) },
}; };
ExpandResult::ok(Some(ExpandedEager::new(expanded))) ExpandResult::ok(ExpandedEager::new(expanded))
} }

8
crates/hir_expand/src/eager.rs
View file

@ -145,14 +145,16 @@ pub fn expand_eager_macro(
if let MacroDefKind::BuiltInEager(eager, _) = def.kind { if let MacroDefKind::BuiltInEager(eager, _) = def.kind {
let res = eager.expand(db, arg_id, &subtree); let res = eager.expand(db, arg_id, &subtree);
if let Some(err) = res.err {
diagnostic_sink(err);
}
let expanded = diagnostic_sink.expand_result_option(res)?;
let loc = MacroCallLoc { let loc = MacroCallLoc {
def, def,
krate, krate,
eager: Some(EagerCallInfo { eager: Some(EagerCallInfo {
arg_or_expansion: Arc::new(expanded.subtree), arg_or_expansion: Arc::new(res.value.subtree),
included_file: expanded.included_file, included_file: res.value.included_file,
}), }),
kind: MacroCallKind::FnLike { ast_id: call_id, expand_to }, kind: MacroCallKind::FnLike { ast_id: call_id, expand_to },
}; };