diff --git a/solutions/24_file_io/file_io2.rs b/solutions/24_file_io/file_io2.rs index ba6aff20..5e41b835 100644 --- a/solutions/24_file_io/file_io2.rs +++ b/solutions/24_file_io/file_io2.rs @@ -1,4 +1,3 @@ - use std::fs; use std::io::{BufRead, BufReader, BufWriter, Write}; use std::path::Path; @@ -6,13 +5,11 @@ use std::path::Path; const TEST_FILE_NAME: &str = "MultiLineTextFile.txt"; fn main() { - create_required_files(); let input_file = fs::File::open(TEST_FILE_NAME); if input_file.is_err() { - eprintln!("Input file open error : {}", input_file.as_ref().unwrap_err()); - assert!(false); + panic!("Input file open error"); } let buffered_input_file = BufReader::new(input_file.unwrap()); @@ -20,32 +17,34 @@ fn main() { let output_file = fs::File::create("MultiLineOutputFile.txt"); if output_file.is_err() { - eprintln!("Output file open error : {}", output_file.as_ref().unwrap_err()); - assert!(false); + eprintln!( + "Output file open error : {}", + output_file.as_ref().unwrap_err() + ); + panic!("Output file open error"); } let mut buffered_file_writer = BufWriter::new(output_file.ok().unwrap()); let mut line_number = 1; let mut lines = buffered_input_file.lines(); - while let Some(line) = lines.next() { + + for line in lines { if let Ok(line) = line { - let write_result = buffered_file_writer.write(format!("Line {} : {}\n", line_number, line).as_bytes()); + let write_result =buffered_file_writer.write(format!("Line {} : {}\n", line_number, line).as_bytes()); if write_result.is_err() { eprintln!("Write result error: {}", write_result.unwrap_err()); break; } line_number += 1; - }else { - eprintln!("Write line error : {}", line_number); - assert!(false); + } else { + panic!("Write line error"); } - } println!("{} : lines processed", line_number - 1); } -fn create_required_files(){ +fn create_required_files() { let file_path = Path::new(TEST_FILE_NAME); if !file_path.exists() { @@ -55,5 +54,4 @@ fn create_required_files(){ fs::write(file_path, text).unwrap(); println!("File created."); } - -} \ No newline at end of file +}