ch08 一般的なコレクションの和訳を最新版に更新

rust-lang/book@19c40bf
rust-lang-ja · shinmili · May 26, 2024 · Nov 28, 2024 · Dec 26, 2024 · May 26, 2024
commit 1139c138529790053dd07ba9645e5e47db106402
diff --git a/listings/ch08-common-collections/listing-08-01/Cargo.toml b/listings/ch08-common-collections/listing-08-01/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "collections"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/listings/ch08-common-collections/listing-08-02/Cargo.toml b/listings/ch08-common-collections/listing-08-02/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "collections"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/listings/ch08-common-collections/listing-08-03/Cargo.toml b/listings/ch08-common-collections/listing-08-03/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "collections"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/listings/ch08-common-collections/listing-08-04/Cargo.toml b/listings/ch08-common-collections/listing-08-04/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "collections"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/listings/ch08-common-collections/listing-08-04/src/main.rs b/listings/ch08-common-collections/listing-08-04/src/main.rs
@@ -1,9 +1,17 @@
 fn main() {
     // ANCHOR: here
-    {
-        let v = vec![1, 2, 3, 4];
+    let v = vec![1, 2, 3, 4, 5];
 
-        // vで作業をする
-    } // <- vはここでスコープを抜け、解放される
-      // ANCHOR_END: here
+    let third: &i32 = &v[2];
+    //       "3つ目の要素は{third}です"
+    println!("The third element is {third}");
+
+    let third: Option<&i32> = v.get(2);
+    match third {
+        //                      "3つ目の要素は{third}です"
+        Some(third) => println!("The third element is {third}"),
+        //               "3つ目の要素はありません。"
+        None => println!("There is no third element."),
+    }
+    // ANCHOR_END: here
 }
diff --git a/listings/ch08-common-collections/listing-08-05/Cargo.toml b/listings/ch08-common-collections/listing-08-05/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "collections"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/listings/ch08-common-collections/listing-08-05/src/main.rs b/listings/ch08-common-collections/listing-08-05/src/main.rs
@@ -2,14 +2,7 @@ fn main() {
     // ANCHOR: here
     let v = vec![1, 2, 3, 4, 5];
 
-    let third: &i32 = &v[2];
-    println!("The third element is {}", third);
-
-    match v.get(2) {
-        //                      "3つ目の要素は{}です"
-        Some(third) => println!("The third element is {}", third),
-        //               "3つ目の要素はありません。"
-        None => println!("There is no third element."),
-    }
+    let does_not_exist = &v[100];
+    let does_not_exist = v.get(100);
     // ANCHOR_END: here
 }
diff --git a/listings/ch08-common-collections/listing-08-06/Cargo.toml b/listings/ch08-common-collections/listing-08-06/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "collections"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/...mmon-collections/listing-08-07/output.txt → ...mmon-collections/listing-08-06/output.txt b/...mmon-collections/listing-08-07/output.txt → ...mmon-collections/listing-08-06/output.txt
@@ -7,18 +7,14 @@ error[E0502]: cannot borrow `v` as mutable because it is also borrowed as immuta
 4 |     let first = &v[0];
   |                  - immutable borrow occurs here
   |                   (不変借用はここで発生しています)
-5 | 
+5 |
 6 |     v.push(6);
   |     ^^^^^^^^^ mutable borrow occurs here
   |              (可変借用はここで発生しています)
-7 | 
-8 |     println!("The first element is: {}", first);
-  |                                          ----- immutable borrow later used here
-  |                                               (その後、不変借用はここで使われています)
-
-error: aborting due to previous error
+7 |
+8 |     println!("The first element is: {first}");
+  |                                     ------- immutable borrow later used here
+  |                                            (その後、不変借用はここで使われています)
 
 For more information about this error, try `rustc --explain E0502`.
