divide files

Author: yuk1ty

chapter3/Cargo.toml

@@ -33,5 +33,8 @@ path = "src/3_9_5/main.rs"
 name = "3_6_1"
 path = "src/3_6_1/main.rs"
 [[bin]]
-name = "3_7"
-path = "src/3_7/main.rs"
+name = "3_7_multi"
+path = "src/3_7/multi_reader.rs"
+[[bin]]
+name = "3_7_tee"
+path = "src/3_7/tee_reader.rs"

chapter3/src/3_7/multi_reader.rs

@@ -0,0 +1,13 @@
+use std::io::{copy, stdout};
+
+use lib::io::MultiReader;
+
+fn main() -> std::io::Result<()> {
+    let header = "---- HEADER ----\n".as_bytes();
+    let content = "Example of MultiReader\n".as_bytes();
+    let footer = "---- FOOTER ----\n".as_bytes();
+    let mut multi_reader = MultiReader::new(vec![header, content, footer]);
+    copy(&mut multi_reader, &mut stdout())?;
+
+    Ok(())
+}

chapter3/src/3_7/main.rs renamed to chapter3/src/3_7/tee_reader.rs

@@ -1,11 +1,4 @@
-//! Rust には MultiReader と TeeReader は存在しないため、それらを自前で実装して用意しています。
-
-use std::{
-    io::{copy, stdout, Read, Write},
-    usize,
-};
-
-use lib::io::MultiReader;
+use std::io::{Read, Write};
 
 struct TeeReader<R, W>
 where
@@ -39,12 +32,6 @@ where
 }
 
 fn main() -> std::io::Result<()> {
-    let header = "---- HEADER ----\n".as_bytes();
-    let content = "Example of MultiReader\n".as_bytes();
-    let footer = "---- FOOTER ----\n".as_bytes();
-    let mut multi_reader = MultiReader::new(vec![header, content, footer]);
-    copy(&mut multi_reader, &mut stdout())?;
-
     // TeeReader を使用した場合の例。
     let mut buf = Vec::new();
     let reader = "Example of TeeReader".as_bytes();

lib/src/io/multi_reader.rs

@@ -46,7 +46,7 @@ impl<R: Read> Read for MultiReader<R> {
                 }
                 None => return Ok(0),
             }
-            self.pos = self.pos + 1;
+            self.pos += 1;
         }
     }
 }