From 957fb1879905dc3496992de2241d0847c253e508 Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Thu, 3 Dec 2020 19:07:37 +0100 Subject: [PATCH] Make `compile_error!` message match upstream rustc It only consists of the argument passed to it --- crates/hir_def/src/body/tests.rs | 2 +- crates/hir_expand/src/builtin_macro.rs | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/crates/hir_def/src/body/tests.rs b/crates/hir_def/src/body/tests.rs index 7e78340ee4b..6dba9817d40 100644 --- a/crates/hir_def/src/body/tests.rs +++ b/crates/hir_def/src/body/tests.rs @@ -107,7 +107,7 @@ fn f() { //^^^^^^^^^^^^^^^ `OUT_DIR` not set, enable "load out dirs from check" to fix compile_error!("compile_error works"); - //^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `compile_error!` called: compile_error works + //^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ compile_error works // Lazy: diff --git a/crates/hir_expand/src/builtin_macro.rs b/crates/hir_expand/src/builtin_macro.rs index 16c3c4d69c1..44a5556b67f 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( let text = it.text.as_str(); if text.starts_with('"') && text.ends_with('"') { // FIXME: does not handle raw strings - mbe::ExpandError::Other(format!( - "`compile_error!` called: {}", - &text[1..text.len() - 1] - )) + mbe::ExpandError::Other(text[1..text.len() - 1].to_string()) } else { mbe::ExpandError::BindingError("`compile_error!` argument must be a string".into()) }