Uniq: FIXUP It builds

GrayJack · Oct 11, 2019 · b6c19d0 · b6c19d0
1 parent 4da17da
commit b6c19d0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/uniq/src/execution_options.rs b/uniq/src/execution_options.rs
@@ -1,5 +1,3 @@
-mod execution_options {
-
 use std::process;
 
 pub enum Counters {
@@ -35,7 +33,7 @@ fn parse_num_or_panic(num_s: &str, message: String) -> u32 {
 /// # Arguments
 /// * `matches` - A `clap::ArgMatches` object to transform into a struct
 ///   representing the parameters of execution
-pub fn read_clap_matches(arg_matches: &clap::ArgMatches) -> ExecutionOptions {
+pub fn read_clap_matches(arg_matches: clap::ArgMatches) -> ExecutionOptions {
     let read_stdin = !arg_matches.is_present("input_file");
     let write_stdout = !arg_matches.is_present("output_file");
 
@@ -63,8 +61,8 @@ pub fn read_clap_matches(arg_matches: &clap::ArgMatches) -> ExecutionOptions {
         } else {
             0
         },
-        read_stdin: read_stdin,
-        write_stdout: write_stdout,
+        read_stdin,
+        write_stdout,
         input_file_path: if read_stdin {
             None
         } else {
@@ -88,4 +86,3 @@ pub fn read_clap_matches(arg_matches: &clap::ArgMatches) -> ExecutionOptions {
         },
     }
 }
-}
diff --git a/uniq/src/main.rs b/uniq/src/main.rs
@@ -4,5 +4,5 @@ mod execution_options;
 
 fn main() {
     let yaml = load_yaml!("uniq.yml");
-    let _opts = read_clap_matches(App::from_yaml(yaml).get_matches());
+    let _opts = execution_options::read_clap_matches(App::from_yaml(yaml).get_matches());
 }