New upstream version 1.19.0+dfsg1

[rustc.git] / src / doc / book / second-edition / src / ch03-05-control-flow.md

diff --git a/src/doc/book/second-edition/src/ch03-05-control-flow.md b/src/doc/book/second-edition/src/ch03-05-control-flow.md
index a44817621ff9cda328755cf6e77aa63487d5f3dd..20093b3401629360ebbd8d57fd93a0bb7db6cc72 100644 (file)
--- a/src/doc/book/second-edition/src/ch03-05-control-flow.md
+++ b/src/doc/book/second-edition/src/ch03-05-control-flow.md
@@ -230,12 +230,12 @@ error[E0308]: if and else have incompatible types
  --> src/main.rs:4:18
   |
 4 |       let number = if condition {
-  |  __________________^ starting here...
+  |  __________________^
 5 | |         5
 6 | |     } else {
 7 | |         "six"
 8 | |     };
-  | |_____^ ...ending here: expected integral variable, found reference
+  | |_____^ expected integral variable, found reference
   |
   = note: expected type `{integer}`
              found type `&'static str`
@@ -438,7 +438,7 @@ This code is a bit nicer, isn’t it?
 ## Summary
 
 You made it! That was a sizable chapter: you learned about variables, scalar
-and`if` expressions, and loops! If you want to practice with the concepts
+and `if` expressions, and loops! If you want to practice with the concepts
 discussed in this chapter, try building programs to do the following:
 
 * Convert temperatures between Fahrenheit and Celsius.