第1～20章と付録以外の部分の和訳を最新版に更新

dot/trpl15-04.dot

@@ -0,0 +1,16 @@
+digraph {
+    node[shape=record];
+    rankdir=LR;
+
+    l1[label="{<data> 5| <next>}"];
+    l2[label="{<data> 10| <next>}"];
+
+    {node[shape=point height=0] invisible_start invisible_end}
+
+    a -> l1:n;
+    b -> l2:n;
+    invisible_start:n -> l1[arrowtail=none];
+    invisible_start:s -> invisible_end:s[dir=none];
+    l1:next:c -> l2:data;
+    l2:next:c -> invisible_end:n[arrowhead=none];
+}

ferris.css

@@ -19,13 +19,25 @@ body.ayu .not_desired_behavior {
   background: #501f21;
 }
 
-.ferris {
+.ferris-container {
   position: absolute;
   z-index: 99;
   right: 5px;
   top: 30px;
-	width: 10%;
-	height: auto;
+}
+
+.ferris {
+  vertical-align: top;
+  margin-left: 0.2em;
+  height: auto;
+}
+
+.ferris-large {
+  width: 4.5em;
+}
+
+.ferris-small {
+  width: 2.3em;
 }
 
 .ferris-explain {

ferris.js

@@ -7,10 +7,6 @@ var ferrisTypes = [
     attr: 'panics',
     title: 'This code panics!'
   },
-  {
-    attr: 'unsafe',
-    title: 'This code block contains unsafe code.'
-  },
   {
     attr: 'not_desired_behavior',
     title: 'This code does not produce the desired behavior.'
@@ -23,29 +19,47 @@ document.addEventListener('DOMContentLoaded', () => {
   }
 })
 
-function attachFerrises (type) {
+function attachFerrises(type) {
   var elements = document.getElementsByClassName(type.attr)
 
   for (var codeBlock of elements) {
-    var lines = codeBlock.textContent.split(/\r|\r\n|\n/).length - 1;
-
-    if (lines >= 4) {
-      attachFerris(codeBlock, type)
+    var lines = codeBlock.innerText.replace(/\n$/, '').split(/\n/).length
+    var size = 'large'
+    if (lines < 4) {
+      size = 'small'
     }
+
+    var container = prepareFerrisContainer(codeBlock, size == 'small')
+    container.appendChild(createFerris(type, size))
+  }
+}
+
+function prepareFerrisContainer(element, useButtons) {
+  var foundButtons = element.parentElement.querySelector('.buttons')
+  if (useButtons && foundButtons) {
+    return foundButtons
   }
+
+  var div = document.createElement('div')
+  div.classList.add('ferris-container')
+
+  element.parentElement.insertBefore(div, element)
+
+  return div
 }
 
-function attachFerris (element, type) {
+function createFerris(type, size) {
   var a = document.createElement('a')
   a.setAttribute('href', 'ch00-00-introduction.html#ferris')
   a.setAttribute('target', '_blank')
 
   var img = document.createElement('img')
   img.setAttribute('src', 'img/ferris/' + type.attr + '.svg')
   img.setAttribute('title', type.title)
-  img.className = 'ferris'
+  img.classList.add('ferris')
+  img.classList.add('ferris-' + size)
 
   a.appendChild(img)
 
-  element.parentElement.insertBefore(a, element)
+  return a
 }

listings/ch02-guessing-game-tutorial/listing-02-01/src/main.rs

@@ -25,7 +25,7 @@ fn main() {
     // ANCHOR_END: expect
 
     // ANCHOR: print_guess
-    println!("You guessed: {}", guess);     // 次のように予想しました: {}
+    println!("You guessed: {guess}");       // 次のように予想しました: {guess}
     // ANCHOR_END: print_guess
 }
 // ANCHOR: all

listings/ch02-guessing-game-tutorial/listing-02-02/Cargo.toml

@@ -6,4 +6,4 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-rand = "0.8.3"
+rand = "0.8.5"

listings/ch02-guessing-game-tutorial/listing-02-02/src/main.rs

@@ -11,5 +11,5 @@ fn main() {
         .read_line(&mut guess)
         .expect("Failed to read line");
 
-    println!("You guessed: {}", guess);
+    println!("You guessed: {guess}");
 }

listings/ch02-guessing-game-tutorial/listing-02-03/Cargo.toml

@@ -6,4 +6,4 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-rand = "0.8.3"
+rand = "0.8.5"

listings/ch02-guessing-game-tutorial/listing-02-03/src/main.rs

@@ -8,10 +8,10 @@ fn main() {
     println!("Guess the number!");
 
     // ANCHOR: ch07-04
-    let secret_number = rand::thread_rng().gen_range(1..101);
+    let secret_number = rand::thread_rng().gen_range(1..=100);
     // ANCHOR_END: ch07-04
 
-    println!("The secret number is: {}", secret_number);    //秘密の数字は次の通り: {}
+    println!("The secret number is: {secret_number}");    //秘密の数字は次の通り: {secret_number}
 
     println!("Please input your guess.");
 
@@ -21,7 +21,7 @@ fn main() {
         .read_line(&mut guess)
         .expect("Failed to read line");
 
-    println!("You guessed: {}", guess);
+    println!("You guessed: {guess}");
     // ANCHOR: ch07-04
 }
 // ANCHOR_END: ch07-04

listings/ch02-guessing-game-tutorial/listing-02-04/Cargo.toml

@@ -6,4 +6,4 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-rand = "0.8.3"
+rand = "0.8.5"

listings/ch02-guessing-game-tutorial/listing-02-04/output.txt

@@ -5,42 +5,22 @@ $ cargo build
    Compiling ppv-lite86 v0.2.10
    Compiling rand_core v0.6.2
    Compiling rand_chacha v0.3.0
-   Compiling rand v0.8.3
+   Compiling rand v0.8.5
    Compiling guessing_game v0.1.0 (file:///projects/guessing_game)
 error[E0308]: mismatched types          (型が合いません)
   --> src/main.rs:22:21
    |
 22 |     match guess.cmp(&secret_number) {
-   |                     ^^^^^^^^^^^^^^ expected struct `String`, found integer
-   |                                    (構造体`std::string::String`を予期したけど、整数型変数が見つかりました)
+   |                 --- ^^^^^^^^^^^^^^ expected `&String`, found `&{integer}`
+   |                 |                  (`&String`を予期したけど、`&{integer}`が見つかりました)
+   |                 |
+   |                 arguments to this method are incorrect
+   |                 (このメソッドへの引数が正しくありません)
    |
    = note: expected reference `&String`
               found reference `&{integer}`
+note: method defined here
+  --> /rustc/07dca489ac2d933c78d3c5158e3f43beefeb02ce/library/core/src/cmp.rs:814:8
 
-error[E0283]: type annotations needed for `{integer}`
-   --> src/main.rs:8:44
-    |
-8   |     let secret_number = rand::thread_rng().gen_range(1..101);
-    |         -------------                      ^^^^^^^^^ cannot infer type for type `{integer}`
-    |         |
-    |         consider giving `secret_number` a type
-    |
-    = note: multiple `impl`s satisfying `{integer}: SampleUniform` found in the `rand` crate:
-            - impl SampleUniform for i128;
-            - impl SampleUniform for i16;
-            - impl SampleUniform for i32;
-            - impl SampleUniform for i64;
-            and 8 more
-note: required by a bound in `gen_range`
-   --> /Users/carolnichols/.cargo/registry/src/github.com-1ecc6299db9ec823/rand-0.8.3/src/rng.rs:129:12
-    |
-129 |         T: SampleUniform,
-    |            ^^^^^^^^^^^^^ required by this bound in `gen_range`
-help: consider specifying the type arguments in the function call
-    |
-8   |     let secret_number = rand::thread_rng().gen_range::<T, R>(1..101);
-    |                                                     ++++++++
-
-Some errors have detailed explanations: E0283, E0308.
-For more information about an error, try `rustc --explain E0283`.
-error: could not compile `guessing_game` due to 2 previous errors      (先の2つのエラーのため、`guessing_game`をコンパイルできませんでした)
+For more information about this error, try `rustc --explain E0308`.
+error: could not compile `guessing_game` (bin "guessing_game") due to 1 previous error      (先の1つのエラーのため、`guessing_game` (bin "guessing_game") をコンパイルできませんでした)