refactor/polish ~ fix cargo clippy complaints (DRY struct def)

src/du/du.rs

@@ -339,7 +339,7 @@ pub fn uumain(args: Vec<String>) -> i32 {
     };
     let convert_size_fn = {
         if matches.opt_present("human-readable") || matches.opt_present("si") {
-            convert_size_human        
+            convert_size_human
         } else if matches.opt_present("b") {
             convert_size_b
         } else if matches.opt_present("k") {

src/expr/syntax_tree.rs

@@ -68,9 +68,9 @@ impl ASTNode {
 
     fn new_node(token_idx: usize, op_type: &str, operands: OperandsList) -> Box<ASTNode> {
         Box::new(ASTNode::Node {
-            token_idx: token_idx,
+            token_idx,
             op_type: op_type.into(),
-            operands: operands,
+            operands,
         })
     }
     fn new_leaf(token_idx: usize, value: &str) -> Box<ASTNode> {

src/install/install.rs

@@ -244,8 +244,8 @@ fn behaviour(matches: &getopts::Matches) -> Result<Behaviour, i32> {
     };
 
     Ok(Behaviour {
-        main_function: main_function,
+        main_function,
-        specified_mode: specified_mode,
+        specified_mode,
         suffix: backup_suffix,
         verbose: matches.opt_present("v"),
     })

src/join/join.rs

@@ -260,9 +260,9 @@ impl<'a> State<'a> {
         };
 
         State {
-            key: key,
+            key,
             file_name: name,
-            file_num: file_num,
+            file_num,
             print_unpaired: print_unpaired == file_num,
             lines: f.lines(),
             seq: Vec::new(),

src/ls/ls.rs

@@ -697,7 +697,7 @@ fn display_file_name(
 
     Cell {
         contents: name,
-        width: width,
+        width,
     }
 }
 

src/numfmt/numfmt.rs

@@ -251,9 +251,9 @@ fn parse_options(args: &Matches) -> Result<NumfmtOptions> {
     }?;
 
     Ok(NumfmtOptions {
-        transform: transform,
+        transform,
-        padding: padding,
+        padding,
-        header: header,
+        header,
     })
 }
 

src/od/inputdecoder.rs

@@ -43,12 +43,12 @@ impl<'a, I> InputDecoder<'a, I> {
         } // fast but uninitialized
 
         InputDecoder {
-            input: input,
+            input,
             data: bytes,
             reserved_peek_length: peek_length,
             used_normal_length: 0,
             used_peek_length: 0,
-            byte_order: byte_order,
+            byte_order,
         }
     }
 }

src/od/inputoffset.rs

@@ -21,9 +21,9 @@ impl InputOffset {
     /// creates a new `InputOffset` using the provided values.
     pub fn new(radix: Radix, byte_pos: usize, label: Option<usize>) -> InputOffset {
         InputOffset {
-            radix: radix,
+            radix,
-            byte_pos: byte_pos,
+            byte_pos,
-            label: label,
+            label,
         }
     }
 

src/od/od.rs

@@ -276,15 +276,15 @@ impl OdOptions {
         };
 
         Ok(OdOptions {
-            byte_order: byte_order,
+            byte_order,
-            skip_bytes: skip_bytes,
+            skip_bytes,
-            read_bytes: read_bytes,
+            read_bytes,
-            label: label,
+            label,
-            input_strings: input_strings,
+            input_strings,
-            formats: formats,
+            formats,
-            line_bytes: line_bytes,
+            line_bytes,
-            output_duplicates: output_duplicates,
+            output_duplicates,
-            radix: radix,
+            radix,
         })
     }
 }

src/od/output_info.rs

@@ -69,11 +69,11 @@ impl OutputInfo {
 
         OutputInfo {
             byte_size_line: line_bytes,
-            print_width_line: print_width_line,
+            print_width_line,
-            byte_size_block: byte_size_block,
+            byte_size_block,
-            print_width_block: print_width_block,
+            print_width_block,
-            spaced_formatters: spaced_formatters,
+            spaced_formatters,
-            output_duplicates: output_duplicates,
+            output_duplicates,
         }
     }
 

src/od/parse_formats.rs

@@ -15,8 +15,8 @@ impl ParsedFormatterItemInfo {
         add_ascii_dump: bool,
     ) -> ParsedFormatterItemInfo {
         ParsedFormatterItemInfo {
-            formatter_item_info: formatter_item_info,
+            formatter_item_info,
-            add_ascii_dump: add_ascii_dump,
+            add_ascii_dump,
         }
     }
 }

