Skip to content

Follow the diagnostic output style guide #89482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 5, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -102,7 +102,7 @@ impl NonConstOp for FnCallUnstable {
);

if ccx.is_const_stable_const_fn() {
err.help("Const-stable functions can only call other const-stable functions");
err.help("const-stable functions can only call other const-stable functions");
} else if ccx.tcx.sess.is_nightly_build() {
if let Some(feature) = feature {
err.help(&format!(
2 changes: 1 addition & 1 deletion compiler/rustc_typeck/src/check/check.rs
Original file line number Diff line number Diff line change
@@ -58,7 +58,7 @@ pub(super) fn check_abi(tcx: TyCtxt<'_>, hir_id: hir::HirId, span: Span, abi: Ab
tcx.sess,
span,
E0781,
"the `\"C-cmse-nonsecure-call\"` ABI is only allowed on function pointers."
"the `\"C-cmse-nonsecure-call\"` ABI is only allowed on function pointers"
)
.emit()
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
error[E0781]: the `"C-cmse-nonsecure-call"` ABI is only allowed on function pointers.
error[E0781]: the `"C-cmse-nonsecure-call"` ABI is only allowed on function pointers
--> $DIR/wrong-abi-location-1.rs:8:1
|
LL | pub extern "C-cmse-nonsecure-call" fn test() {}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
error[E0781]: the `"C-cmse-nonsecure-call"` ABI is only allowed on function pointers.
error[E0781]: the `"C-cmse-nonsecure-call"` ABI is only allowed on function pointers
--> $DIR/wrong-abi-location-2.rs:8:1
|
LL | / extern "C-cmse-nonsecure-call" {
Original file line number Diff line number Diff line change
@@ -4,15 +4,15 @@ error: `foo` is not yet stable as a const fn
LL | const fn bar() -> u32 { foo() }
| ^^^^^
|
= help: Const-stable functions can only call other const-stable functions
= help: const-stable functions can only call other const-stable functions

error: `foo2` is not yet stable as a const fn
--> $DIR/min_const_fn_libstd_stability.rs:24:26
|
LL | const fn bar2() -> u32 { foo2() }
| ^^^^^^
|
= help: Const-stable functions can only call other const-stable functions
= help: const-stable functions can only call other const-stable functions

error: const-stable function cannot use `#[feature(const_fn_floating_point_arithmetic)]`
--> $DIR/min_const_fn_libstd_stability.rs:29:26
@@ -35,7 +35,7 @@ error: `foo2_gated` is not yet stable as a const fn
LL | const fn bar2_gated() -> u32 { foo2_gated() }
| ^^^^^^^^^^^^
|
= help: Const-stable functions can only call other const-stable functions
= help: const-stable functions can only call other const-stable functions

error: aborting due to 4 previous errors

Original file line number Diff line number Diff line change
@@ -4,15 +4,15 @@ error: `foo` is not yet stable as a const fn
LL | const unsafe fn bar() -> u32 { unsafe { foo() } }
| ^^^^^
|
= help: Const-stable functions can only call other const-stable functions
= help: const-stable functions can only call other const-stable functions

error: `foo2` is not yet stable as a const fn
--> $DIR/min_const_unsafe_fn_libstd_stability.rs:24:42
|
LL | const unsafe fn bar2() -> u32 { unsafe { foo2() } }
| ^^^^^^
|
= help: Const-stable functions can only call other const-stable functions
= help: const-stable functions can only call other const-stable functions

error: const-stable function cannot use `#[feature(const_fn_floating_point_arithmetic)]`
--> $DIR/min_const_unsafe_fn_libstd_stability.rs:29:33
@@ -35,7 +35,7 @@ error: `foo2_gated` is not yet stable as a const fn
LL | const unsafe fn bar2_gated() -> u32 { unsafe { foo2_gated() } }
| ^^^^^^^^^^^^
|
= help: Const-stable functions can only call other const-stable functions
= help: const-stable functions can only call other const-stable functions

error: aborting due to 4 previous errors

Original file line number Diff line number Diff line change
@@ -4,23 +4,23 @@ error: `foo` is not yet stable as a const fn
LL | const unsafe fn bar() -> u32 { foo() }
| ^^^^^
|
= help: Const-stable functions can only call other const-stable functions
= help: const-stable functions can only call other const-stable functions

error: `foo2` is not yet stable as a const fn
--> $DIR/min_const_unsafe_fn_libstd_stability2.rs:24:33
|
LL | const unsafe fn bar2() -> u32 { foo2() }
| ^^^^^^
|
= help: Const-stable functions can only call other const-stable functions
= help: const-stable functions can only call other const-stable functions

error: `foo2_gated` is not yet stable as a const fn
--> $DIR/min_const_unsafe_fn_libstd_stability2.rs:33:39
|
LL | const unsafe fn bar2_gated() -> u32 { foo2_gated() }
| ^^^^^^^^^^^^
|
= help: Const-stable functions can only call other const-stable functions
= help: const-stable functions can only call other const-stable functions

error: aborting due to 3 previous errors

2 changes: 1 addition & 1 deletion src/test/ui/rfc-2632-const-trait-impl/stability.stderr
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ error: `<Int as Add>::add` is not yet stable as a const fn
LL | Int(1i32) + Int(2i32)
| ^^^^^^^^^^^^^^^^^^^^^
|
= help: Const-stable functions can only call other const-stable functions
= help: const-stable functions can only call other const-stable functions

error: aborting due to 2 previous errors