Merge branch 'master' into section-2_8_1

laysakura · web-flow · commit bd0ea67be6e4 · 2021-05-04T11:09:18.000+09:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,5 +17,6 @@ members = [
     "chapter15",
     "chapter16",
     "chapter17",
-    "appendix"
+    "appendix",
+    "lib"
 ]
diff --git a/appendix/Cargo.toml b/appendix/Cargo.toml
@@ -7,3 +7,4 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+lib = { path = "../lib" }
diff --git a/chapter1/Cargo.toml b/chapter1/Cargo.toml
@@ -7,3 +7,4 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+lib = { path = "../lib" }
diff --git a/chapter10/Cargo.toml b/chapter10/Cargo.toml
@@ -7,3 +7,4 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+lib = { path = "../lib" }
diff --git a/chapter11/Cargo.toml b/chapter11/Cargo.toml
@@ -7,3 +7,4 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+lib = { path = "../lib" }
diff --git a/chapter12/Cargo.toml b/chapter12/Cargo.toml
@@ -7,3 +7,4 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+lib = { path = "../lib" }
diff --git a/chapter13/Cargo.toml b/chapter13/Cargo.toml
@@ -7,3 +7,4 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+lib = { path = "../lib" }
diff --git a/chapter14/Cargo.toml b/chapter14/Cargo.toml
@@ -7,3 +7,4 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+lib = { path = "../lib" }
diff --git a/chapter15/Cargo.toml b/chapter15/Cargo.toml
@@ -7,3 +7,4 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+lib = { path = "../lib" }
diff --git a/chapter16/Cargo.toml b/chapter16/Cargo.toml
@@ -7,3 +7,4 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+lib = { path = "../lib" }
diff --git a/chapter17/Cargo.toml b/chapter17/Cargo.toml
@@ -7,3 +7,4 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+lib = { path = "../lib" }
diff --git a/chapter2/Cargo.toml b/chapter2/Cargo.toml
@@ -1,12 +1,13 @@
 [package]
-name = "chapter2"
-version = "0.1.0"
 authors = ["yytyd <toyoda_yuki@cyberagent.co.jp>"]
 edition = "2018"
+name = "chapter2"
+version = "0.1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+lib = { path = "../lib" }
 
 [[bin]]
 name = "2_4_1"
@@ -16,10 +17,22 @@ path = "src/2_4_1/main.rs"
 name = "2_4_2"
 path = "src/2_4_2/main.rs"
 
+[[bin]]
+name = "2_4_3"
+path = "src/2_4_3/main.rs"
+
 [[bin]]
 name = "client_2_4_4"
 path = "src/2_4_4/client.rs"
 
+[[bin]]
+name = "server_2_4_4"
+path = "src/2_4_4/server.rs"
+
 [[bin]]
 name = "2_8_1"
 path = "src/2_8_1/main.rs"
