diff options
| author | Trevor Gross <t.gross35@gmail.com> | 2024-10-11 16:53:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-11 16:53:48 -0500 |
| commit | 622fc5e0f3e4be4b1e81ffb643c87a5ce3d8be03 (patch) | |
| tree | 4bf45941f54caabccfacaa931321967922bc6a36 | |
| parent | 8797cfed68d8c35737618848165fdd059fb0ac7d (diff) | |
| parent | 92f65684a8433ade29d8fea8c258dd7eed22ea3f (diff) | |
| download | rust-622fc5e0f3e4be4b1e81ffb643c87a5ce3d8be03.tar.gz rust-622fc5e0f3e4be4b1e81ffb643c87a5ce3d8be03.zip | |
Rollup merge of #131287 - RalfJung:const_result, r=tgross35
stabilize const_result Waiting for FCP to complete in https://github.com/rust-lang/rust/issues/82814 Fixes #82814
| -rw-r--r-- | library/core/src/result.rs | 13 | ||||
| -rw-r--r-- | library/core/tests/lib.rs | 1 |
2 files changed, 9 insertions, 5 deletions
diff --git a/library/core/src/result.rs b/library/core/src/result.rs index 610edae48d3..95faacbf96d 100644 --- a/library/core/src/result.rs +++ b/library/core/src/result.rs @@ -734,7 +734,8 @@ impl<T, E> Result<T, E> { /// ``` #[inline] #[stable(feature = "rust1", since = "1.0.0")] - #[rustc_const_unstable(feature = "const_result", issue = "82814")] + #[rustc_const_stable(feature = "const_result", since = "CURRENT_RUSTC_VERSION")] + #[cfg_attr(bootstrap, rustc_allow_const_fn_unstable(const_mut_refs))] pub const fn as_mut(&mut self) -> Result<&mut T, &mut E> { match *self { Ok(ref mut x) => Ok(x), @@ -1536,7 +1537,8 @@ impl<T, E> Result<&T, E> { /// ``` #[inline] #[stable(feature = "result_copied", since = "1.59.0")] - #[rustc_const_unstable(feature = "const_result", issue = "82814")] + #[rustc_const_stable(feature = "const_result", since = "CURRENT_RUSTC_VERSION")] + #[rustc_allow_const_fn_unstable(const_precise_live_drops)] pub const fn copied(self) -> Result<T, E> where T: Copy, @@ -1586,7 +1588,9 @@ impl<T, E> Result<&mut T, E> { /// ``` #[inline] #[stable(feature = "result_copied", since = "1.59.0")] - #[rustc_const_unstable(feature = "const_result", issue = "82814")] + #[rustc_const_stable(feature = "const_result", since = "CURRENT_RUSTC_VERSION")] + #[cfg_attr(bootstrap, rustc_allow_const_fn_unstable(const_mut_refs))] + #[rustc_allow_const_fn_unstable(const_precise_live_drops)] pub const fn copied(self) -> Result<T, E> where T: Copy, @@ -1639,7 +1643,8 @@ impl<T, E> Result<Option<T>, E> { /// ``` #[inline] #[stable(feature = "transpose_result", since = "1.33.0")] - #[rustc_const_unstable(feature = "const_result", issue = "82814")] + #[rustc_const_stable(feature = "const_result", since = "CURRENT_RUSTC_VERSION")] + #[rustc_allow_const_fn_unstable(const_precise_live_drops)] pub const fn transpose(self) -> Option<Result<T, E>> { match self { Ok(Some(x)) => Some(Ok(x)), diff --git a/library/core/tests/lib.rs b/library/core/tests/lib.rs index e86ed83f53f..8ee98de2a7b 100644 --- a/library/core/tests/lib.rs +++ b/library/core/tests/lib.rs @@ -29,7 +29,6 @@ #![feature(const_pin)] #![feature(const_pointer_is_aligned)] #![feature(const_ptr_write)] -#![feature(const_result)] #![feature(const_three_way_compare)] #![feature(const_trait_impl)] #![feature(core_intrinsics)] |