forked from clap-rs/clap
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor: Move off of IndexMap/HashMap
This dropped 17KB Again, performance shouldn't be too bad as the total number of argument id's passed in by the user shouldn't be huge, with the upper end being 5-15 except for in extreme cases like rustc accepting arguments from cargo via a file.
- Loading branch information
Showing
8 changed files
with
206 additions
and
16 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,190 @@ | ||
| use std::borrow::Borrow; | ||
|
|
||
| /// Flat (Vec) backed map | ||
| /// | ||
| /// This preserves insertion order | ||
| #[derive(Clone, Debug, PartialEq, Eq)] | ||
| pub(crate) struct FlatMap<K, V> { | ||
| keys: Vec<K>, | ||
| values: Vec<V>, | ||
| } | ||
|
|
||
| impl<K: PartialEq + Eq, V> FlatMap<K, V> { | ||
| pub(crate) fn new() -> Self { | ||
| Default::default() | ||
| } | ||
|
|
||
| pub(crate) fn insert(&mut self, key: K, mut value: V) -> Option<V> { | ||
| for (index, existing) in self.keys.iter().enumerate() { | ||
| if *existing == key { | ||
| std::mem::swap(&mut self.values[index], &mut value); | ||
| return Some(value); | ||
| } | ||
| } | ||
|
|
||
| self.keys.push(key); | ||
| self.values.push(value); | ||
| None | ||
| } | ||
|
|
||
| pub fn contains_key<Q: ?Sized>(&self, key: &Q) -> bool | ||
| where | ||
| K: Borrow<Q>, | ||
| Q: std::hash::Hash + Eq, | ||
| { | ||
| for existing in &self.keys { | ||
| if existing.borrow() == key { | ||
| return true; | ||
| } | ||
| } | ||
| false | ||
| } | ||
|
|
||
| pub fn remove<Q: ?Sized>(&mut self, key: &Q) -> Option<V> | ||
| where | ||
| K: Borrow<Q>, | ||
| Q: std::hash::Hash + Eq, | ||
| { | ||
| let index = self | ||
| .keys | ||
| .iter() | ||
| .enumerate() | ||
| .find_map(|(i, k)| (k.borrow() == key).then(|| i))?; | ||
| self.keys.remove(index); | ||
| Some(self.values.remove(index)) | ||
| } | ||
|
|
||
| pub(crate) fn is_empty(&self) -> bool { | ||
| self.keys.is_empty() | ||
| } | ||
|
|
||
| pub fn entry(&mut self, key: K) -> Entry<K, V> { | ||
| for (index, existing) in self.keys.iter().enumerate() { | ||
| if *existing == key { | ||
| return Entry::Occupied(OccupiedEntry { v: self, index }); | ||
| } | ||
| } | ||
| Entry::Vacant(VacantEntry { v: self, key }) | ||
| } | ||
|
|
||
| pub fn get<Q: ?Sized>(&self, k: &Q) -> Option<&V> | ||
| where | ||
| K: Borrow<Q>, | ||
| Q: std::hash::Hash + Eq, | ||
| { | ||
| for (index, existing) in self.keys.iter().enumerate() { | ||
| if existing.borrow() == k { | ||
| return Some(&self.values[index]); | ||
| } | ||
| } | ||
| None | ||
| } | ||
|
|
||
| pub fn get_mut<Q: ?Sized>(&mut self, k: &Q) -> Option<&mut V> | ||
| where | ||
| K: Borrow<Q>, | ||
| Q: std::hash::Hash + Eq, | ||
| { | ||
| for (index, existing) in self.keys.iter().enumerate() { | ||
| if existing.borrow() == k { | ||
| return Some(&mut self.values[index]); | ||
| } | ||
| } | ||
| None | ||
| } | ||
|
|
||
| pub fn keys(&self) -> std::slice::Iter<'_, K> { | ||
| self.keys.iter() | ||
| } | ||
|
|
||
| pub fn iter_mut(&mut self) -> IterMut<K, V> { | ||
| IterMut { | ||
| keys: self.keys.iter_mut(), | ||
| values: self.values.iter_mut(), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl<K: PartialEq + Eq, V> Default for FlatMap<K, V> { | ||
| fn default() -> Self { | ||
| Self { | ||
| keys: Default::default(), | ||
| values: Default::default(), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| pub enum Entry<'a, K: 'a, V: 'a> { | ||
| Vacant(VacantEntry<'a, K, V>), | ||
| Occupied(OccupiedEntry<'a, K, V>), | ||
| } | ||
|
|
||
| impl<'a, K: 'a, V: 'a> Entry<'a, K, V> { | ||
| pub fn or_insert(self, default: V) -> &'a mut V { | ||
| match self { | ||
| Entry::Occupied(entry) => &mut entry.v.values[entry.index], | ||
| Entry::Vacant(entry) => { | ||
| entry.v.keys.push(entry.key); | ||
| entry.v.values.push(default); | ||
| entry.v.values.last_mut().unwrap() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| pub fn or_insert_with<F: FnOnce() -> V>(self, default: F) -> &'a mut V { | ||
| match self { | ||
| Entry::Occupied(entry) => &mut entry.v.values[entry.index], | ||
| Entry::Vacant(entry) => { | ||
| entry.v.keys.push(entry.key); | ||
| entry.v.values.push(default()); | ||
| entry.v.values.last_mut().unwrap() | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| pub struct VacantEntry<'a, K: 'a, V: 'a> { | ||
| v: &'a mut FlatMap<K, V>, | ||
| key: K, | ||
| } | ||
|
|
||
| pub struct OccupiedEntry<'a, K: 'a, V: 'a> { | ||
| v: &'a mut FlatMap<K, V>, | ||
| index: usize, | ||
| } | ||
|
|
||
| pub struct IterMut<'a, K: 'a, V: 'a> { | ||
| keys: std::slice::IterMut<'a, K>, | ||
| values: std::slice::IterMut<'a, V>, | ||
| } | ||
|
|
||
| impl<'a, K, V> Iterator for IterMut<'a, K, V> { | ||
| type Item = (&'a K, &'a mut V); | ||
|
|
||
| fn next(&mut self) -> Option<(&'a K, &'a mut V)> { | ||
| match self.keys.next() { | ||
| Some(k) => { | ||
| let v = self.values.next().unwrap(); | ||
| Some((k, v)) | ||
| } | ||
| None => None, | ||
| } | ||
| } | ||
| fn size_hint(&self) -> (usize, Option<usize>) { | ||
| self.keys.size_hint() | ||
| } | ||
| } | ||
|
|
||
| impl<'a, K, V> DoubleEndedIterator for IterMut<'a, K, V> { | ||
| fn next_back(&mut self) -> Option<(&'a K, &'a mut V)> { | ||
| match self.keys.next_back() { | ||
| Some(k) => { | ||
| let v = self.values.next_back().unwrap(); | ||
| Some((k, v)) | ||
| } | ||
| None => None, | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl<'a, K, V> ExactSizeIterator for IterMut<'a, K, V> {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters