Initial commit

.vs/ProjectSettings.json

@@ -0,0 +1,3 @@
+{
+  "CurrentProjectSetting": null
+}

.vs/VSWorkspaceState.json

@@ -0,0 +1,6 @@
+{
+  "ExpandedNodes": [
+    ""
+  ],
+  "PreviewInSolutionExplorer": false
+}

.vs/book/v17/DocumentLayout.json

@@ -0,0 +1,12 @@
+{
+  "Version": 1,
+  "WorkspaceRootPath": "E:\\Rust\\\u043A\u043D\u0438\u0433\u0438\\book\\",
+  "Documents": [],
+  "DocumentGroupContainers": [
+    {
+      "Orientation": 0,
+      "VerticalTabListWidth": 256,
+      "DocumentGroups": []
+    }
+  ]
+}

CONTRIBUTING.md

@@ -4,16 +4,16 @@
 
 ## Как устроен процесс перевода
 
-Перевод происходит исключительно в системе GitLocalize. Для регистрации в системе нужно авторизоваться через аккаунт на Github. Для каждого перевода создан отдельный проект.
-Список проектов можно найти [тут][books-projects].
+Перевод происходит исключительно в системе GitLocalize. Для регистрации в системе нужно авторизоваться через аккаунт на Github. Для каждого перевода создан отдельный дело.
+Список дел можно найти [тут][books-projects].
 
 Процесс перевода происходит в следующих этапах:
 
 1. Перевод файла
 2. После полного перевода файла появляется кнопка "Create Review Request" для отправки на ревью
-3. В течение недели корректор вычитывает перевод, правит ошибки, приводит книгу к одному стилю
-4. После этого корректор отправляет Pull Request на Github
-5. Модераторы перевода исправляют помарки, опечатки и технические ошибки, вызванные багами GitLocalize, и мержат перевод. После этого перевод синхронизируется с GitLocalize и появляется в системе
+3. В течение недели изменитель вычитывает перевод, правит ошибки, приводит книгу к одному стилю
+4. После этого изменитель отправляет Pull Request на Github
+5. Писари перевода исправляют помарки, опечатки и технические ошибки, вызванные багами GitLocalize, и мержат перевод. После этого перевод синхронизируется с GitLocalize и появляется в системе
 
 ## Соглашения о процессе перевода
 
@@ -26,7 +26,7 @@
 - Перевод должен быть в единой стилистике, которая поддерживается редактором. В [чате переводов][translations-chat] можно задать вопросы по стилистике и принести предложения по ней.
 
 ## Ресурсы
-- [Список проектов и переводов][books-projects]
+- [Список дел и переводов][books-projects]
 - [Словарь терминов и переводов](https://github.com/rust-lang-ru/dictionary#readme)
 - [Словарь для проверки орфографии](https://github.com/rust-lang-ru/common-configs/blob/master/.yaspellerrc)
 - [Чат переводов][translations-chat]

README.md

@@ -11,7 +11,7 @@
 
 ## GitLocalize
 
-Проект на GitLocalize: https://gitlocalize.com/repo/4579
+Дело на GitLocalize: https://gitlocalize.com/repo/4579
 
 ## Правила участия в переводе
 

rustbook-en/.github/workflows/main.yml

@@ -12,8 +12,8 @@ jobs:
     - name: Install Rust
       run: |
         rustup set profile minimal
-        rustup toolchain install 1.79 -c rust-docs
-        rustup default 1.79
+        rustup toolchain install 1.81 -c rust-docs
+        rustup default 1.81
     - name: Install mdbook
       run: |
         mkdir bin
@@ -36,8 +36,8 @@ jobs:
     - name: Install Rust
       run: |
         rustup set profile minimal
-        rustup toolchain install 1.79 -c rust-docs
-        rustup default 1.79
+        rustup toolchain install 1.81 -c rust-docs
+        rustup default 1.81
     - name: Run `tools` package tests
       run: |
         cargo test

rustbook-en/README.md

@@ -33,6 +33,16 @@ rust-lang/rust uses in [this file][rust-mdbook]. To get it:
 $ cargo install mdbook --locked --version <version_num>
 ```
 
+The book also uses two mdbook plugins which are part of this repository. If you
+do not install them, you will see warnings when building and the output will not
+look right, but you *will* still be able to build the book. To use the plugins,
+you should run:
+
+```bash
+$ cargo install --locked --path packages/mdbook-trpl-listing
+$ cargo install --locked --path packages/mdbook-trpl-note
+```
+
 ## Building
 
 To build the book, type:

rustbook-en/ci/dictionary.txt

@@ -2,8 +2,6 @@ personal_ws-1.1 en 0 utf-8
 abcabcabc
 abcd
 abcdefghijklmnopqrstuvwxyz
-adaptor
-adaptors
 AddAssign
 Addr
 adfb

rustbook-en/dot/trpl04-05.dot

@@ -1,32 +1,38 @@
 digraph {
-    rankdir=LR;
-    overlap=false;
-    dpi=300.0;
-    node [shape="plaintext"];
-
-    table0[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
-        <TR><TD COLSPAN="2" SIDES="B">s</TD></TR>
-        <TR><TD>name</TD><TD>value</TD></TR>
-        <TR><TD>ptr</TD><TD PORT="borrower"></TD></TR>
-    </TABLE>>];
-    table1[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
-        <TR><TD COLSPAN="2" SIDES="B">s1</TD></TR>
-        <TR><TD>name</TD><TD>value</TD></TR>
-        <TR><TD PORT="borrowee">ptr</TD><TD PORT="pointer"></TD></TR>
-        <TR><TD>len</TD><TD>5</TD></TR>
-        <TR><TD>capacity</TD><TD>5</TD></TR>
-    </TABLE>>];
-    table2[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
-        <TR><TD>index</TD><TD>value</TD></TR>
-        <TR><TD PORT="pointee">0</TD><TD>h</TD></TR>
-        <TR><TD>1</TD><TD>e</TD></TR>
-        <TR><TD>2</TD><TD>l</TD></TR>
-        <TR><TD>3</TD><TD>l</TD></TR>
-        <TR><TD>4</TD><TD>o</TD></TR>
-    </TABLE>>];
-
-    edge[tailclip="false"];
-    table1:pointer:c -> table2:pointee;
-    table0:borrower:c -> table1:borrowee;
-}
-
+   rankdir = LR;
+   overlap = false;
+   dpi = 300.0;
+   node [shape = "plaintext";];
+
+   s [label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
+      <TR><TD COLSPAN="2" SIDES="B">s</TD></TR>
+      <TR><TD>name</TD><TD>value</TD></TR>
+      <TR><TD>ptr</TD><TD PORT="pointer"></TD></TR>
+      <TR><TD>len</TD><TD>4</TD></TR>
+      <TR><TD>capacity</TD><TD>4</TD></TR>
+      </TABLE>>;];
+
+   subgraph cluster_heap {
+      peripheries = 0;
+      rank = "same";
+
+      hello [label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="gray">
+         <TR><TD>index</TD><TD>value</TD></TR>
+         <TR><TD PORT="pointee">0</TD><TD>h</TD></TR>
+         <TR><TD>1</TD><TD>e</TD></TR>
+         <TR><TD>2</TD><TD>l</TD></TR>
+         <TR><TD>3</TD><TD>l</TD></TR>
+         <TR><TD>4</TD><TD>o</TD></TR>
+         </TABLE>>;];
+
+      ahoy [label = <<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
+         <TR><TD>index</TD><TD>value</TD></TR>
+         <TR><TD PORT="pointee">0</TD><TD>a</TD></TR>
+         <TR><TD>1</TD><TD>h</TD></TR>
+         <TR><TD>2</TD><TD>o</TD></TR>
+         <TR><TD>3</TD><TD>y</TD></TR>
+         </TABLE>>;];
+   }
+
+   s -> ahoy [tailport = "pointer:c"; headport = "pointee"; tailclip = false;];
+}

rustbook-en/dot/trpl04-06.dot

@@ -5,37 +5,28 @@ digraph {
     node [shape="plaintext"];
 
     table0[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
-        <TR><TD COLSPAN="2" SIDES="B">world</TD></TR>
+        <TR><TD COLSPAN="2" SIDES="B">s</TD></TR>
         <TR><TD>name</TD><TD>value</TD></TR>
-        <TR><TD>ptr</TD><TD PORT="pointer2"></TD></TR>
-        <TR><TD>len</TD><TD>5</TD></TR>
+        <TR><TD>ptr</TD><TD PORT="borrower"></TD></TR>
     </TABLE>>];
-
-    table3[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
-        <TR><TD COLSPAN="2" SIDES="B">s</TD></TR>
+    table1[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
+        <TR><TD COLSPAN="2" SIDES="B">s1</TD></TR>
         <TR><TD>name</TD><TD>value</TD></TR>
-        <TR><TD>ptr</TD><TD PORT="pointer"></TD></TR>
-        <TR><TD>len</TD><TD>11</TD></TR>
-        <TR><TD>capacity</TD><TD>11</TD></TR>
+        <TR><TD PORT="borrowee">ptr</TD><TD PORT="pointer"></TD></TR>
+        <TR><TD>len</TD><TD>5</TD></TR>
+        <TR><TD>capacity</TD><TD>5</TD></TR>
     </TABLE>>];
-    table4[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
+    table2[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
         <TR><TD>index</TD><TD>value</TD></TR>
         <TR><TD PORT="pointee">0</TD><TD>h</TD></TR>
         <TR><TD>1</TD><TD>e</TD></TR>
         <TR><TD>2</TD><TD>l</TD></TR>
         <TR><TD>3</TD><TD>l</TD></TR>
         <TR><TD>4</TD><TD>o</TD></TR>
-        <TR><TD>5</TD><TD> </TD></TR>
-        <TR><TD PORT="pointee2">6</TD><TD>w</TD></TR>
-        <TR><TD>7</TD><TD>o</TD></TR>
-        <TR><TD>8</TD><TD>r</TD></TR>
-        <TR><TD>9</TD><TD>l</TD></TR>
-        <TR><TD>10</TD><TD>d</TD></TR>
     </TABLE>>];
 
-
     edge[tailclip="false"];
-    table0:pointer2:c -> table4:pointee2;
-    table3:pointer:c -> table4:pointee;
+    table1:pointer:c -> table2:pointee;
+    table0:borrower:c -> table1:borrowee;
 }
 

rustbook-en/dot/trpl04-07.dot

@@ -0,0 +1,41 @@
+digraph {
+    rankdir=LR;
+    overlap=false;
+    dpi=300.0;
+    node [shape="plaintext"];
+
+    table0[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
+        <TR><TD COLSPAN="2" SIDES="B">world</TD></TR>
+        <TR><TD>name</TD><TD>value</TD></TR>
+        <TR><TD>ptr</TD><TD PORT="pointer2"></TD></TR>
+        <TR><TD>len</TD><TD>5</TD></TR>
+    </TABLE>>];
+
+    table3[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
+        <TR><TD COLSPAN="2" SIDES="B">s</TD></TR>
+        <TR><TD>name</TD><TD>value</TD></TR>
+        <TR><TD>ptr</TD><TD PORT="pointer"></TD></TR>
+        <TR><TD>len</TD><TD>11</TD></TR>
+        <TR><TD>capacity</TD><TD>11</TD></TR>
+    </TABLE>>];
+    table4[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
+        <TR><TD>index</TD><TD>value</TD></TR>
+        <TR><TD PORT="pointee">0</TD><TD>h</TD></TR>
+        <TR><TD>1</TD><TD>e</TD></TR>
+        <TR><TD>2</TD><TD>l</TD></TR>
+        <TR><TD>3</TD><TD>l</TD></TR>
+        <TR><TD>4</TD><TD>o</TD></TR>
+        <TR><TD>5</TD><TD> </TD></TR>
+        <TR><TD PORT="pointee2">6</TD><TD>w</TD></TR>
+        <TR><TD>7</TD><TD>o</TD></TR>
+        <TR><TD>8</TD><TD>r</TD></TR>
+        <TR><TD>9</TD><TD>l</TD></TR>
+        <TR><TD>10</TD><TD>d</TD></TR>
+    </TABLE>>];
+
+
+    edge[tailclip="false"];
+    table0:pointer2:c -> table4:pointee2;
+    table3:pointer:c -> table4:pointee;
+}
+

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

@@ -1,4 +1,10 @@
 $ cargo build
+ Downloading crates ...
+  Downloaded rand_core v0.6.2
+  Downloaded getrandom v0.2.2
+  Downloaded rand_chacha v0.3.0
+  Downloaded ppv-lite86 v0.2.10
+  Downloaded libc v0.2.86
    Compiling libc v0.2.86
    Compiling getrandom v0.2.2
    Compiling cfg-if v1.0.0
@@ -18,7 +24,7 @@ error[E0308]: mismatched types
    = note: expected reference `&String`
               found reference `&{integer}`
 note: method defined here
-  --> /rustc/129f3b9964af4d4a709d1383930ade12dfe7c081/library/core/src/cmp.rs:840:8
+  --> /rustc/eeb90cda1969383f56a2637cbd3037bdf598841c/library/core/src/cmp.rs:839:8
 
 For more information about this error, try `rustc --explain E0308`.
 error: could not compile `guessing_game` (bin "guessing_game") due to 1 previous error

rustbook-en/listings/ch03-common-programming-concepts/no-listing-01-variables-are-immutable/output.txt

@@ -4,13 +4,15 @@ error[E0384]: cannot assign twice to immutable variable `x`
  --> src/main.rs:4:5
   |
 2 |     let x = 5;
-  |         -
-  |         |
-  |         first assignment to `x`
-  |         help: consider making this binding mutable: `mut x`
+  |         - first assignment to `x`
 3 |     println!("The value of x is: {x}");
 4 |     x = 6;
   |     ^^^^^ cannot assign twice to immutable variable
+  |
+help: consider making this binding mutable
+  |
+2 |     let mut x = 5;
+  |         +++
 
 For more information about this error, try `rustc --explain E0384`.
 error: could not compile `variables` (bin "variables") due to 1 previous error

rustbook-en/listings/ch04-understanding-ownership/no-listing-04b-replacement-drop/Cargo.toml

@@ -0,0 +1,6 @@
+[package]
+name = "ownership"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]

rustbook-en/listings/ch04-understanding-ownership/no-listing-04b-replacement-drop/src/main.rs

@@ -0,0 +1,8 @@
+fn main() {
+    // ANCHOR: here
+    let mut s = String::from("hello");
+    s = String::from("ahoy");
+
+    println!("{s}, world!");
+    // ANCHOR_END: here
+}

rustbook-en/listings/ch06-enums-and-pattern-matching/no-listing-07-cant-use-option-directly/output.txt

@@ -8,10 +8,10 @@ error[E0277]: cannot add `Option<i8>` to `i8`
   |
   = help: the trait `Add<Option<i8>>` is not implemented for `i8`
   = help: the following other types implement trait `Add<Rhs>`:
-            <&'a i8 as Add<i8>>
-            <&i8 as Add<&i8>>
-            <i8 as Add<&i8>>
-            <i8 as Add>
+            `&'a i8` implements `Add<i8>`
+            `&i8` implements `Add<&i8>`
+            `i8` implements `Add<&i8>`
+            `i8` implements `Add`
 
 For more information about this error, try `rustc --explain E0277`.
 error: could not compile `enums` (bin "enums") due to 1 previous error

rustbook-en/listings/ch06-enums-and-pattern-matching/no-listing-10-non-exhaustive-match/output.txt

@@ -7,8 +7,8 @@ error[E0004]: non-exhaustive patterns: `None` not covered
   |               ^ pattern `None` not covered
   |
 note: `Option<i32>` defined here
- --> /rustc/129f3b9964af4d4a709d1383930ade12dfe7c081/library/core/src/option.rs:571:1
- ::: /rustc/129f3b9964af4d4a709d1383930ade12dfe7c081/library/core/src/option.rs:575:5
+ --> /rustc/eeb90cda1969383f56a2637cbd3037bdf598841c/library/core/src/option.rs:574:1
+ ::: /rustc/eeb90cda1969383f56a2637cbd3037bdf598841c/library/core/src/option.rs:578:5
   |
   = note: not covered
   = note: the matched value is of type `Option<i32>`

rustbook-en/listings/ch09-error-handling/listing-09-10/output.txt

@@ -9,6 +9,14 @@ error[E0277]: the `?` operator can only be used in a function that returns `Resu
   |                                                ^ cannot use the `?` operator in a function that returns `()`
   |
   = help: the trait `FromResidual<Result<Infallible, std::io::Error>>` is not implemented for `()`
+help: consider adding return type
+  |
+3 ~ fn main() -> Result<(), Box<dyn std::error::Error>> {
+4 |     let greeting_file = File::open("hello.txt")?;
+5 + 
+6 +     Ok(())
+7 + }
+  |
 
 For more information about this error, try `rustc --explain E0277`.
 error: could not compile `error-handling` (bin "error-handling") due to 1 previous error

rustbook-en/listings/ch11-writing-automated-tests/output-only-01-show-output/output.txt

@@ -22,8 +22,8 @@ failures:
 I got the value 8
 thread 'tests::this_test_will_fail' panicked at src/lib.rs:19:9:
 assertion `left == right` failed
-  left: 5
- right: 10
+  left: 10
+ right: 5
 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace