Skip to content

Commit d572a90

Browse files
committed
Make Default const and add some const Default impls
Full list of `impl const Default` types: - () - bool - char - std::ascii::Char - usize - u8 - u16 - u32 - u64 - u128 - i8 - i16 - i32 - i64 - i128 - f16 - f32 - f64 - f128 - std::marker::PhantomData<T> - Option<T> - std::iter::Empty<T> - std::ptr::Alignment - &[T] - &mut [T] - &str - &mut str - String - Vec<T>
1 parent 409998c commit d572a90

File tree

12 files changed

+72
-11
lines changed

12 files changed

+72
-11
lines changed

library/alloc/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@
107107
#![feature(coerce_unsized)]
108108
#![feature(const_eval_select)]
109109
#![feature(const_heap)]
110+
#![feature(const_trait_impl)]
110111
#![feature(core_intrinsics)]
111112
#![feature(deprecated_suggestion)]
112113
#![feature(deref_pure_trait)]

library/alloc/src/string.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -2483,7 +2483,8 @@ impl_eq! { Cow<'a, str>, &'b str }
24832483
impl_eq! { Cow<'a, str>, String }
24842484

24852485
#[stable(feature = "rust1", since = "1.0.0")]
2486-
impl Default for String {
2486+
#[rustc_const_unstable(feature = "const_default", issue = "none")]
2487+
impl const Default for String {
24872488
/// Creates an empty `String`.
24882489
#[inline]
24892490
fn default() -> String {

library/alloc/src/vec/mod.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -3783,7 +3783,8 @@ unsafe impl<#[may_dangle] T, A: Allocator> Drop for Vec<T, A> {
37833783
}
37843784

37853785
#[stable(feature = "rust1", since = "1.0.0")]
3786-
impl<T> Default for Vec<T> {
3786+
#[rustc_const_unstable(feature = "const_default", issue = "none")]
3787+
impl<T> const Default for Vec<T> {
37873788
/// Creates an empty `Vec<T>`.
37883789
///
37893790
/// The vector will not allocate until elements are pushed onto it.

library/core/src/default.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ use crate::ascii::Char as AsciiChar;
103103
/// ```
104104
#[cfg_attr(not(test), rustc_diagnostic_item = "Default")]
105105
#[stable(feature = "rust1", since = "1.0.0")]
106+
#[const_trait]
106107
#[rustc_trivial_field_reads]
107108
pub trait Default: Sized {
108109
/// Returns the "default value" for a type.
@@ -150,7 +151,8 @@ pub macro Default($item:item) {
150151
macro_rules! default_impl {
151152
($t:ty, $v:expr, $doc:tt) => {
152153
#[stable(feature = "rust1", since = "1.0.0")]
153-
impl Default for $t {
154+
#[rustc_const_unstable(feature = "const_default", issue = "none")]
155+
impl const Default for $t {
154156
#[inline(always)]
155157
#[doc = $doc]
156158
fn default() -> $t {

library/core/src/iter/sources/empty.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ impl<T> Clone for Empty<T> {
8181
// not #[derive] because that adds a Default bound on T,
8282
// which isn't necessary.
8383
#[stable(feature = "iter_empty", since = "1.2.0")]
84-
impl<T> Default for Empty<T> {
84+
#[rustc_const_unstable(feature = "const_default", issue = "none")]
85+
impl<T> const Default for Empty<T> {
8586
fn default() -> Empty<T> {
8687
Empty(marker::PhantomData)
8788
}

library/core/src/marker.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -797,7 +797,8 @@ impl<T: ?Sized> Clone for PhantomData<T> {
797797
}
798798

799799
#[stable(feature = "rust1", since = "1.0.0")]
800-
impl<T: ?Sized> Default for PhantomData<T> {
800+
#[rustc_const_unstable(feature = "const_default", issue = "none")]
801+
impl<T: ?Sized> const Default for PhantomData<T> {
801802
fn default() -> Self {
802803
Self
803804
}

library/core/src/option.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -2051,7 +2051,8 @@ where
20512051
}
20522052

20532053
#[stable(feature = "rust1", since = "1.0.0")]
2054-
impl<T> Default for Option<T> {
2054+
#[rustc_const_unstable(feature = "const_default", issue = "none")]
2055+
impl<T> const Default for Option<T> {
20552056
/// Returns [`None`][Option::None].
20562057
///
20572058
/// # Examples

library/core/src/ptr/alignment.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,8 @@ impl hash::Hash for Alignment {
223223

224224
/// Returns [`Alignment::MIN`], which is valid for any type.
225225
#[unstable(feature = "ptr_alignment_type", issue = "102070")]
226-
impl Default for Alignment {
226+
#[rustc_const_unstable(feature = "const_default", issue = "none")]
227+
impl const Default for Alignment {
227228
fn default() -> Alignment {
228229
Alignment::MIN
229230
}

library/core/src/slice/mod.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -4925,15 +4925,17 @@ where
49254925
}
49264926

49274927
#[stable(feature = "rust1", since = "1.0.0")]
4928-
impl<T> Default for &[T] {
4928+
#[rustc_const_unstable(feature = "const_default", issue = "none")]
4929+
impl<T> const Default for &[T] {
49294930
/// Creates an empty slice.
49304931
fn default() -> Self {
49314932
&[]
49324933
}
49334934
}
49344935

49354936
#[stable(feature = "mut_slice_default", since = "1.5.0")]
4936-
impl<T> Default for &mut [T] {
4937+
#[rustc_const_unstable(feature = "const_default", issue = "none")]
4938+
impl<T> const Default for &mut [T] {
49374939
/// Creates a mutable empty slice.
49384940
fn default() -> Self {
49394941
&mut []

library/core/src/str/mod.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -2794,7 +2794,8 @@ impl AsRef<[u8]> for str {
27942794
}
27952795

27962796
#[stable(feature = "rust1", since = "1.0.0")]
2797-
impl Default for &str {
2797+
#[rustc_const_unstable(feature = "const_default", issue = "none")]
2798+
impl const Default for &str {
27982799
/// Creates an empty str
27992800
#[inline]
28002801
fn default() -> Self {
@@ -2803,7 +2804,8 @@ impl Default for &str {
28032804
}
28042805

28052806
#[stable(feature = "default_mut_str", since = "1.28.0")]
2806-
impl Default for &mut str {
2807+
#[rustc_const_unstable(feature = "const_default", issue = "none")]
2808+
impl const Default for &mut str {
28072809
/// Creates an empty mutable str
28082810
#[inline]
28092811
fn default() -> Self {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
//@ run-pass
2+
#![feature(const_trait_impl)]
3+
#![allow(dead_code)]
4+
// alloc::string
5+
const STRING: String = Default::default();
6+
// alloc::vec
7+
const VEC: Vec<()> = Default::default();
8+
9+
fn main() {}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
//@ run-pass
2+
#![feature(const_trait_impl, ptr_alignment_type, ascii_char, f16, f128)]
3+
#![allow(dead_code)]
4+
// core::default
5+
const UNIT: () = Default::default();
6+
const BOOL: bool = Default::default();
7+
const CHAR: char = Default::default();
8+
const ASCII_CHAR: std::ascii::Char = Default::default();
9+
const USIZE: usize = Default::default();
10+
const U8: u8 = Default::default();
11+
const U16: u16 = Default::default();
12+
const U32: u32 = Default::default();
13+
const U64: u64 = Default::default();
14+
const U128: u128 = Default::default();
15+
const I8: i8 = Default::default();
16+
const I16: i16 = Default::default();
17+
const I32: i32 = Default::default();
18+
const I64: i64 = Default::default();
19+
const I128: i128 = Default::default();
20+
const F16: f16 = Default::default();
21+
const F32: f32 = Default::default();
22+
const F64: f64 = Default::default();
23+
const F128: f128 = Default::default();
24+
// core::marker
25+
const PHANTOM: std::marker::PhantomData<()> = Default::default();
26+
// core::option
27+
const OPT: Option<i32> = Default::default();
28+
// core::iter::sources::empty
29+
const EMPTY: std::iter::Empty<()> = Default::default();
30+
// core::ptr::alignment
31+
const ALIGNMENT: std::ptr::Alignment = Default::default();
32+
// core::slice
33+
const SLICE: &[()] = Default::default();
34+
const MUT_SLICE: &mut [()] = Default::default();
35+
//core::str
36+
const STR: &str = Default::default();
37+
const MUT_STR: &mut str = Default::default();
38+
39+
fn main() {}

0 commit comments

Comments
 (0)