mirror of
https://github.com/martinvonz/jj.git
synced 2024-10-25 07:56:16 +00:00
76974a9050
Originally, I had thought that these warnings would only potentially show up in nightly because there was a feature which exposed these functions, and we would be able to enable that feature and conditionally not define the conflicting methods. But it looks like these warnings also show up in stable. I've just suppressed each of them individually. Other options would be to rename them and just make them wrapper methods, or to disable `unstable_name_collisions` warnings at a higher scope (possibly including at the crate level).
94 lines
2.6 KiB
Rust
94 lines
2.6 KiB
Rust
#[cfg(feature = "map_first_last")]
|
|
pub trait BTreeMapExt<K, V> {
|
|
fn first_key(&self) -> Option<&K>;
|
|
fn last_key(&self) -> Option<&K>;
|
|
fn pop_first_value(&mut self) -> Option<V>;
|
|
fn pop_last_value(&mut self) -> Option<V>;
|
|
}
|
|
|
|
#[cfg(feature = "map_first_last")]
|
|
impl<K: Ord + Clone, V> BTreeMapExt<K, V> for std::collections::BTreeMap<K, V> {
|
|
fn first_key(&self) -> Option<&K> {
|
|
self.keys().next()
|
|
}
|
|
|
|
fn last_key(&self) -> Option<&K> {
|
|
self.keys().next_back()
|
|
}
|
|
fn pop_first_value(&mut self) -> Option<V> {
|
|
self.first_entry().map(|x| x.remove())
|
|
}
|
|
|
|
fn pop_last_value(&mut self) -> Option<V> {
|
|
self.last_entry().map(|x| x.remove())
|
|
}
|
|
}
|
|
|
|
#[cfg(not(feature = "map_first_last"))]
|
|
pub trait BTreeMapExt<K, V> {
|
|
fn first_key(&self) -> Option<&K>;
|
|
fn last_key(&self) -> Option<&K>;
|
|
fn pop_first_key(&mut self) -> Option<K>;
|
|
fn pop_last_key(&mut self) -> Option<K>;
|
|
fn pop_first_value(&mut self) -> Option<V>;
|
|
fn pop_last_value(&mut self) -> Option<V>;
|
|
}
|
|
|
|
#[cfg(not(feature = "map_first_last"))]
|
|
impl<K: Ord + Clone, V> BTreeMapExt<K, V> for std::collections::BTreeMap<K, V> {
|
|
fn first_key(&self) -> Option<&K> {
|
|
self.keys().next()
|
|
}
|
|
|
|
fn last_key(&self) -> Option<&K> {
|
|
self.keys().next_back()
|
|
}
|
|
|
|
fn pop_first_key(&mut self) -> Option<K> {
|
|
let key = self.first_key()?;
|
|
let key = key.clone(); // ownership hack
|
|
Some(self.remove_entry(&key).unwrap().0)
|
|
}
|
|
|
|
fn pop_last_key(&mut self) -> Option<K> {
|
|
let key = self.last_key()?;
|
|
let key = key.clone(); // ownership hack
|
|
Some(self.remove_entry(&key).unwrap().0)
|
|
}
|
|
|
|
fn pop_first_value(&mut self) -> Option<V> {
|
|
let key = self.first_key()?;
|
|
let key = key.clone(); // ownership hack
|
|
Some(self.remove_entry(&key).unwrap().1)
|
|
}
|
|
|
|
fn pop_last_value(&mut self) -> Option<V> {
|
|
let key = self.last_key()?;
|
|
let key = key.clone(); // ownership hack
|
|
Some(self.remove_entry(&key).unwrap().1)
|
|
}
|
|
}
|
|
|
|
#[cfg(feature = "map_first_last")]
|
|
pub trait BTreeSetExt<K> {}
|
|
|
|
#[cfg(not(feature = "map_first_last"))]
|
|
pub trait BTreeSetExt<K> {
|
|
fn last(&self) -> Option<&K>;
|
|
fn pop_last(&mut self) -> Option<K>;
|
|
}
|
|
|
|
#[cfg(not(feature = "map_first_last"))]
|
|
impl<K: Ord + Clone> BTreeSetExt<K> for std::collections::BTreeSet<K> {
|
|
fn last(&self) -> Option<&K> {
|
|
self.iter().next_back()
|
|
}
|
|
|
|
fn pop_last(&mut self) -> Option<K> {
|
|
#[allow(unstable_name_collisions)]
|
|
let key = self.last()?;
|
|
let key = key.clone(); // ownership hack
|
|
self.take(&key)
|
|
}
|
|
}
|