mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tweak rustc_allow_const_fn_unstable hint, and add back test for stable-const-can-only-call-stable-const

Browse Source
This commit is contained in:
Ralf Jung 2024-08-25 13:50:07 +02:00
parent 717aec0f8e
commit ba24121ad6
4 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_const_eval/messages.ftl
View File

@ -419,7 +419,7 @@ const_eval_unstable_const_fn = `{$def_path}` is not yet stable as a const fn
const_eval_unstable_in_stable = const_eval_unstable_in_stable =
const-stable function cannot use `#[feature({$gate})]` const-stable function cannot use `#[feature({$gate})]`
.unstable_sugg = if it is not part of the public API, make this function unstably const .unstable_sugg = if it is not part of the public API, make this function unstably const
.bypass_sugg = otherwise `#[rustc_allow_const_fn_unstable]` can be used to bypass stability checks .bypass_sugg = otherwise `#[rustc_allow_const_fn_unstable]` can be used to bypass stability checks (but requires team approval)
const_eval_unterminated_c_string = const_eval_unterminated_c_string =
reading a null-terminated string starting at {$pointer} with no null found before end of allocation reading a null-terminated string starting at {$pointer} with no null found before end of allocation

2
tests/ui/consts/min_const_fn/allow_const_fn_ptr_run_pass.rs
View File

@ -1,6 +1,4 @@
//@ run-pass //@ run-pass
#![feature(rustc_allow_const_fn_unstable)]
#![feature(rustc_attrs, staged_api)] #![feature(rustc_attrs, staged_api)]
#![stable(feature = "rust1", since = "1.0.0")] #![stable(feature = "rust1", since = "1.0.0")]

4
tests/ui/consts/min_const_fn/min_const_fn_libstd_stability.rs
View File

@ -28,9 +28,11 @@ const fn bar2() -> u32 { foo2() } //~ ERROR not yet stable as a const fn
// conformity is required // conformity is required
const fn bar3() -> u32 { const fn bar3() -> u32 {
let x = std::cell::Cell::new(0u32); let x = std::cell::Cell::new(0u32);
x.get() x.get();
//~^ ERROR const-stable function cannot use `#[feature(const_refs_to_cell)]` //~^ ERROR const-stable function cannot use `#[feature(const_refs_to_cell)]`
//~| ERROR cannot call non-const fn //~| ERROR cannot call non-const fn
foo()
//~^ ERROR is not yet stable as a const fn
} }
// check whether this function cannot be called even with the feature gate active // check whether this function cannot be called even with the feature gate active

18
tests/ui/consts/min_const_fn/min_const_fn_libstd_stability.stderr
View File

@ -17,7 +17,7 @@ LL | const fn bar2() -> u32 { foo2() }
error: const-stable function cannot use `#[feature(const_refs_to_cell)]` error: const-stable function cannot use `#[feature(const_refs_to_cell)]`
--> $DIR/min_const_fn_libstd_stability.rs:31:5 --> $DIR/min_const_fn_libstd_stability.rs:31:5
| |
LL | x.get() LL | x.get();
| ^ | ^
| |
help: if it is not part of the public API, make this function unstably const help: if it is not part of the public API, make this function unstably const
@ -25,7 +25,7 @@ help: if it is not part of the public API, make this function unstably const
LL + #[rustc_const_unstable(feature = "...", issue = "...")] LL + #[rustc_const_unstable(feature = "...", issue = "...")]
LL | const fn bar3() -> u32 { LL | const fn bar3() -> u32 {
| |
help: otherwise `#[rustc_allow_const_fn_unstable]` can be used to bypass stability checks help: otherwise `#[rustc_allow_const_fn_unstable]` can be used to bypass stability checks (but requires team approval)
| |
LL + #[rustc_allow_const_fn_unstable(const_refs_to_cell)] LL + #[rustc_allow_const_fn_unstable(const_refs_to_cell)]
LL | const fn bar3() -> u32 { LL | const fn bar3() -> u32 {
@ -34,19 +34,27 @@ LL | const fn bar3() -> u32 {
error[E0015]: cannot call non-const fn `Cell::<u32>::get` in constant functions error[E0015]: cannot call non-const fn `Cell::<u32>::get` in constant functions
--> $DIR/min_const_fn_libstd_stability.rs:31:7 --> $DIR/min_const_fn_libstd_stability.rs:31:7
| |
LL | x.get() LL | x.get();
| ^^^^^ | ^^^^^
| |
= note: calls in constant functions are limited to constant functions, tuple structs and tuple variants = note: calls in constant functions are limited to constant functions, tuple structs and tuple variants
error: `foo` is not yet stable as a const fn
--> $DIR/min_const_fn_libstd_stability.rs:34:5
|
LL | foo()
| ^^^^^
|
= help: const-stable functions can only call other const-stable functions
error: `foo2_gated` is not yet stable as a const fn error: `foo2_gated` is not yet stable as a const fn
--> $DIR/min_const_fn_libstd_stability.rs:43:32 --> $DIR/min_const_fn_libstd_stability.rs:45:32
| |
LL | const fn bar2_gated() -> u32 { foo2_gated() } 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 5 previous errors error: aborting due to 6 previous errors
For more information about this error, try `rustc --explain E0015`. For more information about this error, try `rustc --explain E0015`.