Use matching pattern and Entry enum to add listener

Signed-off-by: Florentin Dubois <florentin.dubois@clever-cloud.com>
sozu-proxy · Aug 3, 2022 · 9054d9c · 9054d9c
1 parent a9959ba
commit 9054d9c
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 28 deletions.
diff --git a/lib/src/http.rs b/lib/src/http.rs
@@ -1400,12 +1400,12 @@ impl Proxy {
     }
 
     pub fn add_listener(&mut self, config: HttpListener, token: Token) -> Option<Token> {
-        if let Entry::Vacant(e) = self.listeners.entry(token) {
-            let listener = Rc::new(RefCell::new(Listener::new(config, token)));
-            e.insert(listener);
-            Some(token)
-        } else {
-            None
+        match self.listeners.entry(token) {
+            Entry::Vacant(entry) => {
+                entry.insert(Rc::new(RefCell::new(Listener::new(config, token))));
+                Some(token)
+            }
+            _ => None,
         }
     }
 

diff --git a/lib/src/https_openssl.rs b/lib/src/https_openssl.rs
@@ -1978,12 +1978,14 @@ impl Proxy {
     }
 
     pub fn add_listener(&mut self, config: HttpsListener, token: Token) -> Option<Token> {
-        if self.listeners.contains_key(&token) {
-            None
-        } else {
-            let listener = Rc::new(RefCell::new(Listener::try_new(config, token).ok()?));
-            self.listeners.insert(token, listener);
-            Some(token)
+        match self.listeners.entry(token) {
+            Entry::Vacant(entry) => {
+                entry.insert(Rc::new(RefCell::new(
+                    Listener::try_new(config, token).ok()?,
+                )));
+                Some(token)
+            }
+            _ => None,
         }
     }
 

diff --git a/lib/src/https_rustls/configuration.rs b/lib/src/https_rustls/configuration.rs
@@ -1,6 +1,6 @@
 use std::{
     cell::RefCell,
-    collections::{BTreeMap, HashMap},
+    collections::{hash_map::Entry, BTreeMap, HashMap},
     io::ErrorKind,
     net::SocketAddr,
     os::unix::io::AsRawFd,
@@ -317,15 +317,13 @@ impl Proxy {
         config: HttpsListener,
         token: Token,
     ) -> Result<Option<Token>, rustls::Error> {
-        Ok(
-            if let std::collections::hash_map::Entry::Vacant(e) = self.listeners.entry(token) {
-                let listener = Rc::new(RefCell::new(Listener::new(config, token)?));
-                e.insert(listener);
-                Some(token)
-            } else {
-                None
-            },
-        )
+        match self.listeners.entry(token) {
+            Entry::Vacant(entry) => {
+                entry.insert(Rc::new(RefCell::new(Listener::new(config, token)?)));
+                Ok(Some(token))
+            }
+            _ => Ok(None),
+        }
     }
 
     pub fn remove_listener(&mut self, address: SocketAddr) -> bool {

diff --git a/lib/src/tcp.rs b/lib/src/tcp.rs
@@ -1160,12 +1160,12 @@ impl Proxy {
         pool: Rc<RefCell<Pool>>,
         token: Token,
     ) -> Option<Token> {
-        if let Entry::Vacant(e) = self.listeners.entry(token) {
-            let listener = Rc::new(RefCell::new(Listener::new(config, pool, token)));
-            e.insert(listener);
-            Some(token)
-        } else {
-            None
+        match self.listeners.entry(token) {
+            Entry::Vacant(entry) => {
+                entry.insert(Rc::new(RefCell::new(Listener::new(config, pool, token))));
+                Some(token)
+            }
+            _ => None,
         }
     }