src/od/parse_inputs.rs

@@ -177,7 +177,7 @@ mod tests {
         fn new(inputs: Vec<&'a str>, option_names: Vec<&'a str>) -> MockOptions<'a> {
             MockOptions {
                 inputs: inputs.iter().map(|s| s.to_string()).collect::<Vec<_>>(),
-                option_names: option_names,
+                option_names,
             }
         }
     }

src/od/partialreader.rs

@@ -22,9 +22,9 @@ impl<R> PartialReader<R> {
     /// to `None` if there should be no limit.
     pub fn new(inner: R, skip: usize, limit: Option<usize>) -> Self {
         PartialReader {
-            inner: inner,
+            inner,
-            skip: skip,
+            skip,
-            limit: limit,
+            limit,
         }
     }
 }

src/od/peekreader.rs

@@ -41,7 +41,7 @@ impl<R> PeekReader<R> {
     /// Create a new `PeekReader` wrapping `inner`
     pub fn new(inner: R) -> Self {
         PeekReader {
-            inner: inner,
+            inner,
             temp_buffer: Vec::new(),
         }
     }

src/pinky/pinky.rs

@@ -125,13 +125,13 @@ The utmp file will be {}",
     }
 
     let pk = Pinky {
-        include_idle: include_idle,
+        include_idle,
-        include_heading: include_heading,
+        include_heading,
-        include_fullname: include_fullname,
+        include_fullname,
-        include_project: include_project,
+        include_project,
-        include_plan: include_plan,
+        include_plan,
-        include_home_and_shell: include_home_and_shell,
+        include_home_and_shell,
-        include_where: include_where,
+        include_where,
         names: matches.free,
     };
 

src/printf/tokenize/num_format/formatters/base_conv/mod.rs

@@ -96,7 +96,7 @@ pub fn arrnum_int_div_step<'a>(
         }
     }
     DivOut {
-        quotient: quotient,
+        quotient,
         remainder: rem_out,
     }
 }

src/printf/tokenize/sub.rs

@@ -80,11 +80,11 @@ impl Sub {
             }
         };
         Sub {
-            min_width: min_width,
+            min_width,
-            second_field: second_field,
+            second_field,
-            field_char: field_char,
+            field_char,
-            field_type: field_type,
+            field_type,
-            orig: orig,
+            orig,
         }
     }
 }

src/ptx/ptx.rs

