Rollup merge of #80022 - ssomers:btree_cleanup_8, r=Mark-Simulacrum
BTreeSet: simplify implementation of pop_first/pop_last …and stop it interfering in #79245. r? ```````@Mark-Simulacrum```````
This commit is contained in:
commit
53af11651b
|
@ -679,7 +679,7 @@ impl<T: Ord> BTreeSet<T> {
|
|||
/// ```
|
||||
#[unstable(feature = "map_first_last", issue = "62924")]
|
||||
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.
|
||||
|
@ -701,7 +701,7 @@ impl<T: Ord> BTreeSet<T> {
|
|||
/// ```
|
||||
#[unstable(feature = "map_first_last", issue = "62924")]
|
||||
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.
|
||||
|
|
Loading…
Reference in New Issue