commit 4dfb33c7c130885e0d342e5c4c5e81863ed2ce58
author David Brown <david.brown@linaro.org> Wed Mar 10 05:15:45 2021 -0700
committer David Brown <davidb@davidb.org> Thu Mar 11 07:25:43 2021 -0700
tree 473047118ffd8a24c1465388402d8f4a676fc67c
parent 7cc4526db6e79ea68a5096b48efeb34a5c4afaaf

sim: Simplify some struct initializers

In rust, if a struct field is initialized with a variable with the same
name as the field, it is redundant to say `field: field` as the
initializer, and just `field` is sufficient.  Fix the instances of this
that clippy suggests.

Signed-off-by: David Brown <david.brown@linaro.org>

sim/simflash/src/lib.rs

diff --git a/sim/simflash/src/lib.rs b/sim/simflash/src/lib.rs
index fa83c3e..dad0bca 100644
--- a/sim/simflash/src/lib.rs
+++ b/sim/simflash/src/lib.rs
@@ -107,11 +107,11 @@
         SimFlash {
             data: vec![erased_val; total],
             write_safe: vec![true; total],
-            sectors: sectors,
+            sectors,
             bad_region: Vec::new(),
-            align: align,
+            align,
             verify_writes: true,
-            erased_val: erased_val,
+            erased_val,
         }
     }
 
@@ -295,9 +295,9 @@
                 let base = self.base;
                 self.base += size;
                 Some(Sector {
-                    num: num,
-                    base: base,
-                    size: size,
+                    num,
+                    base,
+                    size,
                 })
             }
         }

sim/src/depends.rs

diff --git a/sim/src/depends.rs b/sim/src/depends.rs
index f3bbc29..a67bcd8 100644
--- a/sim/src/depends.rs
+++ b/sim/src/depends.rs
@@ -30,7 +30,7 @@
 impl BoringDep {
     pub fn new(number: usize, test: &DepTest) -> BoringDep {
         BoringDep {
-            number: number,
+            number,
             test: test.clone(),
         }
     }
@@ -179,7 +179,7 @@
     fn new_synthetic(image_id: u8, slot: u8, minor: u8) -> ImageVersion {
         ImageVersion {
             major: image_id * 20 + slot,
-            minor: minor,
+            minor,
             revision: 1,
             build_num: slot as u32,
         }

sim/src/image.rs

diff --git a/sim/src/image.rs b/sim/src/image.rs
index a700698..63cd862 100644
--- a/sim/src/image.rs
+++ b/sim/src/image.rs
@@ -149,9 +149,9 @@
         }
 
         Ok(ImagesBuilder {
-            flash: flash,
-            areadesc: areadesc,
-            slots: slots,
+            flash,
+            areadesc,
+            slots,
         })
     }
 
@@ -186,15 +186,15 @@
                 _ => install_image(&mut flash, &slots[1], 46928, &*dep, false)
             };
             OneImage {
-                slots: slots,
-                primaries: primaries,
-                upgrades: upgrades,
+                slots,
+                primaries,
+                upgrades,
             }}).collect();
         install_ptable(&mut flash, &self.areadesc);
         Images {
-            flash: flash,
+            flash,
             areadesc: self.areadesc,
-            images: images,
+            images,
             total_count: None,
         }
     }
@@ -227,14 +227,14 @@
             let primaries = install_image(&mut bad_flash, &slots[0], 32784, &dep, false);
             let upgrades = install_image(&mut bad_flash, &slots[1], 41928, &dep, true);
             OneImage {
-                slots: slots,
-                primaries: primaries,
-                upgrades: upgrades,
+                slots,
+                primaries,
+                upgrades,
             }}).collect();
         Images {
             flash: bad_flash,
             areadesc: self.areadesc,
-            images: images,
+            images,
             total_count: None,
         }
     }
@@ -246,14 +246,14 @@
             let primaries = install_image(&mut flash, &slots[0], 32784, &dep, false);
             let upgrades = install_no_image();
             OneImage {
-                slots: slots,
-                primaries: primaries,
-                upgrades: upgrades,
+                slots,
+                primaries,
+                upgrades,
             }}).collect();
         Images {
-            flash: flash,
+            flash,
             areadesc: self.areadesc,
-            images: images,
+            images,
             total_count: None,
         }
     }
@@ -265,14 +265,14 @@
             let primaries = install_no_image();
             let upgrades = install_image(&mut flash, &slots[1], 32784, &dep, false);
             OneImage {
-                slots: slots,
-                primaries: primaries,
-                upgrades: upgrades,
+                slots,
+                primaries,
+                upgrades,
             }}).collect();
         Images {
-            flash: flash,
+            flash,
             areadesc: self.areadesc,
-            images: images,
+            images,
             total_count: None,
         }
     }

sim/src/tlv.rs

diff --git a/sim/src/tlv.rs b/sim/src/tlv.rs
index 68bfaf7..39bb1b6 100644
--- a/sim/src/tlv.rs
+++ b/sim/src/tlv.rs
@@ -267,7 +267,7 @@
 
     fn add_dependency(&mut self, id: u8, version: &ImageVersion) {
         self.dependencies.push(Dependency {
-            id: id,
+            id,
             version: version.clone(),
         });
     }