@@ -248,7 +248,7 @@ fn create_word_set(
                     word = word.to_lowercase();
                 }
                 word_set.insert(WordRef {
-                    word: word,
+                    word,
                     filename: file.clone(),
                     global_line_nr: offs + count,
                     local_line_nr: count,

src/rm/rm.rs

@@ -109,7 +109,7 @@ pub fn uumain(args: Vec<String>) -> i32 {
         return 1;
     } else {
         let options = Options {
-            force: force,
+            force,
             interactive: {
                 if matches.opt_present("i") {
                     InteractiveMode::InteractiveAlways

src/shred/shred.rs

@@ -76,7 +76,7 @@ impl FilenameGenerator {
             indices.push(0);
         }
         FilenameGenerator {
-            name_len: name_len,
+            name_len,
             nameset_indices: RefCell::new(indices),
             exhausted: Cell::new(false),
         }
@@ -137,12 +137,12 @@ impl<'a> BytesGenerator<'a> {
         };
 
         BytesGenerator {
-            total_bytes: total_bytes,
+            total_bytes,
             bytes_generated: Cell::new(0u64),
             block_size: BLOCK_SIZE,
-            exact: exact,
+            exact,
-            gen_type: gen_type,
+            gen_type,
-            rng: rng,
+            rng,
         }
     }
 }

src/sort/sort.rs

@@ -106,14 +106,14 @@ impl<'a> FileMerger<'a> {
     fn new(settings: &'a Settings) -> FileMerger<'a> {
         FileMerger {
             heap: BinaryHeap::new(),
-            settings: settings,
+            settings,
         }
     }
     fn push_file(&mut self, mut lines: Lines<BufReader<Box<dyn Read>>>) {
         match lines.next() {
             Some(Ok(next_line)) => {
                 let mergeable_file = MergeableFile {
-                    lines: lines,
+                    lines,
                     current_line: next_line,
                     settings: &self.settings,
                 };

src/stat/stat.rs

@@ -396,9 +396,9 @@ impl Stater {
 
                     i = j;
                     tokens.push(Token::Directive {
-                        width: width,
+                        width,
-                        flag: flag,
+                        flag,
-                        precision: precision,
+                        precision,
                         format: chars[i],
                     })
                 }
@@ -492,12 +492,12 @@ impl Stater {
 
         Ok(Stater {
             follow: matches.opt_present("dereference"),
-            showfs: showfs,
+            showfs,
             from_user: !fmtstr.is_empty(),
             files: matches.free,
-            default_tokens: default_tokens,
+            default_tokens,
-            default_dev_tokens: default_dev_tokens,
+            default_dev_tokens,
-            mount_list: mount_list,
+            mount_list,
         })
     }
 

src/tee/tee.rs

@@ -119,8 +119,8 @@ fn open(name: String, append: bool) -> Box<dyn Write> {
         }
     };
     Box::new(NamedWriter {
-        inner: inner,
+        inner,
-        path: path,
+        path,
     }) as Box<dyn Write>
 }
 

src/tr/tr.rs

@@ -45,7 +45,7 @@ impl DeleteOperation {
     fn new(set: ExpandSet, complement: bool) -> DeleteOperation {
         DeleteOperation {
             bset: set.map(|c| c as usize).collect(),
-            complement: complement,
+            complement,
         }
     }
 }
@@ -70,7 +70,7 @@ impl SqueezeOperation {
     fn new(squeeze_set: ExpandSet, complement: bool) -> SqueezeOperation {
         SqueezeOperation {
             squeeze_set: squeeze_set.map(|c| c as usize).collect(),
-            complement: complement,
+            complement,
         }
     }
 }
@@ -100,7 +100,7 @@ impl DeleteAndSqueezeOperation {
         DeleteAndSqueezeOperation {
             delete_set: delete_set.map(|c| c as usize).collect(),
             squeeze_set: squeeze_set.map(|c| c as usize).collect(),
-            complement: complement,
+            complement,
         }
     }
 }

src/unexpand/unexpand.rs

@@ -76,10 +76,10 @@ impl Options {
         };
 
         Options {
-            files: files,
+            files,
-            tabstops: tabstops,
+            tabstops,
-            aflag: aflag,
+            aflag,
-            uflag: uflag,
+            uflag,
         }
     }
 }

src/who/who.rs

@@ -204,21 +204,21 @@ pub fn uumain(args: Vec<String>) -> i32 {
     }
 
     let mut who = Who {
-        do_lookup: do_lookup,
+        do_lookup,
-        short_list: short_list,
+        short_list,
-        short_output: short_output,
+        short_output,
-        include_idle: include_idle,
+        include_idle,
-        include_heading: include_heading,
+        include_heading,
-        include_mesg: include_mesg,
+        include_mesg,
-        include_exit: include_exit,
+        include_exit,
-        need_boottime: need_boottime,
+        need_boottime,
-        need_deadprocs: need_deadprocs,
+        need_deadprocs,
-        need_login: need_login,
+        need_login,
-        need_initspawn: need_initspawn,
+        need_initspawn,
-        need_clockchange: need_clockchange,
+        need_clockchange,
-        need_runlevel: need_runlevel,
+        need_runlevel,
-        need_users: need_users,
+        need_users,
-        my_line_only: my_line_only,
+        my_line_only,
         has_records: false,
         args: matches.free,
     };