bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

BTreeSet: simplify implementation of pop_first/pop_last

Browse source
This commit is contained in:
Stein Somers 2020-11-20 21:29:00 +01:00
parent 7feab000b2
commit 6c7835e441
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -679,7 +679,7 @@ impl<T: Ord> BTreeSet<T> {
/// ``` /// ```
#[unstable(feature = "map_first_last", issue = "62924")] #[unstable(feature = "map_first_last", issue = "62924")]
pub fn pop_first(&mut self) -> Option<T> { pub fn pop_first(&mut self) -> Option<T> {
self.map.first_entry().map(|entry| entry.remove_entry().0) self.map.pop_first().map(|kv| kv.0)
} }
/// Removes the last value from the set and returns it, if any. /// Removes the last value from the set and returns it, if any.
@ -701,7 +701,7 @@ impl<T: Ord> BTreeSet<T> {
/// ``` /// ```
#[unstable(feature = "map_first_last", issue = "62924")] #[unstable(feature = "map_first_last", issue = "62924")]
pub fn pop_last(&mut self) -> Option<T> { pub fn pop_last(&mut self) -> Option<T> {
self.map.last_entry().map(|entry| entry.remove_entry().0) self.map.pop_last().map(|kv| kv.0)
} }
/// Adds a value to the set. /// Adds a value to the set.