diff options
| author | The Miri Conjob Bot <miri@cron.bot> | 2023-07-26 06:32:12 +0000 |
|---|---|---|
| committer | The Miri Conjob Bot <miri@cron.bot> | 2023-07-26 06:32:12 +0000 |
| commit | eb3ccfd8410eb3a46ab7babe7ac63d4db5511ce5 (patch) | |
| tree | 6b2403d4192e4adc6e70a4990d7f2c866c0af884 /compiler/rustc_data_structures | |
| parent | c5b26cd3ea0d7b012f1a10395e0b2e01c06d0335 (diff) | |
| parent | 7d773c3304731716cc54db3531ba54067ca55a4a (diff) | |
| download | rust-eb3ccfd8410eb3a46ab7babe7ac63d4db5511ce5.tar.gz rust-eb3ccfd8410eb3a46ab7babe7ac63d4db5511ce5.zip | |
Merge from rustc
Diffstat (limited to 'compiler/rustc_data_structures')
| -rw-r--r-- | compiler/rustc_data_structures/src/sso/map.rs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/compiler/rustc_data_structures/src/sso/map.rs b/compiler/rustc_data_structures/src/sso/map.rs index 99581ed2375..04e359a5470 100644 --- a/compiler/rustc_data_structures/src/sso/map.rs +++ b/compiler/rustc_data_structures/src/sso/map.rs @@ -268,11 +268,7 @@ impl<K: Eq + Hash, V> SsoHashMap<K, V> { pub fn remove_entry(&mut self, key: &K) -> Option<(K, V)> { match self { SsoHashMap::Array(array) => { - if let Some(index) = array.iter().position(|(k, _v)| k == key) { - Some(array.swap_remove(index)) - } else { - None - } + array.iter().position(|(k, _v)| k == key).map(|index| array.swap_remove(index)) } SsoHashMap::Map(map) => map.remove_entry(key), } |