ldp, ospf: simplify the get_router_id() methods

Replace conditional checks in the `get_router_id` methods with the more concise `Option::or` combinator. Signed-off-by: Renato Westphal <[email protected]>
holo-routing · Jan 26, 2024 · f684b06 · f684b06
1 parent 21bd8b4
commit f684b06
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/holo-ldp/src/instance.rs b/holo-ldp/src/instance.rs
@@ -241,13 +241,7 @@ impl Instance {
     }
 
     fn get_router_id(&self) -> Option<Ipv4Addr> {
-        if self.config.router_id.is_some() {
-            self.config.router_id
-        } else if self.system.router_id.is_some() {
-            self.system.router_id
-        } else {
-            None
-        }
+        self.config.router_id.or(self.system.router_id)
     }
 
     pub(crate) fn as_up(

diff --git a/holo-ospf/src/instance.rs b/holo-ospf/src/instance.rs
@@ -340,13 +340,7 @@ where
     }
 
     pub(crate) fn get_router_id(&self) -> Option<Ipv4Addr> {
-        if self.config.router_id.is_some() {
-            self.config.router_id
-        } else if self.system.router_id.is_some() {
-            self.system.router_id
-        } else {
-            None
-        }
+        self.config.router_id.or(self.system.router_id)
     }
 
     // Retrieves the boot count of the instance from non-volatile memory.