avoid redundant initialization

getreu · getreu · commit 76617b0c1d7c · 2018-12-20T04:09:43.000+02:00
diff --git a/src/finding.rs b/src/finding.rs
@@ -345,9 +345,9 @@ impl FindingCollection {
             last_str_is_incomplete: false,
         };
         fc.v.push(Finding {
-            filename: filename,
+            filename,
             ptr: text_ptr,
-            mission: mission,
+            mission,
             s: String::with_capacity(FINDING_STR_CAPACITY),
         });
 
@@ -385,9 +385,9 @@ impl FindingCollection {
         let filename = self.v.last().unwrap().filename;
         if !self.v.last().unwrap().s.is_empty() {
             self.v.push(Finding {
-                filename: filename,
+                filename,
                 ptr: text_ptr,
-                mission: mission,
+                mission,
                 s: String::with_capacity(FINDING_STR_CAPACITY),
             });
         } else {
diff --git a/src/mission.rs b/src/mission.rs
@@ -59,9 +59,9 @@ impl UnicodeBlockFilter {
 
     pub fn new2(and_mask: u32, and_result: u32, is_some: bool) -> Self {
         UnicodeBlockFilter {
-            and_mask: and_mask,
-            and_result: and_result,
-            is_some: is_some,
+            and_mask,
+            and_result,
+            is_some,
         }
     }
 }
@@ -243,17 +243,17 @@ impl Missions {
                     v.push(Mission {
                         // For ASCII with `-c i` we use our own decoder
                         encoding: ASCII_GRAPHIC as encoding::EncodingRef,
-                        nbytes_min: nbytes_min,
-                        filter1: filter1,
-                        filter2: filter2,
+                        nbytes_min,
+                        filter1,
+                        filter2,
                         enable_filter: unicode_filtering,
                     })
                 } else {
                     v.push(Mission {
                         encoding: encoding::all::ASCII as encoding::EncodingRef,
-                        nbytes_min: nbytes_min,
-                        filter1: filter1,
-                        filter2: filter2,
+                        nbytes_min,
+                        filter1,
+                        filter2,
                         enable_filter: control_char_filtering || unicode_filtering,
                     })
                 }
@@ -263,9 +263,9 @@ impl Missions {
             v.push(match encoding_from_whatwg_label(enc_name) {
                 Some(enc) => Mission {
                     encoding: enc,
-                    filter1: filter1,
-                    filter2: filter2,
-                    nbytes_min: nbytes_min,
+                    filter1,
+                    filter2,
+                    nbytes_min,
                     enable_filter: control_char_filtering || unicode_filtering,
                 },
                 None => {
@@ -280,7 +280,7 @@ impl Missions {
             });
         }
 
-        Missions { v: v }
+        Missions { v }
     }
 
     /// Return the number of `Mission`s stored.
diff --git a/src/scanner.rs b/src/scanner.rs
@@ -128,7 +128,7 @@ impl<'a> ScannerPool<'a> {
     pub fn new(missions: &'static Missions, tx: &'a SyncSender<FindingCollection>) -> Self {
         let n_threads = missions.len();
         let v = Vec::new();
-        let mut ms = ScannerStates { v: v };
+        let mut ms = ScannerStates { v };
         for i in 0..n_threads {
             ms.v.push(ScannerState {
                 offset: 0,
@@ -524,7 +524,7 @@ mod tests {
                 mission: &MISSIONS.v[0],
                 s: "\u{2691}TUSH".to_string(),
             }],
-            completes_last_str: completes_last_str,
+            completes_last_str,
             last_str_is_incomplete: false,
         };
 
