about summary refs log tree commit diff
path: root/compiler/rustc_const_eval/messages.ftl
diff options
context:
space:
mode:
authorMichael Goulet <michael@errs.io>2024-12-23 21:53:07 +0000
committerMichael Goulet <michael@errs.io>2025-01-09 16:20:10 +0000
commit924000d70ebb5f0de849447fd21127e34f8a8ba1 (patch)
tree6739898f93ecd074145eae0b63bf3d4a24862d2a /compiler/rustc_const_eval/messages.ftl
parent5a9f0be0bd7ae663a3084da90eb89dcc5721ec15 (diff)
downloadrust-924000d70ebb5f0de849447fd21127e34f8a8ba1.tar.gz
rust-924000d70ebb5f0de849447fd21127e34f8a8ba1.zip
Unify conditional and non const call error reporting
Diffstat (limited to 'compiler/rustc_const_eval/messages.ftl')
-rw-r--r--compiler/rustc_const_eval/messages.ftl14
1 files changed, 6 insertions, 8 deletions
diff --git a/compiler/rustc_const_eval/messages.ftl b/compiler/rustc_const_eval/messages.ftl
index 7c66f5dedb5..4861b7a4430 100644
--- a/compiler/rustc_const_eval/messages.ftl
+++ b/compiler/rustc_const_eval/messages.ftl
@@ -21,8 +21,6 @@ const_eval_closure_call =
     closures need an RFC before allowed to be called in {const_eval_const_context}s
 const_eval_closure_fndef_not_const =
     function defined here, but it is not `const`
-const_eval_conditionally_const_call =
-    cannot call conditionally-const {$def_descr} `{$def_path_str}` in {const_eval_const_context}s
 
 const_eval_consider_dereferencing =
     consider dereferencing here
@@ -239,18 +237,18 @@ const_eval_non_const_await =
     cannot convert `{$ty}` into a future in {const_eval_const_context}s
 
 const_eval_non_const_closure =
-    cannot call {$non}-const closure in {const_eval_const_context}s
+    cannot call {$non_or_conditionally}-const closure in {const_eval_const_context}s
 
 const_eval_non_const_deref_coercion =
-    cannot perform {$non}-const deref coercion on `{$ty}` in {const_eval_const_context}s
+    cannot perform {$non_or_conditionally}-const deref coercion on `{$ty}` in {const_eval_const_context}s
     .note = attempting to deref into `{$target_ty}`
     .target_note = deref defined here
 
 const_eval_non_const_fmt_macro_call =
-    cannot call {$non}-const formatting macro in {const_eval_const_context}s
+    cannot call {$non_or_conditionally}-const formatting macro in {const_eval_const_context}s
 
 const_eval_non_const_fn_call =
-    cannot call {$non}-const {$def_descr} `{$def_path_str}` in {const_eval_const_context}s
+    cannot call {$non_or_conditionally}-const {$def_descr} `{$def_path_str}` in {const_eval_const_context}s
 
 const_eval_non_const_for_loop_into_iter =
     cannot use `for` loop on `{$ty}` in {const_eval_const_context}s
@@ -259,13 +257,13 @@ const_eval_non_const_impl =
     impl defined here, but it is not `const`
 
 const_eval_non_const_intrinsic =
-    cannot call {$non}-const intrinsic `{$name}` in {const_eval_const_context}s
+    cannot call non-const intrinsic `{$name}` in {const_eval_const_context}s
 
 const_eval_non_const_match_eq = cannot match on `{$ty}` in {const_eval_const_context}s
     .note = `{$ty}` cannot be compared in compile-time, and therefore cannot be used in `match`es
 
 const_eval_non_const_operator =
-    cannot call {$non}-const operator in {const_eval_const_context}s
+    cannot call {$non_or_conditionally}-const operator in {const_eval_const_context}s
 
 const_eval_non_const_question_branch =
     `?` is not allowed on `{$ty}` in {const_eval_const_context}s