structopt -> clap, Rust 1.90/2024, swadm link apply command (#134)

Author: rcgoodfellow

Cargo.lock

@@ -63,6 +63,7 @@ camino = { version = "1.1", features = ["serde1"] }
 cfg-if = "1"
 chrono = "0.4"
 colored = "2"
+clap = { version = "4.5.8", features = [ "derive" ] }
 csv = "1.3"
 curl = "0.4"
 display-error-chain = "0.2"
@@ -96,7 +97,6 @@ slog-async = "2.8"
 slog-bunyan = "2.5"
 slog-term = "2.9"
 socket2 = { version = "0.6", features = ["all"] }
-structopt = "0.3"
 strum = { version = "0.26.3", features = [ "derive" ] }
 syn = { version = "2.0", features = ["extra-traits"]}
 tabwriter = { version = "1", features = ["ansi_formatting"] }

Cargo.toml

@@ -307,7 +307,7 @@ Configuring a nat entry using `swadm`:
 ``` sh
 $ ./target/release/swadm nat add \
     -e 10.85.0.211 \
-    -h 65535 \
+    -H 65535 \
     -m A8:40:25:F6:F9:94 \
     -i fd00:1122:3344:101::1 \
     -l 1024 \

README.md

@@ -1,7 +1,7 @@
 [package]
 name = "aal"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

aal/Cargo.toml

@@ -370,10 +370,10 @@ impl TryFrom<&ValueTypes> for u32 {
     fn try_from(v: &ValueTypes) -> Result<Self, Self::Error> {
         let mask = (1u64 << 32) - 1;
 
-        if let ValueTypes::U64(v) = v {
-            if v & mask == *v {
-                return Ok((v & mask) as u32);
-            }
+        if let ValueTypes::U64(v) = v
+            && v & mask == *v
+        {
+            return Ok((v & mask) as u32);
         }
 
         Err("value not 32 bits")
@@ -400,10 +400,10 @@ impl TryFrom<&ValueTypes> for u8 {
     fn try_from(v: &ValueTypes) -> Result<Self, Self::Error> {
         let mask = (1u64 << 8) - 1;
 
-        if let ValueTypes::U64(v) = v {
-            if v & mask == *v {
-                return Ok((v & mask) as u8);
-            }
+        if let ValueTypes::U64(v) = v
+            && v & mask == *v
+        {
+            return Ok((v & mask) as u8);
         }
 
         Err("value not 8 bits")

aal/src/match_action.rs

@@ -1,7 +1,7 @@
 [package]
 version = "0.0.1"
 name = "aal_macros"
-edition = "2021"
+edition = "2024"
 
 [lib]
 proc-macro = true

aal_macros/Cargo.toml

@@ -370,7 +370,7 @@ fn get_fields<'a>(
                     return Err(Error::new(
                         f.span(),
                         format!("unrecognized key type: {x}"),
-                    ))
+                    ));
                 }
             },
         };
@@ -391,7 +391,7 @@ fn get_fields<'a>(
 }
 
 // Parse all of the arguments to an action
-fn get_action_args(variant: &Variant) -> Result<Vec<ActionArg>> {
+fn get_action_args(variant: &Variant) -> Result<Vec<ActionArg<'_>>> {
     let mut args = Vec::new();
 
     let named = match variant.fields {

aal_macros/src/lib.rs

@@ -1,7 +1,7 @@
 [package]
 name = "asic"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [features]
 tofino_asic = [

asic/Cargo.toml

@@ -97,7 +97,7 @@ fn sde_prep() -> Result<()> {
     let sde_dir =
         env::var("SDE").with_context(|| "failed to get SDE env var")?;
 
-    env::set_var("CFLAGS", format!("-I{sde_dir}/include"));
+    unsafe { env::set_var("CFLAGS", format!("-I{sde_dir}/include")) };
 
     println!("cargo:rerun-if-changed={TOFINO_DIR}/{FN_FILE}");
     println!("cargo:rerun-if-changed={TOFINO_DIR}/{TYPE_FILE}");
@@ -121,7 +121,7 @@ fn sde_prep() -> Result<()> {
 
 fn main() -> Result<()> {
     #[cfg(target_os = "illumos")]
-    {
+    unsafe {
         env::set_var("AR", "/usr/bin/gar");
         env::set_var("LIBCLANG_PATH", "/opt/ooce/llvm/lib");
     }

asic/build.rs

@@ -17,9 +17,9 @@ use aal::{
 };
 use common::ports::{PortFec, PortId, PortMedia, PortPrbsMode, PortSpeed};
 
+use crate::Identifiers;
 pub use crate::faux_fsm::FsmState;
 pub use crate::faux_fsm::PortFsmState;
-use crate::Identifiers;
 
 pub mod table;
 
@@ -117,11 +117,11 @@ impl TableChaos {
         id: &str,
         message: &str,
     ) -> AsicResult<()> {
-        if let Some(value) = self.values.get(id) {
-            if *value >= random() {
-                slog::error!(log, "chaos table error: {}", message);
-                return Err(AsicError::Synthetic(message.into()));
-            }
+        if let Some(value) = self.values.get(id)
+            && *value >= random()
+        {
+            slog::error!(log, "chaos table error: {}", message);
+            return Err(AsicError::Synthetic(message.into()));
         }
         Ok(())
     }