Fix clippy issues

Author: tiborschneider

bgpsim-macros/src/net.rs

@@ -441,7 +441,7 @@ impl Net {
         // check that every router has one AS number
         for (ident, asn) in self.nodes.iter_mut() {
             if asn.is_none() {
-                *asn = self.default_asn.clone();
+                *asn = self.default_asn;
             }
             // check if asn is still none
             if asn.is_none() {

bgpsim/src/network.rs

@@ -244,7 +244,7 @@ impl<P: Prefix, Q, Ospf: OspfImpl> Network<P, Q, Ospf> {
         let asn = asn.into();
         let new_router = Router::new(name.into(), router_id, asn);
         let router_id = new_router.router_id();
-        self.routers.insert(router_id, new_router.into());
+        self.routers.insert(router_id, new_router);
         self.ospf.add_router(router_id, asn);
     }
 
@@ -1297,11 +1297,6 @@ impl<'a, P: Prefix, Ospf> Iterator for RoutersInAs<'a, P, Ospf> {
     type Item = &'a Router<P, Ospf>;
 
     fn next(&mut self) -> Option<Self::Item> {
-        for r in self.i.by_ref() {
-            if r.asn() == self.asn {
-                return Some(r);
-            }
-        }
-        None
+        self.i.by_ref().find(|&r| r.asn() == self.asn)
     }
 }

bgpsim/src/ospf/local/database.rs

@@ -1458,9 +1458,7 @@ pub(crate) fn compute_as_external_route(
     rib: &HashMap<RouterId, OspfRibEntry>,
 ) -> Option<OspfRibEntry> {
     // only look at External-LSAs
-    let Some(weight) = lsa.data.external() else {
-        return None;
-    };
+    let weight = lsa.data.external()?;
     let target = lsa.target();
 
     // (1) If the cost specified by the LSA is LSInfinity, or if the LSA's LS age is equal
@@ -1502,9 +1500,7 @@ pub(crate) fn compute_as_external_route(
     //     inter-area path; if no such path exists, do nothing with the LSA and consider the
     //     next in the list.
     // --> We don't implement that behavior
-    let Some(adv_rib) = rib.get(&lsa.header.router) else {
-        return None;
-    };
+    let adv_rib = rib.get(&lsa.header.router)?;
 
     // (4) Let X be the cost specified by the preferred routing table entry for the
     //     ASBR/forwarding address, and Y the cost specified in the LSA. X is in terms of

flake.nix

@@ -22,6 +22,7 @@
           rustfmt
           rustc
           trunk
+          clippy
           tailwindcss_3
           llvmPackages.bintools
         ];