nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-06 12:04:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #89482 - hkmatsumoto:patch-diagnostics, r=joshtriplett

Browse Source 
Follow the diagnostic output style guide

Detected by #89455.
This commit is contained in:
Manish Goregaokar 2021-10-04 23:56:23 -07:00 committed by GitHub
commit 04314a6061
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_const_eval/src/transform/check_consts/ops.rs
View File

@ -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
compiler/rustc_typeck/src/check/check.rs
View File

@ -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()
}

2
src/test/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-1.stderr
View File

@ -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() {}

2
src/test/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-2.stderr
View File

@ -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" {

6
src/test/ui/consts/min_const_fn/min_const_fn_libstd_stability.stderr
View File

@ -4,7 +4,7 @@ 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
@ -12,7 +12,7 @@ error: `foo2` is not yet stable as a const fn
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

6
src/test/ui/consts/min_const_fn/min_const_unsafe_fn_libstd_stability.stderr
View File

@ -4,7 +4,7 @@ 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
@ -12,7 +12,7 @@ error: `foo2` is not yet stable as a const fn
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

6
src/test/ui/consts/min_const_fn/min_const_unsafe_fn_libstd_stability2.stderr
View File

@ -4,7 +4,7 @@ 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
@ -12,7 +12,7 @@ error: `foo2` is not yet stable as a const fn
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
@ -20,7 +20,7 @@ error: `foo2_gated` is not yet stable as a const fn
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
src/test/ui/rfc-2632-const-trait-impl/stability.stderr
View File

@ -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