diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-12-03 18:08:17 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-12-03 18:08:17 +0000 |
commit | 070ecef24912910417ca723cb2f1d1b350cc79d8 (patch) | |
tree | 497bb2da8411f77288d4b05360f353898ee7fde1 /crates/hir_expand | |
parent | ec2bdd3c16c326716acd4936845aed16c892c833 (diff) | |
parent | 957fb1879905dc3496992de2241d0847c253e508 (diff) |
Merge #6713
6713: Make `compile_error!` message match upstream rustc r=jonas-schievink a=jonas-schievink
It only consists of the argument passed to it.
bors r+
Co-authored-by: Jonas Schievink <[email protected]>
Diffstat (limited to 'crates/hir_expand')
-rw-r--r-- | crates/hir_expand/src/builtin_macro.rs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/crates/hir_expand/src/builtin_macro.rs b/crates/hir_expand/src/builtin_macro.rs index 16c3c4d69..44a5556b6 100644 --- a/crates/hir_expand/src/builtin_macro.rs +++ b/crates/hir_expand/src/builtin_macro.rs | |||
@@ -271,10 +271,7 @@ fn compile_error_expand( | |||
271 | let text = it.text.as_str(); | 271 | let text = it.text.as_str(); |
272 | if text.starts_with('"') && text.ends_with('"') { | 272 | if text.starts_with('"') && text.ends_with('"') { |
273 | // FIXME: does not handle raw strings | 273 | // FIXME: does not handle raw strings |
274 | mbe::ExpandError::Other(format!( | 274 | mbe::ExpandError::Other(text[1..text.len() - 1].to_string()) |
275 | "`compile_error!` called: {}", | ||
276 | &text[1..text.len() - 1] | ||
277 | )) | ||
278 | } else { | 275 | } else { |
279 | mbe::ExpandError::BindingError("`compile_error!` argument must be a string".into()) | 276 | mbe::ExpandError::BindingError("`compile_error!` argument must be a string".into()) |
280 | } | 277 | } |