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

Auto merge of #13652 - jhgg:hir-expand/fix-compile-error-expansion, r=Veykril

Browse source 
hir-expand: fix compile_error! expansion not unquoting strings

expanding `compile_error!` would not properly unquote strings, leading to quite ugly diagnostic messages:

![image](https://user-images.githubusercontent.com/5489149/202893481-2486ede8-c79a-4972-9713-416d6a704064.png)

this fixes it, using the conveniently placed `unquote_str` function, which now makes errors look like:

![image](https://user-images.githubusercontent.com/5489149/202893466-0763efad-9240-4d55-80a6-6c62000d5d2b.png)

additionally, using `unquote_str` has the cool side-effect of *also* handling raw strings, so this fixes a fixme too!
This commit is contained in:
bors 2022-11-24 21:00:48 +00:00
commit 76e2e41121
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crates/hir-def/src/macro_expansion_tests/builtin_fn_macro.rs
View file

@ -163,7 +163,8 @@ macro_rules! compile_error {
} }
// This expands to nothing (since it's in item position), but emits an error. // This expands to nothing (since it's in item position), but emits an error.
compile_error!("error!"); compile_error!("error, with an escaped quote: \"");
compile_error!(r"this is a raw string");
"#, "#,
expect![[r##" expect![[r##"
#[rustc_builtin_macro] #[rustc_builtin_macro]
@ -172,7 +173,8 @@ macro_rules! compile_error {
($msg:expr,) => ({ /* compiler built-in */ }) ($msg:expr,) => ({ /* compiler built-in */ })
} }
/* error: error! */ /* error: error, with an escaped quote: " */
/* error: this is a raw string */
"##]], "##]],
); );
} }

13
crates/hir-expand/src/builtin_fn_macro.rs
View file

@ -379,15 +379,10 @@ fn compile_error_expand(
tt: &tt::Subtree, tt: &tt::Subtree,
) -> ExpandResult<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))] => match unquote_str(it) {
let text = it.text.as_str(); Some(unquoted) => ExpandError::Other(unquoted.into()),
if text.starts_with('"') && text.ends_with('"') { None => ExpandError::Other("`compile_error!` argument must be a string".into()),
// FIXME: does not handle raw strings },
ExpandError::Other(text[1..text.len() - 1].into())
} else {
ExpandError::Other("`compile_error!` argument must be a string".into())
}
}
_ => ExpandError::Other("`compile_error!` argument must be a string".into()), _ => ExpandError::Other("`compile_error!` argument must be a string".into()),
}; };