summaryrefslogtreecommitdiffstats
path: root/src/doc/book
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 12:19:13 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 12:19:13 +0000
commit218caa410aa38c29984be31a5229b9fa717560ee (patch)
treec54bd55eeb6e4c508940a30e94c0032fbd45d677 /src/doc/book
parentReleasing progress-linux version 1.67.1+dfsg1-1~progress7.99u1. (diff)
downloadrustc-218caa410aa38c29984be31a5229b9fa717560ee.tar.xz
rustc-218caa410aa38c29984be31a5229b9fa717560ee.zip
Merging upstream version 1.68.2+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/doc/book')
-rw-r--r--src/doc/book/src/appendix-06-translation.md2
-rw-r--r--src/doc/book/src/ch01-01-installation.md2
-rw-r--r--src/doc/book/src/ch02-00-guessing-game-tutorial.md2
-rw-r--r--src/doc/book/src/ch13-03-improving-our-io-project.md4
4 files changed, 5 insertions, 5 deletions
diff --git a/src/doc/book/src/appendix-06-translation.md b/src/doc/book/src/appendix-06-translation.md
index 2c5734354..7e8c68d25 100644
--- a/src/doc/book/src/appendix-06-translation.md
+++ b/src/doc/book/src/appendix-06-translation.md
@@ -11,7 +11,7 @@ For resources in languages other than English. Most are still in progress; see
- [正體中文](https://github.com/rust-tw/book-tw)
- [Українська](https://github.com/pavloslav/rust-book-uk-ua)
- [Español](https://github.com/thecodix/book), [alternate](https://github.com/ManRR/rust-book-es)
-- [Italiano](https://github.com/Ciro-Fusco/book_it)
+- [Italiano](https://github.com/EmanueleGurini/book_it)
- [Русский](https://github.com/rust-lang-ru/book)
- [한국어](https://github.com/rinthel/rust-lang-book-ko)
- [日本語](https://github.com/rust-lang-ja/book-ja)
diff --git a/src/doc/book/src/ch01-01-installation.md b/src/doc/book/src/ch01-01-installation.md
index fa9617ad9..87f37fab2 100644
--- a/src/doc/book/src/ch01-01-installation.md
+++ b/src/doc/book/src/ch01-01-installation.md
@@ -28,7 +28,7 @@ these steps should work as expected with the content of this book.
If you’re using Linux or macOS, open a terminal and enter the following command:
```console
-$ curl --proto '=https' --tlsv1.3 https://sh.rustup.rs -sSf | sh
+$ curl --proto '=https' --tlsv1.2 https://sh.rustup.rs -sSf | sh
```
The command downloads a script and starts the installation of the `rustup`
diff --git a/src/doc/book/src/ch02-00-guessing-game-tutorial.md b/src/doc/book/src/ch02-00-guessing-game-tutorial.md
index 4dac23764..4f2857333 100644
--- a/src/doc/book/src/ch02-00-guessing-game-tutorial.md
+++ b/src/doc/book/src/ch02-00-guessing-game-tutorial.md
@@ -291,7 +291,7 @@ let y = 10;
println!("x = {x} and y + 2 = {}", y + 2);
```
-This code would print `x = 5 and y = 12`.
+This code would print `x = 5 and y + 2 = 12`.
### Testing the First Part
diff --git a/src/doc/book/src/ch13-03-improving-our-io-project.md b/src/doc/book/src/ch13-03-improving-our-io-project.md
index b9ef0b430..42a5be89d 100644
--- a/src/doc/book/src/ch13-03-improving-our-io-project.md
+++ b/src/doc/book/src/ch13-03-improving-our-io-project.md
@@ -28,7 +28,7 @@ we would remove them in the future. Well, that time is now!
We needed `clone` here because we have a slice with `String` elements in the
parameter `args`, but the `build` function doesn’t own `args`. To return
ownership of a `Config` instance, we had to clone the values from the `query`
-and `filename` fields of `Config` so the `Config` instance can own its values.
+and `file_path` fields of `Config` so the `Config` instance can own its values.
With our new knowledge about iterators, we can change the `build` function to
take ownership of an iterator as its argument instead of borrowing a slice.
@@ -118,7 +118,7 @@ the program. We want to ignore that and get to the next value, so first we call
value we want to put in the `query` field of `Config`. If `next` returns a
`Some`, we use a `match` to extract the value. If it returns `None`, it means
not enough arguments were given and we return early with an `Err` value. We do
-the same thing for the `filename` value.
+the same thing for the `file_path` value.
### Making Code Clearer with Iterator Adaptors