diff options
| author | bors <bors@rust-lang.org> | 2024-10-28 16:25:56 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-10-28 16:25:56 +0000 |
| commit | 3f1be1ec7ec3d8e80beb381ee82164a0aa3ca777 (patch) | |
| tree | 5f80bff44416146cfd7dadade45acde6bcf9926e /compiler/rustc_error_codes/src | |
| parent | 9f57edf2e261ade3c926d69459162057f15164d6 (diff) | |
| parent | d066dfdb835f15fe2c4d2bdb31d88cb948b360ad (diff) | |
| download | rust-3f1be1ec7ec3d8e80beb381ee82164a0aa3ca777.tar.gz rust-3f1be1ec7ec3d8e80beb381ee82164a0aa3ca777.zip | |
Auto merge of #132145 - RalfJung:stdarch, r=Amanieu
bump stdarch This lets us remove a hack from https://github.com/rust-lang/rust/pull/131349. r? `@Amanieu` try-job: test-various
Diffstat (limited to 'compiler/rustc_error_codes/src')
| -rw-r--r-- | compiler/rustc_error_codes/src/error_codes/E0539.md | 1 | ||||
| -rw-r--r-- | compiler/rustc_error_codes/src/error_codes/E0542.md | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/compiler/rustc_error_codes/src/error_codes/E0539.md b/compiler/rustc_error_codes/src/error_codes/E0539.md index cd28afbc48d..6b2e23ba2d8 100644 --- a/compiler/rustc_error_codes/src/error_codes/E0539.md +++ b/compiler/rustc_error_codes/src/error_codes/E0539.md @@ -45,6 +45,7 @@ const fn unstable_fn() {} #[stable(feature = "stable_struct", since = "1.39.0")] // ok! struct Stable; +#[stable(feature = "stable_fn", since = "1.39.0")] #[rustc_const_stable(feature = "stable_fn", since = "1.39.0")] // ok! const fn stable_fn() {} ``` diff --git a/compiler/rustc_error_codes/src/error_codes/E0542.md b/compiler/rustc_error_codes/src/error_codes/E0542.md index be186dbd2cc..70590f2e48e 100644 --- a/compiler/rustc_error_codes/src/error_codes/E0542.md +++ b/compiler/rustc_error_codes/src/error_codes/E0542.md @@ -30,6 +30,7 @@ To fix this issue, you need to provide the `since` field. Example: #[stable(feature = "_stable_fn", since = "1.0.0")] // ok! fn _stable_fn() {} +#[stable(feature = "_stable_const_fn", since = "1.0.0")] #[rustc_const_stable(feature = "_stable_const_fn", since = "1.0.0")] // ok! const fn _stable_const_fn() {} |