Merging upstream version 1.69.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

7 files changed, 8 insertions, 11 deletions

diff --git a/src/doc/rust-by-example/src/error/option_unwrap/and_then.md b/src/doc/rust-by-example/src/error/option_unwrap/and_then.md
index c065f2043..42a1f3ec0 100644
--- a/src/doc/rust-by-example/src/error/option_unwrap/and_then.md
+++ b/src/doc/rust-by-example/src/error/option_unwrap/and_then.md
@@ -39,10 +39,7 @@ fn have_recipe(food: Food) -> Option<Food> {
 fn cookable_v1(food: Food) -> Option<Food> {
     match have_recipe(food) {
         None       => None,
-        Some(food) => match have_ingredients(food) {
-            None       => None,
-            Some(food) => Some(food),
-        },
+        Some(food) => have_ingredients(food),
     }
 }
 
diff --git a/src/doc/rust-by-example/src/error/result/result_map.md b/src/doc/rust-by-example/src/error/result/result_map.md
index 24537c318..c453d9fa9 100644
--- a/src/doc/rust-by-example/src/error/result/result_map.md
+++ b/src/doc/rust-by-example/src/error/result/result_map.md
@@ -56,7 +56,7 @@ use std::num::ParseIntError;
 
 // As with `Option`, we can use combinators such as `map()`.
 // This function is otherwise identical to the one above and reads:
-// Modify n if the value is valid, otherwise pass on the error.
+// Multiply if both values can be parsed from str, otherwise pass on the error.
 fn multiply(first_number_str: &str, second_number_str: &str) -> Result<i32, ParseIntError> {
     first_number_str.parse::<i32>().and_then(|first_number| {
         second_number_str.parse::<i32>().map(|second_number| first_number * second_number)
diff --git a/src/doc/rust-by-example/src/generics/bounds.md b/src/doc/rust-by-example/src/generics/bounds.md
index 5d7e849a8..86e54e670 100644
--- a/src/doc/rust-by-example/src/generics/bounds.md
+++ b/src/doc/rust-by-example/src/generics/bounds.md
@@ -58,10 +58,10 @@ fn main() {
     let _triangle = Triangle  { length: 3.0, height: 4.0 };
 
     print_debug(&rectangle);
-    println!("Area: {}", rectangle.area());
+    println!("Area: {}", area(&rectangle));
 
     //print_debug(&_triangle);
-    //println!("Area: {}", _triangle.area());
+    //println!("Area: {}", area(&_triangle));
     // ^ TODO: Try uncommenting these.
     // | Error: Does not implement either `Debug` or `HasArea`. 
 }
diff --git a/src/doc/rust-by-example/src/hello/comment.md b/src/doc/rust-by-example/src/hello/comment.md
index 5027f0a22..4ea6dcd44 100644
--- a/src/doc/rust-by-example/src/hello/comment.md
+++ b/src/doc/rust-by-example/src/hello/comment.md
@@ -14,7 +14,7 @@ a few different varieties:
 fn main() {
     // This is an example of a line comment.
     // There are two slashes at the beginning of the line.
-    // And nothing written inside these will be read by the compiler.
+    // And nothing written after these will be read by the compiler.
 
     // println!("Hello, world!");
 
diff --git a/src/doc/rust-by-example/src/index.md b/src/doc/rust-by-example/src/index.md
index fecc1906a..ecadff4cc 100644
--- a/src/doc/rust-by-example/src/index.md
+++ b/src/doc/rust-by-example/src/index.md
@@ -27,7 +27,7 @@ Now let's begin!
 
 - [Flow of Control](flow_control.md) - `if`/`else`, `for`, and others.
 
-- [Functions](fn.md) - Learn about Methods, Closures and High Order Functions.
+- [Functions](fn.md) - Learn about Methods, Closures and Higher Order Functions.
 
 - [Modules](mod.md) - Organize code using modules
 
diff --git a/src/doc/rust-by-example/src/primitives/tuples.md b/src/doc/rust-by-example/src/primitives/tuples.md
index e745d89be..75c265e75 100644
--- a/src/doc/rust-by-example/src/primitives/tuples.md
+++ b/src/doc/rust-by-example/src/primitives/tuples.md
@@ -43,7 +43,7 @@ fn main() {
     let pair = (1, true);
     println!("Pair is {:?}", pair);
 
-    println!("Uhe reversed pair is {:?}", reverse(pair));
+    println!("The reversed pair is {:?}", reverse(pair));
 
     // To create one element tuples, the comma is required to tell them apart
     // from a literal surrounded by parentheses.
diff --git a/src/doc/rust-by-example/src/std_misc/file/create.md b/src/doc/rust-by-example/src/std_misc/file/create.md
index 709213c9d..4f113df88 100644
--- a/src/doc/rust-by-example/src/std_misc/file/create.md
+++ b/src/doc/rust-by-example/src/std_misc/file/create.md
@@ -53,6 +53,6 @@ proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
 (As in the previous example, you are encouraged to test this example under
 failure conditions.)
 
-There is [`OpenOptions`] struct that can be used to configure how a file is opened.
+The [`OpenOptions`] struct can be used to configure how a file is opened.
 
 [`OpenOptions`]: https://doc.rust-lang.org/std/fs/struct.OpenOptions.html