From 543f8bc38c78c05319b5774ec2337c6d3c9b434b Mon Sep 17 00:00:00 2001
From: Matthias Krüger <matthias.krueger@famsik.de>
Date: Sat, 15 Apr 2023 20:18:30 +0200
Subject: fix clippy::toplevel_ref_arg and ::manual_map

---
 compiler/rustc_data_structures/src/sso/map.rs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'compiler/rustc_data_structures/src/sso')

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),
         }
     }
-- 
cgit 1.4.1-3-g733a5