-error: could not compile `collections`.
-
-To learn more, run the command again with --verbose.
+error: could not compile `collections` (bin "collections") due to 1 previous error
diff --git a/listings/ch08-common-collections/listing-08-06/src/main.rs b/listings/ch08-common-collections/listing-08-06/src/main.rs
@@ -1,8 +1,12 @@
 fn main() {
     // ANCHOR: here
-    let v = vec![1, 2, 3, 4, 5];
+    let mut v = vec![1, 2, 3, 4, 5];
 
-    let does_not_exist = &v[100];
-    let does_not_exist = v.get(100);
+    let first = &v[0];
+
+    v.push(6);
+
+    //       "最初の要素は: {first}"
+    println!("The first element is: {first}");
     // ANCHOR_END: here
 }
diff --git a/listings/ch08-common-collections/listing-08-07/Cargo.toml b/listings/ch08-common-collections/listing-08-07/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "collections"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/listings/ch08-common-collections/listing-08-07/src/main.rs b/listings/ch08-common-collections/listing-08-07/src/main.rs
@@ -1,11 +1,8 @@
 fn main() {
     // ANCHOR: here
-    let mut v = vec![1, 2, 3, 4, 5];
-
-    let first = &v[0];
-
-    v.push(6);
-
-    println!("The first element is: {}", first);
+    let v = vec![100, 32, 57];
+    for i in &v {
+        println!("{i}");
+    }
     // ANCHOR_END: here
 }
