bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Stabilize const BTree{Map,Set}::new

Browse source 
Since `len` and `is_empty` are not const stable yet, this also
creates a new feature for them since they previously used the same
`const_btree_new` feature.
This commit is contained in:
Nilstrieb 2022-09-23 18:03:44 +02:00
parent 4d44e09cb1
commit aa35ab81ea
7 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_hir/src/lib.rs
View file

@ -4,7 +4,7 @@
#![feature(associated_type_defaults)] #![feature(associated_type_defaults)]
#![feature(closure_track_caller)] #![feature(closure_track_caller)]
#![feature(const_btree_new)] #![feature(const_btree_len)]
#![cfg_attr(bootstrap, feature(let_else))] #![cfg_attr(bootstrap, feature(let_else))]
#![feature(once_cell)] #![feature(once_cell)]
#![feature(min_specialization)] #![feature(min_specialization)]

6
library/alloc/src/collections/btree/map.rs
View file

@ -580,7 +580,7 @@ impl<K, V> BTreeMap<K, V> {
/// map.insert(1, "a"); /// map.insert(1, "a");
/// ``` /// ```
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
#[rustc_const_unstable(feature = "const_btree_new", issue = "71835")] #[rustc_const_stable(feature = "const_btree_new", since = "CURRENT_RUSTC_VERSION")]
#[must_use] #[must_use]
pub const fn new() -> BTreeMap<K, V> { pub const fn new() -> BTreeMap<K, V> {
BTreeMap { root: None, length: 0, alloc: ManuallyDrop::new(Global), _marker: PhantomData } BTreeMap { root: None, length: 0, alloc: ManuallyDrop::new(Global), _marker: PhantomData }
@ -2392,7 +2392,7 @@ impl<K, V, A: Allocator + Clone> BTreeMap<K, V, A> {
/// ``` /// ```
#[must_use] #[must_use]
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
#[rustc_const_unstable(feature = "const_btree_new", issue = "71835")] #[rustc_const_unstable(feature = "const_btree_len", issue = "71835")]
pub const fn len(&self) -> usize { pub const fn len(&self) -> usize {
self.length self.length
} }
@ -2413,7 +2413,7 @@ impl<K, V, A: Allocator + Clone> BTreeMap<K, V, A> {
/// ``` /// ```
#[must_use] #[must_use]
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
#[rustc_const_unstable(feature = "const_btree_new", issue = "71835")] #[rustc_const_unstable(feature = "const_btree_len", issue = "71835")]
pub const fn is_empty(&self) -> bool { pub const fn is_empty(&self) -> bool {
self.len() == 0 self.len() == 0
} }

6
library/alloc/src/collections/btree/set.rs
View file

@ -343,7 +343,7 @@ impl<T> BTreeSet<T> {
/// let mut set: BTreeSet<i32> = BTreeSet::new(); /// let mut set: BTreeSet<i32> = BTreeSet::new();
/// ``` /// ```
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
#[rustc_const_unstable(feature = "const_btree_new", issue = "71835")] #[rustc_const_stable(feature = "const_btree_new", since = "CURRENT_RUSTC_VERSION")]
#[must_use] #[must_use]
pub const fn new() -> BTreeSet<T> { pub const fn new() -> BTreeSet<T> {
BTreeSet { map: BTreeMap::new() } BTreeSet { map: BTreeMap::new() }
@ -1174,7 +1174,7 @@ impl<T, A: Allocator + Clone> BTreeSet<T, A> {
/// ``` /// ```
#[must_use] #[must_use]
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
#[rustc_const_unstable(feature = "const_btree_new", issue = "71835")] #[rustc_const_unstable(feature = "const_btree_len", issue = "71835")]
pub const fn len(&self) -> usize { pub const fn len(&self) -> usize {
self.map.len() self.map.len()
} }
@ -1193,7 +1193,7 @@ impl<T, A: Allocator + Clone> BTreeSet<T, A> {
/// ``` /// ```
#[must_use] #[must_use]
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
#[rustc_const_unstable(feature = "const_btree_new", issue = "71835")] #[rustc_const_unstable(feature = "const_btree_len", issue = "71835")]
pub const fn is_empty(&self) -> bool { pub const fn is_empty(&self) -> bool {
self.len() == 0 self.len() == 0
} }

2
library/alloc/src/lib.rs
View file

@ -99,7 +99,7 @@
#![feature(coerce_unsized)] #![feature(coerce_unsized)]
#![cfg_attr(not(no_global_oom_handling), feature(const_alloc_error))] #![cfg_attr(not(no_global_oom_handling), feature(const_alloc_error))]
#![feature(const_box)] #![feature(const_box)]
#![cfg_attr(not(no_global_oom_handling), feature(const_btree_new))] #![cfg_attr(not(no_global_oom_handling), feature(const_btree_len))]
#![feature(const_cow_is_borrowed)] #![feature(const_cow_is_borrowed)]
#![feature(const_convert)] #![feature(const_convert)]
#![feature(const_size_of_val)] #![feature(const_size_of_val)]

2
library/alloc/tests/lib.rs
View file

@ -32,7 +32,7 @@
#![feature(slice_group_by)] #![feature(slice_group_by)]
#![feature(slice_partition_dedup)] #![feature(slice_partition_dedup)]
#![feature(string_remove_matches)] #![feature(string_remove_matches)]
#![feature(const_btree_new)] #![feature(const_btree_len)]
#![feature(const_default_impls)] #![feature(const_default_impls)]
#![feature(const_trait_impl)] #![feature(const_trait_impl)]
#![feature(const_str_from_utf8)] #![feature(const_str_from_utf8)]

2
src/test/ui/consts/issue-88071.rs
View file

@ -2,8 +2,6 @@
// //
// regression test for #88071 // regression test for #88071
#![feature(const_btree_new)]
use std::collections::BTreeMap; use std::collections::BTreeMap;
pub struct CustomMap<K, V>(BTreeMap<K, V>); pub struct CustomMap<K, V>(BTreeMap<K, V>);

6
src/tools/clippy/tests/ui/crashes/ice-7126.rs
View file

@ -1,13 +1,13 @@
// This test requires a feature gated const fn and will stop working in the future. // This test requires a feature gated const fn and will stop working in the future.
#![feature(const_btree_new)] #![feature(const_btree_len)]
use std::collections::BTreeMap; use std::collections::BTreeMap;
struct Foo(BTreeMap<i32, i32>); struct Foo(usize);
impl Foo { impl Foo {
fn new() -> Self { fn new() -> Self {
Self(BTreeMap::new()) Self(BTreeMap::len(&BTreeMap::<u8, u8>::new()))
} }
} }