diff options
| author | Matthias Krüger <476013+matthiaskrgr@users.noreply.github.com> | 2025-03-24 20:40:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-24 20:40:07 +0100 |
| commit | 0c25157784b85d4a8f80ee5ef69b3d3db31e010e (patch) | |
| tree | 53239074ad2c10c639ec22d78ac0821e6a13b85b | |
| parent | b1575941653ca9cdfbd3c9342fa040827e8527d3 (diff) | |
| parent | 7b9d5b8758589db0cda82be95e43f41be48e9311 (diff) | |
| download | rust-0c25157784b85d4a8f80ee5ef69b3d3db31e010e.tar.gz rust-0c25157784b85d4a8f80ee5ef69b3d3db31e010e.zip | |
Rollup merge of #138800 - RalfJung:const_box, r=oli-obk
remove remnants of const_box feature This feature requires major design work, and the few methods it gates currently aren't actually useful. Let's reset to a clean slate so when a design materializes, we can start from scratch. Closes https://github.com/rust-lang/rust/issues/92521 by removing the feature it tracks. r? ````@oli-obk````
| -rw-r--r-- | library/alloc/src/boxed.rs | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/library/alloc/src/boxed.rs b/library/alloc/src/boxed.rs index e77caad6540..4644e37f809 100644 --- a/library/alloc/src/boxed.rs +++ b/library/alloc/src/boxed.rs @@ -1149,9 +1149,8 @@ impl<T: ?Sized, A: Allocator> Box<T, A> { /// /// [memory layout]: self#memory-layout #[unstable(feature = "allocator_api", issue = "32838")] - #[rustc_const_unstable(feature = "const_box", issue = "92521")] #[inline] - pub const unsafe fn from_raw_in(raw: *mut T, alloc: A) -> Self { + pub unsafe fn from_raw_in(raw: *mut T, alloc: A) -> Self { Box(unsafe { Unique::new_unchecked(raw) }, alloc) } @@ -1203,9 +1202,8 @@ impl<T: ?Sized, A: Allocator> Box<T, A> { /// [memory layout]: self#memory-layout #[unstable(feature = "allocator_api", issue = "32838")] // #[unstable(feature = "box_vec_non_null", reason = "new API", issue = "130364")] - #[rustc_const_unstable(feature = "const_box", issue = "92521")] #[inline] - pub const unsafe fn from_non_null_in(raw: NonNull<T>, alloc: A) -> Self { + pub unsafe fn from_non_null_in(raw: NonNull<T>, alloc: A) -> Self { // SAFETY: guaranteed by the caller. unsafe { Box::from_raw_in(raw.as_ptr(), alloc) } } @@ -1550,9 +1548,8 @@ impl<T: ?Sized, A: Allocator> Box<T, A> { /// to call it as `Box::allocator(&b)` instead of `b.allocator()`. This /// is so that there is no conflict with a method on the inner type. #[unstable(feature = "allocator_api", issue = "32838")] - #[rustc_const_unstable(feature = "const_box", issue = "92521")] #[inline] - pub const fn allocator(b: &Self) -> &A { + pub fn allocator(b: &Self) -> &A { &b.1 } @@ -1639,8 +1636,7 @@ impl<T: ?Sized, A: Allocator> Box<T, A> { /// let bar = Pin::from(foo); /// ``` #[stable(feature = "box_into_pin", since = "1.63.0")] - #[rustc_const_unstable(feature = "const_box", issue = "92521")] - pub const fn into_pin(boxed: Self) -> Pin<Self> + pub fn into_pin(boxed: Self) -> Pin<Self> where A: 'static, { |