+
+[[bin]]
+name = "2_8_2"
+path = "src/2_8_2/main.rs"
diff --git a/chapter2/src/2_4_3/main.rs b/chapter2/src/2_4_3/main.rs
@@ -0,0 +1,29 @@
+use std::io::Write;
+use std::str;
+
+#[derive(Debug)]
+enum BufferError {
+    IOError(std::io::Error),
+    StrError(str::Utf8Error),
+}
+
+impl From<std::io::Error> for BufferError {
+    fn from(error: std::io::Error) -> Self {
+        BufferError::IOError(error)
+    }
+}
+
+impl From<str::Utf8Error> for BufferError {
+    fn from(error: str::Utf8Error) -> Self {
+        BufferError::StrError(error)
+    }
+}
+
+fn main() -> Result<(), BufferError> {
+    let mut buffer: Vec<u8> = Vec::new();
+    buffer.write(b"bytes.Buffer example1\n")?;
+    println!("{}", str::from_utf8(&buffer)?);
+    buffer.write(b"bytes.Buffer example2\n")?;
+    println!("{}", str::from_utf8(&buffer)?);
+    Ok(())
+}
diff --git a/chapter2/src/2_4_4/server.rs b/chapter2/src/2_4_4/server.rs
@@ -0,0 +1,40 @@
+use std::io::{BufRead, BufReader, Write};
+use std::net::{TcpListener, TcpStream};
+
+fn get_operation(stream: &mut TcpStream) -> std::io::Result<()> {
+    let body = "HTTP server sample";
+    writeln!(stream, "HTTP/1.1 200 OK")?;
+    writeln!(stream, "Content-Type: text/plain; charset=UTF-8")?;
+    writeln!(stream, "Content-Length: {}", body.len())?;
+    writeln!(stream)?;
+
+    writeln!(stream, "{}", body)?;
+    Ok(())
+}
+
+fn handle_client(stream: TcpStream) -> std::io::Result<()> {
+    let mut reader = BufReader::new(stream);
+
+    let mut first_line = String::new();
+    reader.read_line(&mut first_line)?;
+
+    let mut params = first_line.split_whitespace();
+    let method = params.next();
+    let path = params.next();
+    match (method, path) {
+        (Some("GET"), Some(_)) => {
+            get_operation(reader.get_mut())?;
+        }
+        _ => panic!("failed to parse"),
+    }
+    Ok(())
+}
+
+fn main() -> std::io::Result<()> {
+    let listener = TcpListener::bind("127.0.0.1:8080")?;
+
+    for stream in listener.incoming() {
+        handle_client(stream?)?;
+    }
+    Ok(())
+}
diff --git a/chapter2/src/2_8_2/main.rs b/chapter2/src/2_8_2/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    unimplemented!("『Goならわかるシステムプログラミング』の該当問題は `encoding/csv` パッケージを使うことが主題なので、Rustへの移植はできない。");
+}
diff --git a/chapter3/Cargo.toml b/chapter3/Cargo.toml
@@ -7,3 +7,8 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+lib = { path = "../lib" }
+
+[[bin]]
+name = "main_3_1"
+path = "src/3_1/main.rs"
diff --git a/chapter3/src/3_1/bytes_read.rs b/chapter3/src/3_1/bytes_read.rs
@@ -0,0 +1,19 @@
+use std::fmt::Display;
+
+#[derive(Debug)]
+pub(super) struct BytesRead {
+    bytes: Vec<u8>,
+    len: usize,
+}
+
+impl BytesRead {
+    pub(super) fn new(bytes: Vec<u8>, len: usize) -> Self {
+        Self { bytes, len }
+    }
+}
+
+impl Display for BytesRead {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{} bytes read:\n{:02x?}", self.len, self.bytes)
+    }
+}
diff --git a/chapter3/src/3_1/main.rs b/chapter3/src/3_1/main.rs
@@ -0,0 +1,21 @@
+mod bytes_read;
+
+use std::{fs::File, io};
+
+use bytes_read::BytesRead;
+
+/// Reads up to 1024 bytes from `r`.
+fn read_1024bytes<R: io::Read>(r: &mut R) -> io::Result<BytesRead> {
+    let mut buf = [0u8; 1024];
+    let len = r.read(&mut buf)?;
+    Ok(BytesRead::new(buf.into(), len))
+}
+
+fn main() -> io::Result<()> {
+    let mut f = File::open("Cargo.toml")?;
+
+    let bytes_read = read_1024bytes(&mut f)?;
+    println!("{}", bytes_read);
+
+    Ok(())
+}
diff --git a/chapter3/src/main.rs b/chapter3/src/main.rs
diff --git a/chapter5/Cargo.toml b/chapter5/Cargo.toml
@@ -7,3 +7,4 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+lib = { path = "../lib" }
diff --git a/chapter6/Cargo.toml b/chapter6/Cargo.toml
@@ -7,3 +7,4 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+lib = { path = "../lib" }
diff --git a/chapter7/Cargo.toml b/chapter7/Cargo.toml
@@ -7,3 +7,4 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+lib = { path = "../lib" }
diff --git a/chapter8/Cargo.toml b/chapter8/Cargo.toml
@@ -7,3 +7,4 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+lib = { path = "../lib" }
diff --git a/chapter9/Cargo.toml b/chapter9/Cargo.toml
@@ -7,3 +7,4 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+lib = { path = "../lib" }
diff --git a/lib/Cargo.toml b/lib/Cargo.toml
diff --git a/lib/src/io.rs b/lib/src/io.rs
diff --git a/lib/src/io/multi_writer.rs b/lib/src/io/multi_writer.rs
diff --git a/lib/src/lib.rs b/lib/src/lib.rs

Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,6 @@ members = [`
`17`	`17`	`"chapter15",`
`18`	`18`	`"chapter16",`
`19`	`19`	`"chapter17",`
`20`		`- "appendix"`
	`20`	`+ "appendix",`
	`21`	`+ "lib"`
`21`	`22`	`]`
Original file line number	Diff line number	Diff line change
`@@ -7,3 +7,4 @@ edition = "2018"`
`7`	`7`	`# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html`
`8`	`8`
`9`	`9`	`[dependencies]`
	`10`	`+lib = { path = "../lib" }`