commit 9a2b5de5d4e7948f1b902d79baf1c891c2030903
author Fabio Utzig <utzig@apache.org> Fri Nov 22 12:50:02 2019 -0300
committer Fabio Utzig <utzig@utzig.org> Fri Nov 22 13:57:27 2019 -0300
tree c8beb2255b71f3c41dab2d977fbacac2d43a720f
parent 23e99b0d7eb037ac8e824e1f395f200eda1a48e0

sim: derive Default for TlvGen

Avoid having to declare default values in type instantiation.

Signed-off-by: Fabio Utzig <utzig@apache.org>

sim/src/tlv.rs

diff --git a/sim/src/tlv.rs b/sim/src/tlv.rs
index 716ad09..a3c1d27 100644
--- a/sim/src/tlv.rs
+++ b/sim/src/tlv.rs
@@ -88,7 +88,7 @@
     fn get_enc_key(&self) -> Vec<u8>;
 }
 
-#[derive(Debug)]
+#[derive(Debug, Default)]
 pub struct TlvGen {
     flags: u32,
     kinds: Vec<TlvKinds>,
@@ -114,65 +114,45 @@
     #[allow(dead_code)]
     pub fn new_hash_only() -> TlvGen {
         TlvGen {
-            flags: 0,
             kinds: vec![TlvKinds::SHA256],
             size: 4 + 32,
-            protect_size: 0,
-            payload: vec![],
-            dependencies: vec![],
-            enc_key: vec![],
+            ..Default::default()
         }
     }
 
     #[allow(dead_code)]
     pub fn new_rsa_pss() -> TlvGen {
         TlvGen {
-            flags: 0,
             kinds: vec![TlvKinds::SHA256, TlvKinds::RSA2048],
             size: 4 + 32 + 4 + 32 + 4 + 256,
-            protect_size: 0,
-            payload: vec![],
-            dependencies: vec![],
-            enc_key: vec![],
+            ..Default::default()
         }
     }
 
     #[allow(dead_code)]
     pub fn new_rsa3072_pss() -> TlvGen {
         TlvGen {
-            flags: 0,
             kinds: vec![TlvKinds::SHA256, TlvKinds::RSA3072],
             size: 4 + 32 + 4 + 32 + 4 + 384,
-            protect_size: 0,
-            payload: vec![],
-            dependencies: vec![],
-            enc_key: vec![],
+            ..Default::default()
         }
     }
 
     #[allow(dead_code)]
     pub fn new_ecdsa() -> TlvGen {
         TlvGen {
-            flags: 0,
             kinds: vec![TlvKinds::SHA256, TlvKinds::ECDSA256],
             size: 4 + 32 + 4 + 32 + 4 + 72,
-            protect_size: 0,
-            payload: vec![],
-            dependencies: vec![],
-            enc_key: vec![],
+            ..Default::default()
         }
     }
 
     #[allow(dead_code)]
     pub fn new_ed25519() -> TlvGen {
         TlvGen {
-            flags: 0,
             kinds: vec![TlvKinds::SHA256, TlvKinds::ED25519],
             size: 4 + 32 + 4 + 32 + 4 + 64,
-            protect_size: 0,
-            payload: vec![],
-            dependencies: vec![],
-            enc_key: vec![],
+            ..Default::default()
         }
     }
 
@@ -182,10 +162,7 @@
             flags: TlvFlags::ENCRYPTED as u32,
             kinds: vec![TlvKinds::SHA256, TlvKinds::ENCRSA2048],
             size: 4 + 32 + 4 + 256,
-            protect_size: 0,
-            payload: vec![],
-            dependencies: vec![],
-            enc_key: vec![],
+            ..Default::default()
         }
     }
 
@@ -195,10 +172,7 @@
             flags: TlvFlags::ENCRYPTED as u32,
             kinds: vec![TlvKinds::SHA256, TlvKinds::RSA2048, TlvKinds::ENCRSA2048],
             size: 4 + 32 + 4 + 32 + 4 + 256 + 4 + 256,
-            protect_size: 0,
-            payload: vec![],
-            dependencies: vec![],
-            enc_key: vec![],
+            ..Default::default()
         }
     }
 
@@ -208,10 +182,7 @@
             flags: TlvFlags::ENCRYPTED as u32,
             kinds: vec![TlvKinds::SHA256, TlvKinds::ENCKW128],
             size: 4 + 32 + 4 + 24,
-            protect_size: 0,
-            payload: vec![],
-            dependencies: vec![],
-            enc_key: vec![],
+            ..Default::default()
         }
     }
 
@@ -221,10 +192,7 @@
             flags: TlvFlags::ENCRYPTED as u32,
             kinds: vec![TlvKinds::SHA256, TlvKinds::RSA2048, TlvKinds::ENCKW128],
             size: 4 + 32 + 4 + 32 + 4 + 256 + 4 + 24,
-            protect_size: 0,
-            payload: vec![],
-            dependencies: vec![],
-            enc_key: vec![],
+            ..Default::default()
         }
     }
 
@@ -234,10 +202,7 @@
             flags: TlvFlags::ENCRYPTED as u32,
             kinds: vec![TlvKinds::SHA256, TlvKinds::ECDSA256, TlvKinds::ENCKW128],
             size: 4 + 32 + 4 + 32 + 4 + 72 + 4 + 24,
-            protect_size: 0,
-            payload: vec![],
-            dependencies: vec![],
-            enc_key: vec![],
+            ..Default::default()
         }
     }
 
@@ -247,10 +212,7 @@
             flags: TlvFlags::ENCRYPTED as u32,
             kinds: vec![TlvKinds::SHA256, TlvKinds::ECDSA256, TlvKinds::ENCEC256],
             size: 4 + 32 + 4 + 32 + 4 + 72 + 4 + 113,
-            protect_size: 0,
-            payload: vec![],
-            dependencies: vec![],
-            enc_key: vec![],
+            ..Default::default()
         }
     }