Skip to content

Commit f479036

Browse files
authored
Rollup merge of #95947 - cuviper:default-box, r=dtolnay
`impl const Default for Box<[T]>` and `Box<str>` The unstable `const_default_impls` (#87864) already include empty `Vec<T>` and `String`. Now we extend that concept to `Box<[T]>` and `Box<str>` as well. This obviates a hack in `rustc_ast`'s `P::<[T]>::new`.
2 parents 216fd73 + 7e0e46a commit f479036

File tree

2 files changed

+18
-4
lines changed

2 files changed

+18
-4
lines changed

alloc/src/boxed.rs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,17 +1192,25 @@ impl<T: Default> Default for Box<T> {
11921192

11931193
#[cfg(not(no_global_oom_handling))]
11941194
#[stable(feature = "rust1", since = "1.0.0")]
1195-
impl<T> Default for Box<[T]> {
1195+
#[rustc_const_unstable(feature = "const_default_impls", issue = "87864")]
1196+
impl<T> const Default for Box<[T]> {
11961197
fn default() -> Self {
1197-
Box::<[T; 0]>::new([])
1198+
let ptr: Unique<[T]> = Unique::<[T; 0]>::dangling();
1199+
Box(ptr, Global)
11981200
}
11991201
}
12001202

12011203
#[cfg(not(no_global_oom_handling))]
12021204
#[stable(feature = "default_box_extra", since = "1.17.0")]
1203-
impl Default for Box<str> {
1205+
#[rustc_const_unstable(feature = "const_default_impls", issue = "87864")]
1206+
impl const Default for Box<str> {
12041207
fn default() -> Self {
1205-
unsafe { from_boxed_utf8_unchecked(Default::default()) }
1208+
// SAFETY: This is the same as `Unique::cast<U>` but with an unsized `U = str`.
1209+
let ptr: Unique<str> = unsafe {
1210+
let bytes: Unique<[u8]> = Unique::<[u8; 0]>::dangling();
1211+
Unique::new_unchecked(bytes.as_ptr() as *mut str)
1212+
};
1213+
Box(ptr, Global)
12061214
}
12071215
}
12081216

alloc/tests/const_fns.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ pub const MY_VEC2: Vec<usize> = Default::default();
66
pub const MY_STRING: String = String::new();
77
pub const MY_STRING2: String = Default::default();
88

9+
pub const MY_BOXED_SLICE: Box<[usize]> = Default::default();
10+
pub const MY_BOXED_STR: Box<str> = Default::default();
11+
912
use std::collections::{BTreeMap, BTreeSet};
1013

1114
pub const MY_BTREEMAP: BTreeMap<usize, usize> = BTreeMap::new();
@@ -23,6 +26,9 @@ fn test_const() {
2326
assert_eq!(MY_VEC, MY_VEC2);
2427
assert_eq!(MY_STRING, MY_STRING2);
2528

29+
assert_eq!(MY_VEC, *MY_BOXED_SLICE);
30+
assert_eq!(MY_STRING, *MY_BOXED_STR);
31+
2632
assert_eq!(MAP_LEN, 0);
2733
assert_eq!(SET_LEN, 0);
2834
assert!(MAP_IS_EMPTY && SET_IS_EMPTY);

0 commit comments

Comments
 (0)