part 13 draft: sorting, external dependencies

[rust-101.git] / src / part12.rs

diff --git a/src/part12.rs b/src/part12.rs
index edcb9e0866a6a4bded80c3c9eca5d461136fdd01..477a3aed481515056ed0ef6bd16b428b3d7fc226 100644 (file)
--- a/src/part12.rs
+++ b/src/part12.rs
@@ -14,17 +14,17 @@ use std::sync::Arc;
 // to complete the job: Which files to work on, which pattern to look for, and how to output. <br/>
 // Besides just printing all the matching lines, we will also offer to count them, or alternatively to sort them.
 #[derive(Clone,Copy)]
-enum OutputMode {
+pub enum OutputMode {
     Print,
     SortAndPrint,
     Count,
 }
 use self::OutputMode::*;
 
-struct Options {
-    files: Vec<String>,
-    pattern: String,
-    output_mode: OutputMode,
+pub struct Options {
+    pub files: Vec<String>,
+    pub pattern: String,
+    pub output_mode: OutputMode,
 }
 
 //@ Now we can write three functions to do the actual job of reading, matching, and printing, respectively.
@@ -87,7 +87,7 @@ fn output_lines(options: Arc<Options>, in_channel: Receiver<String>) {
         },
         SortAndPrint => {
             // We are asked to sort the matching lines before printing. So let's collect them all in a local vector...
-            let data: Vec<String> = in_channel.iter().collect();
+            let mut data: Vec<String> = in_channel.iter().collect();
             // ...and implement the actual sorting later.
             unimplemented!()
         }
@@ -96,7 +96,7 @@ fn output_lines(options: Arc<Options>, in_channel: Receiver<String>) {
 
 // With the operations of the three threads defined, we can now implement a function that performs grepping according
 // to some given options.
-fn run(options: Options) {
+pub fn run(options: Options) {
     // We move the `options` into an `Arc`, as that's what the thread workers expect.
     let options = Arc::new(options);
 
@@ -125,7 +125,7 @@ fn run(options: Options) {
     handle3.join().unwrap();
 }
 
-// Now we have all the pieces together for testing our `rgrep` with some hard-coded options.
+// Now we have all the pieces together for testing our rgrep with some hard-coded options.
 //@ We need to call `to_string` on string literals to convert them to a fully-owned `String`.
 pub fn main() {
     let options = Options {
@@ -136,7 +136,7 @@ pub fn main() {
     run(options);
 }
 
-// **Exercise 12.1**: Change `rgrep` such that it prints now only the matching lines, but also the name of the file
+// **Exercise 12.1**: Change rgrep such that it prints now only the matching lines, but also the name of the file
 // and the number of the line in the file. You will have to change the type of the channels from `String` to something
 // that records this extra information.