diff --git a/listings/ch08-common-collections/listing-08-08/Cargo.toml b/listings/ch08-common-collections/listing-08-08/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "collections"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/listings/ch08-common-collections/listing-08-08/src/main.rs b/listings/ch08-common-collections/listing-08-08/src/main.rs
@@ -1,8 +1,8 @@
 fn main() {
     // ANCHOR: here
-    let v = vec![100, 32, 57];
-    for i in &v {
-        println!("{}", i);
+    let mut v = vec![100, 32, 57];
+    for i in &mut v {
+        *i += 50;
     }
     // ANCHOR_END: here
 }
diff --git a/listings/ch08-common-collections/listing-08-09/Cargo.toml b/listings/ch08-common-collections/listing-08-09/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "collections"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/listings/ch08-common-collections/listing-08-09/src/main.rs b/listings/ch08-common-collections/listing-08-09/src/main.rs
@@ -1,8 +1,15 @@
 fn main() {
     // ANCHOR: here
-    let mut v = vec![100, 32, 57];
-    for i in &mut v {
-        *i += 50;
+    enum SpreadsheetCell {
+        Int(i32),
+        Float(f64),
+        Text(String),
     }
+
+    let row = vec![
+        SpreadsheetCell::Int(3),
+        SpreadsheetCell::Text(String::from("blue")),
+        SpreadsheetCell::Float(10.12),
+    ];
     // ANCHOR_END: here
 }
diff --git a/listings/ch08-common-collections/listing-08-10/Cargo.toml b/listings/ch08-common-collections/listing-08-10/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "collections"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/listings/ch08-common-collections/listing-08-10/src/main.rs b/listings/ch08-common-collections/listing-08-10/src/main.rs
@@ -1,15 +1,9 @@
 fn main() {
     // ANCHOR: here
-    enum SpreadsheetCell {
-        Int(i32),
-        Float(f64),
-        Text(String),
-    }
+    {
+        let v = vec![1, 2, 3, 4];
 
-    let row = vec![
-        SpreadsheetCell::Int(3),
-        SpreadsheetCell::Text(String::from("blue")),
-        SpreadsheetCell::Float(10.12),
-    ];
-    // ANCHOR_END: here
+        // vで作業をする
+    } // <- vはここでスコープを抜け、解放される
+      // ANCHOR_END: here
 }
diff --git a/listings/ch08-common-collections/listing-08-11/Cargo.toml b/listings/ch08-common-collections/listing-08-11/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "collections"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/listings/ch08-common-collections/listing-08-12/Cargo.toml b/listings/ch08-common-collections/listing-08-12/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "collections"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/listings/ch08-common-collections/listing-08-13/Cargo.toml b/listings/ch08-common-collections/listing-08-13/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "collections"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/listings/ch08-common-collections/listing-08-14/Cargo.toml b/listings/ch08-common-collections/listing-08-14/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "collections"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/listings/ch08-common-collections/listing-08-15/Cargo.toml b/listings/ch08-common-collections/listing-08-15/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "collections"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/listings/ch08-common-collections/listing-08-16/Cargo.toml b/listings/ch08-common-collections/listing-08-16/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "collections"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/listings/ch08-common-collections/listing-08-16/src/main.rs b/listings/ch08-common-collections/listing-08-16/src/main.rs
@@ -3,6 +3,6 @@ fn main() {
     let mut s1 = String::from("foo");
     let s2 = "bar";
     s1.push_str(s2);
-    println!("s2 is {}", s2);
+    println!("s2 is {s2}");
     // ANCHOR_END: here
 }
diff --git a/listings/ch08-common-collections/listing-08-17/Cargo.toml b/listings/ch08-common-collections/listing-08-17/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "collections"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/listings/ch08-common-collections/listing-08-18/Cargo.toml b/listings/ch08-common-collections/listing-08-18/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "collections"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/listings/ch08-common-collections/listing-08-18/src/main.rs b/listings/ch08-common-collections/listing-08-18/src/main.rs
@@ -2,6 +2,6 @@ fn main() {
     // ANCHOR: here
     let s1 = String::from("Hello, ");
     let s2 = String::from("world!");
-    let s3 = s1 + &s2; // note s1 has been moved here and can no longer be used
+    let s3 = s1 + &s2; // s1はムーブされ、もう使用できないことに注意
                        // ANCHOR_END: here
 }
diff --git a/listings/ch08-common-collections/listing-08-19/Cargo.toml b/listings/ch08-common-collections/listing-08-19/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "collections"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/listings/ch08-common-collections/listing-08-19/output.txt b/listings/ch08-common-collections/listing-08-19/output.txt
@@ -1,16 +1,23 @@
 $ cargo run
    Compiling collections v0.1.0 (file:///projects/collections)
-error[E0277]: the type `std::string::String` cannot be indexed by `{integer}`
- --> src/main.rs:3:13
+error[E0277]: the type `String` cannot be indexed by `{integer}`
+(エラー: 型`String`は`{Integer}`で添え字アクセスできませんん)
+ --> src/main.rs:3:16
   |
 3 |     let h = s1[0];
-  |             ^^^^^ `std::string::String` cannot be indexed by `{integer}`
+  |                ^ `String` cannot be indexed by `{integer}`
+  |                 (`String`は`{Integer}`で添え字アクセスできません)
   |
-  = help: the trait `std::ops::Index<{integer}>` is not implemented for `std::string::String`
-
-error: aborting due to previous error
+  = help: the trait `Index<{integer}>` is not implemented for `String`
+    (ヘルプ: `Index<{Integer}>`というトレイトが`String`に対して実装されていません)
+  = help: the following other types implement trait `Index<Idx>`:
+    (ヘルプ: 以下の型であればトレイト`Index<Idx>`を実装しています:)
+            <String as Index<RangeFull>>
+            <String as Index<std::ops::Range<usize>>>
+            <String as Index<RangeFrom<usize>>>
+            <String as Index<RangeTo<usize>>>
+            <String as Index<RangeInclusive<usize>>>
+            <String as Index<RangeToInclusive<usize>>>
 
 For more information about this error, try `rustc --explain E0277`.
-error: could not compile `collections`.
-
-To learn more, run the command again with --verbose.
+error: could not compile `collections` (bin "collections") due to 1 previous error
diff --git a/listings/ch08-common-collections/listing-08-20/Cargo.toml b/listings/ch08-common-collections/listing-08-20/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "collections"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/listings/ch08-common-collections/listing-08-21/Cargo.toml b/listings/ch08-common-collections/listing-08-21/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "collections"
 version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]