Getting word sorting to work.

filesort-rs/src/file_sort.rs

@@ -2,6 +2,6 @@ use std::io::Error;
 
 pub trait FileSort {
     fn read(&mut self) -> Result<bool,Error>;
-    fn write(&mut self);
+    fn write(&mut self) -> Result<bool,Error>;
     fn sort(&mut self);
 }

filesort-rs/src/line_sort.rs

@@ -38,12 +38,14 @@ impl FileSort for LineSort {
         return Ok(true);
     }
 
-    fn write(&mut self) {
-       let mut file: File = File::create(&self.output_file).expect("Unable to create output file {0}");
+    fn write(&mut self) -> Result<bool,Error>{
+       let mut file: File = File::create(&self.output_file)?;
 
         for line in &self.lines {
-            write!(file,"{}\n", line).expect("Unable to write data to file.")
+            write!(file,"{}\n", line)?;
         }
+
+        return Ok(true);
     }
 
     fn sort(&mut self) {

filesort-rs/src/main.rs

@@ -35,7 +35,16 @@ fn main() {
 
             println!("Writing file data\n");
 
-            linesort.write();
+            let result = linesort.write();
+
+            match result {
+                Ok(_res) => { 
+                },
+                Err(e) => { 
+                    eprintln!("An error occured with the output file\n{}", e);
+                    return;
+                }
+            }
 
             println!("Filesort complete\n");
     }
@@ -62,7 +71,16 @@ fn main() {
 
         println!("Writing file data\n");
 
-        wordsort.write();
+        let result = wordsort.write();
+
+        match result {
+            Ok(_res) => { 
+            },
+            Err(e) => { 
+                eprintln!("An error occured with the output file\n{}", e);
+                return;
+            }
+        }
 
         println!("Filesort complete\n");
 

filesort-rs/src/word_sort.rs

@@ -28,18 +28,29 @@ impl FileSort for WordSort {
         let buffer: BufReader<File> = BufReader::new(file);
 
         for line in buffer.lines() {
-            self.lines.push(line.unwrap_or_default());
-        }
+            let new_line:String = line.unwrap_or_default();
+
+            if !new_line.is_empty() {
+                let words = new_line.split_whitespace();
+
+                for word in words {
+                    self.lines.push(word.to_string());
+                }
+
+            }
+       }
 
         return Ok(true);
     }
 
-    fn write(&mut self) {
-        let mut file: File = File::create(&self.output_file).expect("Unable to create output file {0}");
+    fn write(&mut self) -> Result<bool,Error>{
+        let mut file: File = File::create(&self.output_file)?;
 
         for line in &self.lines {
-            write!(file,"{}\n", line).expect("Unable to write data to file.")
+            write!(file,"{}\n", line)?;
         }
+
+        return Ok(true);
     }
 
     fn sort(&mut self) {