Constantify more BTreeMap and BTreeSet functions
- BTreeMap::len - BTreeMap::is_empty - BTreeSet::len - BTreeSet::is_empty
This commit is contained in:
parent
388ef34904
commit
307cc11beb
4 changed files with 22 additions and 4 deletions
|
@ -2188,7 +2188,8 @@ impl<K, V> BTreeMap<K, V> {
|
||||||
/// assert_eq!(a.len(), 1);
|
/// assert_eq!(a.len(), 1);
|
||||||
/// ```
|
/// ```
|
||||||
#[stable(feature = "rust1", since = "1.0.0")]
|
#[stable(feature = "rust1", since = "1.0.0")]
|
||||||
pub fn len(&self) -> usize {
|
#[rustc_const_unstable(feature = "const_btree_new", issue = "71835")]
|
||||||
|
pub const fn len(&self) -> usize {
|
||||||
self.length
|
self.length
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2207,7 +2208,8 @@ impl<K, V> BTreeMap<K, V> {
|
||||||
/// assert!(!a.is_empty());
|
/// assert!(!a.is_empty());
|
||||||
/// ```
|
/// ```
|
||||||
#[stable(feature = "rust1", since = "1.0.0")]
|
#[stable(feature = "rust1", since = "1.0.0")]
|
||||||
pub fn is_empty(&self) -> bool {
|
#[rustc_const_unstable(feature = "const_btree_new", issue = "71835")]
|
||||||
|
pub const fn is_empty(&self) -> bool {
|
||||||
self.len() == 0
|
self.len() == 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1527,6 +1527,13 @@ fn test_send() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[allow(dead_code)]
|
||||||
|
fn test_const() {
|
||||||
|
const MAP: &'static BTreeMap<(), ()> = &BTreeMap::new();
|
||||||
|
const LEN: usize = MAP.len();
|
||||||
|
const IS_EMPTY: bool = MAP.is_empty();
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_occupied_entry_key() {
|
fn test_occupied_entry_key() {
|
||||||
let mut a = BTreeMap::new();
|
let mut a = BTreeMap::new();
|
||||||
|
|
|
@ -950,7 +950,8 @@ impl<T> BTreeSet<T> {
|
||||||
/// assert_eq!(v.len(), 1);
|
/// assert_eq!(v.len(), 1);
|
||||||
/// ```
|
/// ```
|
||||||
#[stable(feature = "rust1", since = "1.0.0")]
|
#[stable(feature = "rust1", since = "1.0.0")]
|
||||||
pub fn len(&self) -> usize {
|
#[rustc_const_unstable(feature = "const_btree_new", issue = "71835")]
|
||||||
|
pub const fn len(&self) -> usize {
|
||||||
self.map.len()
|
self.map.len()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -967,7 +968,8 @@ impl<T> BTreeSet<T> {
|
||||||
/// assert!(!v.is_empty());
|
/// assert!(!v.is_empty());
|
||||||
/// ```
|
/// ```
|
||||||
#[stable(feature = "rust1", since = "1.0.0")]
|
#[stable(feature = "rust1", since = "1.0.0")]
|
||||||
pub fn is_empty(&self) -> bool {
|
#[rustc_const_unstable(feature = "const_btree_new", issue = "71835")]
|
||||||
|
pub const fn is_empty(&self) -> bool {
|
||||||
self.len() == 0
|
self.len() == 0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,6 +15,13 @@ fn test_clone_eq() {
|
||||||
assert_eq!(m.clone(), m);
|
assert_eq!(m.clone(), m);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[allow(dead_code)]
|
||||||
|
fn test_const() {
|
||||||
|
const SET: &'static BTreeSet<()> = &BTreeSet::new();
|
||||||
|
const LEN: usize = SET.len();
|
||||||
|
const IS_EMPTY: bool = SET.is_empty();
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_iter_min_max() {
|
fn test_iter_min_max() {
|
||||||
let mut a = BTreeSet::new();
|
let mut a = BTreeSet::new();
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue