Skip to content

Commit

Permalink
Rollup merge of #89482 - hkmatsumoto:patch-diagnostics, r=joshtriplett
Browse files Browse the repository at this point in the history
Follow the diagnostic output style guide

Detected by #89455.
  • Loading branch information
Manishearth authored Oct 5, 2021
2 parents a23d7f0 + fb0b1a5 commit 04314a6
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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!(
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_typeck/src/check/check.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
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() {}
Expand Down
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" {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Up @@ -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
Expand All @@ -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
Expand Up @@ -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
Expand Up @@ -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

0 comments on commit 04314a6

Please sign in to comment.