ch16 恐れるな！並行性の和訳を最新版に更新

shinmili · shinmili · commit b7f9baf8961d · 2024-05-26T12:58:07.000+09:00
rust-lang/book@19c40bf
diff --git a/listings/ch16-fearless-concurrency/listing-16-01/Cargo.toml b/listings/ch16-fearless-concurrency/listing-16-01/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "threads"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/listings/ch16-fearless-concurrency/listing-16-01/src/main.rs b/listings/ch16-fearless-concurrency/listing-16-01/src/main.rs
@@ -4,12 +4,14 @@ use std::time::Duration;
 fn main() {
     thread::spawn(|| {
         for i in 1..10 {
+            //       "やあ！立ち上げたスレッドから数字{}だよ！"
             println!("hi number {} from the spawned thread!", i);
             thread::sleep(Duration::from_millis(1));
         }
     });
 
     for i in 1..5 {
+        //       "やあ！メインスレッドから数字{}だよ！"
         println!("hi number {} from the main thread!", i);
         thread::sleep(Duration::from_millis(1));
     }
diff --git a/listings/ch16-fearless-concurrency/listing-16-02/Cargo.toml b/listings/ch16-fearless-concurrency/listing-16-02/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "threads"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/listings/ch16-fearless-concurrency/listing-16-03/Cargo.toml b/listings/ch16-fearless-concurrency/listing-16-03/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "threads"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/listings/ch16-fearless-concurrency/listing-16-03/output.txt b/listings/ch16-fearless-concurrency/listing-16-03/output.txt
@@ -1,14 +1,18 @@
 $ cargo run
    Compiling threads v0.1.0 (file:///projects/threads)
 error[E0373]: closure may outlive the current function, but it borrows `v`, which is owned by the current function
+(エラー: クロージャは現在の関数よりも長生きするかもしれませんが、現在の関数が所有している`v`を借用しています)
  --> src/main.rs:6:32
   |
 6 |     let handle = thread::spawn(|| {
   |                                ^^ may outlive borrowed value `v`
+  |                                  (借用されている値`v`より長生きするかもしれません)
 7 |         println!("Here's a vector: {:?}", v);
   |                                           - `v` is borrowed here
+  |                                            (`v`はここで借用されています)
   |
 note: function requires argument type to outlive `'static`
+(注釈: 関数は引数型が`'static`より長生きすることを要求しています)
  --> src/main.rs:6:18
   |
 6 |       let handle = thread::spawn(|| {
@@ -17,13 +21,10 @@ note: function requires argument type to outlive `'static`
 8 | |     });
   | |______^
 help: to force the closure to take ownership of `v` (and any other referenced variables), use the `move` keyword
+(ヘルプ: `v`(や他の参照されている変数)の所有権をクロージャに奪わせるには、`move`キーワードを使用してください)
   |
 6 |     let handle = thread::spawn(move || {
-  |                                ^^^^^^^
-
-error: aborting due to previous error
+  |                                ++++
 
 For more information about this error, try `rustc --explain E0373`.
-error: could not compile `threads`.
-
-To learn more, run the command again with --verbose.
+error: could not compile `threads` (bin "threads") due to 1 previous error
diff --git a/listings/ch16-fearless-concurrency/listing-16-03/src/main.rs b/listings/ch16-fearless-concurrency/listing-16-03/src/main.rs
@@ -4,6 +4,7 @@ fn main() {
     let v = vec![1, 2, 3];
 
     let handle = thread::spawn(|| {
+        //       "こちらがベクタ: {:?}"
         println!("Here's a vector: {:?}", v);
     });
 
diff --git a/listings/ch16-fearless-concurrency/listing-16-04/Cargo.toml b/listings/ch16-fearless-concurrency/listing-16-04/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "threads"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/listings/ch16-fearless-concurrency/listing-16-04/src/main.rs b/listings/ch16-fearless-concurrency/listing-16-04/src/main.rs
@@ -7,7 +7,7 @@ fn main() {
         println!("Here's a vector: {:?}", v);
     });
 
-    drop(v); // oh no!
+    drop(v); // あちゃー！
 
     handle.join().unwrap();
 }
diff --git a/listings/ch16-fearless-concurrency/listing-16-05/Cargo.toml b/listings/ch16-fearless-concurrency/listing-16-05/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "threads"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/listings/ch16-fearless-concurrency/listing-16-06/Cargo.toml b/listings/ch16-fearless-concurrency/listing-16-06/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "message-passing"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/listings/ch16-fearless-concurrency/listing-16-07/Cargo.toml b/listings/ch16-fearless-concurrency/listing-16-07/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "message-passing"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/listings/ch16-fearless-concurrency/listing-16-08/Cargo.toml b/listings/ch16-fearless-concurrency/listing-16-08/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "message-passing"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/listings/ch16-fearless-concurrency/listing-16-08/src/main.rs b/listings/ch16-fearless-concurrency/listing-16-08/src/main.rs
@@ -10,5 +10,6 @@ fn main() {
     });
 
     let received = rx.recv().unwrap();
+    //       "取得しました: {}"
     println!("Got: {}", received);
 }
diff --git a/listings/ch16-fearless-concurrency/listing-16-09/Cargo.toml b/listings/ch16-fearless-concurrency/listing-16-09/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "message-passing"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/listings/ch16-fearless-concurrency/listing-16-09/output.txt b/listings/ch16-fearless-concurrency/listing-16-09/output.txt
@@ -1,18 +1,25 @@
 $ cargo run
    Compiling message-passing v0.1.0 (file:///projects/message-passing)
 error[E0382]: borrow of moved value: `val`
+(エラー: ムーブされた値の借用: `val`)
   --> src/main.rs:10:31
    |
 8  |         let val = String::from("hi");
-   |             --- move occurs because `val` has type `std::string::String`, which does not implement the `Copy` trait
+   |             --- move occurs because `val` has type `String`, which does not implement the `Copy` trait
+   |                (`val`は`Copy`トレイトを実装しない`String`型を持つので、ムーブが発生します)
 9  |         tx.send(val).unwrap();
    |                 --- value moved here
+   |                    (値はここでムーブされます)
 10 |         println!("val is {}", val);
    |                               ^^^ value borrowed here after move
-
-error: aborting due to previous error
+   |                                  (ここでムーブ後に借用されます)
+   |
+   = note: this error originates in the macro `$crate::format_args_nl` which comes from the expansion of the macro `println` (in Nightly builds, run with -Z macro-backtrace for more info)
+help: consider cloning the value if the performance cost is acceptable
+(ヘルプ: パフォーマンスコストが許容できる場合は、クローンすることを検討してください)
+   |
+9  |         tx.send(val.clone()).unwrap();
+   |                    ++++++++
 
 For more information about this error, try `rustc --explain E0382`.
-error: could not compile `message-passing`.
-
-To learn more, run the command again with --verbose.
+error: could not compile `message-passing` (bin "message-passing") due to 1 previous error
diff --git a/listings/ch16-fearless-concurrency/listing-16-09/src/main.rs b/listings/ch16-fearless-concurrency/listing-16-09/src/main.rs
@@ -7,6 +7,7 @@ fn main() {
     thread::spawn(move || {
         let val = String::from("hi");
         tx.send(val).unwrap();
+        //       "valは{}です"
         println!("val is {}", val);
     });
 
diff --git a/listings/ch16-fearless-concurrency/listing-16-10/Cargo.toml b/listings/ch16-fearless-concurrency/listing-16-10/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "message-passing"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/listings/ch16-fearless-concurrency/listing-16-10/src/main.rs b/listings/ch16-fearless-concurrency/listing-16-10/src/main.rs
@@ -6,6 +6,7 @@ fn main() {
     let (tx, rx) = mpsc::channel();
 
     thread::spawn(move || {
+    	// スレッドからやあ (hi from the thread)
         let vals = vec![
             String::from("hi"),
             String::from("from"),
diff --git a/listings/ch16-fearless-concurrency/listing-16-11/Cargo.toml b/listings/ch16-fearless-concurrency/listing-16-11/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "message-passing"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/listings/ch16-fearless-concurrency/listing-16-11/src/main.rs b/listings/ch16-fearless-concurrency/listing-16-11/src/main.rs
@@ -8,7 +8,7 @@ fn main() {
 
     let (tx, rx) = mpsc::channel();
 
-    let tx1 = mpsc::Sender::clone(&tx);
+    let tx1 = tx.clone();
     thread::spawn(move || {
         let vals = vec![
             String::from("hi"),
@@ -24,6 +24,7 @@ fn main() {
     });
 
     thread::spawn(move || {
+        // 君のためにもっとメッセージを (more messages for you)
         let vals = vec![
             String::from("more"),
             String::from("messages"),
diff --git a/listings/ch16-fearless-concurrency/listing-16-12/Cargo.toml b/listings/ch16-fearless-concurrency/listing-16-12/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "shared-state"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/listings/ch16-fearless-concurrency/listing-16-13/Cargo.toml b/listings/ch16-fearless-concurrency/listing-16-13/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "shared-state"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/listings/ch16-fearless-concurrency/listing-16-13/output.txt b/listings/ch16-fearless-concurrency/listing-16-13/output.txt
@@ -1,19 +1,20 @@
 $ cargo run
    Compiling shared-state v0.1.0 (file:///projects/shared-state)
-error[E0382]: use of moved value: `counter`
-  --> src/main.rs:9:36
+error[E0382]: borrow of moved value: `counter`
+(エラー: ムーブされた値の借用: `counter`)
+  --> src/main.rs:21:29
    |
 5  |     let counter = Mutex::new(0);
-   |         ------- move occurs because `counter` has type `std::sync::Mutex<i32>`, which does not implement the `Copy` trait
+   |         ------- move occurs because `counter` has type `Mutex<i32>`, which does not implement the `Copy` trait
+   |                (`counter`は`Copy`トレイトを実装しない`Mutex<i32>`型を持つので、ムーブが発生します)
 ...
 9  |         let handle = thread::spawn(move || {
-   |                                    ^^^^^^^ value moved into closure here, in previous iteration of loop
-10 |             let mut num = counter.lock().unwrap();
-   |                           ------- use occurs due to use in closure
-
-error: aborting due to previous error
+   |                                    ------- value moved into closure here, in previous iteration of loop
+   |                                           (値は、ループの前回の反復時に、ここでクロージャ内にムーブされます)
+...
+21 |     println!("Result: {}", *counter.lock().unwrap());
+   |                             ^^^^^^^ value borrowed here after move
+   |                                    (値はここでムーブ後に借用されています)
 
 For more information about this error, try `rustc --explain E0382`.
-error: could not compile `shared-state`.
-
-To learn more, run the command again with --verbose.
+error: could not compile `shared-state` (bin "shared-state") due to 1 previous error
diff --git a/listings/ch16-fearless-concurrency/listing-16-14/Cargo.toml b/listings/ch16-fearless-concurrency/listing-16-14/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "shared-state"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/listings/ch16-fearless-concurrency/listing-16-14/output.txt b/listings/ch16-fearless-concurrency/listing-16-14/output.txt
@@ -1,17 +1,35 @@
 $ cargo run
    Compiling shared-state v0.1.0 (file:///projects/shared-state)
-error[E0277]: `std::rc::Rc<std::sync::Mutex<i32>>` cannot be sent between threads safely
-   --> src/main.rs:11:22
-    |
-11  |         let handle = thread::spawn(move || {
-    |                      ^^^^^^^^^^^^^ `std::rc::Rc<std::sync::Mutex<i32>>` cannot be sent between threads safely
-    |
-    = help: within `[closure@src/main.rs:11:36: 15:10 counter:std::rc::Rc<std::sync::Mutex<i32>>]`, the trait `std::marker::Send` is not implemented for `std::rc::Rc<std::sync::Mutex<i32>>`
-    = note: required because it appears within the type `[closure@src/main.rs:11:36: 15:10 counter:std::rc::Rc<std::sync::Mutex<i32>>]`
-
-error: aborting due to previous error
+error[E0277]: `Rc<Mutex<i32>>` cannot be sent between threads safely
+(エラー: `Rc<Mutex<i32>>`はスレッド間で安全に送信できません)
+  --> src/main.rs:11:36
+   |
+11 |           let handle = thread::spawn(move || {
+   |                        ------------- ^------
+   |                        |             |
+   |  ______________________|_____________within this `{closure@src/main.rs:11:36: 11:43}`
+   | |                      |            (この`{[closure@src/main.rs:11:36: 11:43}`の中で)
+   | |                      |
+   | |                      required by a bound introduced by this call
+   | |                     (この呼び出しによって導入される境界によって必要とされます)
+12 | |             let mut num = counter.lock().unwrap();
+13 | |
+14 | |             *num += 1;
+15 | |         });
+   | |_________^ `Rc<Mutex<i32>>` cannot be sent between threads safely
+   |            (`Rc<Mutex<i32>>`はスレッド間で安全に送信できません)
+   |
+   = help: within `{closure@src/main.rs:11:36: 11:43}`, the trait `Send` is not implemented for `Rc<Mutex<i32>>`
+   =(ヘルプ: `{closure@src/main.rs:11:36: 11:43}`の中で、トレイト`Send`は`Rc<Mutex<i32>>`に対して実装されていません
+note: required because it's used within this closure
+(注釈: このクロージャの中で使用されているので、要求されます)
+  --> src/main.rs:11:36
+   |
+11 |         let handle = thread::spawn(move || {
+   |                                    ^^^^^^^
+note: required by a bound in `spawn`
+(注釈: `spawn`の境界によって要求されます)
+  --> /rustc/07dca489ac2d933c78d3c5158e3f43beefeb02ce/library/std/src/thread/mod.rs:678:1
 
 For more information about this error, try `rustc --explain E0277`.
-error: could not compile `shared-state`.
-
-To learn more, run the command again with --verbose.
+error: could not compile `shared-state` (bin "shared-state") due to 1 previous error
diff --git a/listings/ch16-fearless-concurrency/listing-16-15/Cargo.toml b/listings/ch16-fearless-concurrency/listing-16-15/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "shared-state"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/listings/ch16-fearless-concurrency/no-listing-01-join-too-early/Cargo.toml b/listings/ch16-fearless-concurrency/no-listing-01-join-too-early/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "threads"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/listings/ch16-fearless-concurrency/no-listing-02-no-loop-to-understand-error/Cargo.toml b/listings/ch16-fearless-concurrency/no-listing-02-no-loop-to-understand-error/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "shared-state"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/listings/ch16-fearless-concurrency/output-only-01-move-drop/Cargo.toml b/listings/ch16-fearless-concurrency/output-only-01-move-drop/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "threads"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/listings/ch16-fearless-concurrency/output-only-01-move-drop/output.txt b/listings/ch16-fearless-concurrency/output-only-01-move-drop/output.txt
diff --git a/src/ch16-00-concurrency.md b/src/ch16-00-concurrency.md
diff --git a/src/ch16-01-threads.md b/src/ch16-01-threads.md
diff --git a/src/ch16-02-message-passing.md b/src/ch16-02-message-passing.md
diff --git a/src/ch16-03-shared-state.md b/src/ch16-03-shared-state.md
diff --git a/src/ch16-04-extensible-concurrency-sync-and-send.md b/src/ch16-04-extensible-concurrency-sync-and-send.md

Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,14 @@ use std::time::Duration;`
`4`	`4`	`fn main() {`
`5`	`5`	`thread::spawn(\|\| {`
`6`	`6`	`for i in 1..10 {`
	`7`	`+ // "やあ！立ち上げたスレッドから数字{}だよ！"`
`7`	`8`	`println!("hi number {} from the spawned thread!", i);`
`8`	`9`	`thread::sleep(Duration::from_millis(1));`
`9`	`10`	`}`
`10`	`11`	`});`
`11`	`12`
`12`	`13`	`for i in 1..5 {`
	`14`	`+ // "やあ！メインスレッドから数字{}だよ！"`
`13`	`15`	`println!("hi number {} from the main thread!", i);`
`14`	`16`	`thread::sleep(Duration::from_millis(1));`
`15`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ fn main() {`
`7`	`7`	`println!("Here's a vector: {:?}", v);`
`8`	`8`	`});`
`9`	`9`
`10`		`- drop(v); // oh no!`
	`10`	`+ drop(v); // あちゃー！`
`11`	`11`
`12`	`12`	`handle.join().unwrap();`
`13`	`13`	`}`