diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-04-17 08:09:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-17 08:09:40 +0200 |
| commit | 1795bf82229ee929203d9548edf13adf514429d4 (patch) | |
| tree | c6f0123849108394749edf126df7d799311ec14d /compiler/rustc_data_structures/src | |
| parent | 6e9a52cdc0c053f678757dca30df6b841df6408e (diff) | |
| parent | 543f8bc38c78c05319b5774ec2337c6d3c9b434b (diff) | |
| download | rust-1795bf82229ee929203d9548edf13adf514429d4.tar.gz rust-1795bf82229ee929203d9548edf13adf514429d4.zip | |
Rollup merge of #110404 - matthiaskrgr:mapmap, r=Nilstrieb
fix clippy::toplevel_ref_arg and ::manual_map r? ``@Nilstrieb``
Diffstat (limited to 'compiler/rustc_data_structures/src')
| -rw-r--r-- | compiler/rustc_data_structures/src/sso/map.rs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/compiler/rustc_data_structures/src/sso/map.rs b/compiler/rustc_data_structures/src/sso/map.rs index 89b8c852649..99581ed2375 100644 --- a/compiler/rustc_data_structures/src/sso/map.rs +++ b/compiler/rustc_data_structures/src/sso/map.rs @@ -256,12 +256,9 @@ impl<K: Eq + Hash, V> SsoHashMap<K, V> { pub fn remove(&mut self, key: &K) -> Option<V> { match self { SsoHashMap::Array(array) => { - if let Some(index) = array.iter().position(|(k, _v)| k == key) { - Some(array.swap_remove(index).1) - } else { - None - } + array.iter().position(|(k, _v)| k == key).map(|index| array.swap_remove(index).1) } + SsoHashMap::Map(map) => map.remove(key), } } |