Miscellaneous fixes

Author: willcrichton

src/ch03-03-how-functions-work.md

@@ -114,8 +114,6 @@ of functions.
   a value.
 - _Expressions_ evaluate to a resultant value.
 
-Let’s look at some examples.
-
 Let’s look at some examples.
 We’ve actually already used statements and expressions. Creating a variable and
 assigning a value to it with the `let` keyword is a statement. In Listing 3-1,

src/ch10-03-lifetime-syntax.md

@@ -654,4 +654,4 @@ Rust so that you can make sure your code is working the way it should.
 [references-and-borrowing]: ch04-02-references-and-borrowing.html#references-and-borrowing
 [lifetime-permissions]: ch04-02-references-and-borrowing.html#permissions-are-returned-at-the-end-of-a-references-lifetime
 [string-slices-as-parameters]: ch04-04-slices.html#string-slices-as-parameters
-[reference]: ../reference/trait-bounds.html
+[reference]: https://doc.rust-lang.org/reference/trait-bounds.html

src/ch11-01-writing-tests.md

@@ -549,7 +549,7 @@ test`.
 {{#quiz ../quizzes/ch11-01-writing-tests.toml}}
 
 [concatenating]: ch08-02-strings.html#concatenating-with--or-format
-[bench]: ../unstable-book/library-features/test.html
+[bench]: https://doc.rust-lang.org/unstable-book/library-features/test.html
 [ignoring]: ch11-02-running-tests.html#ignoring-tests-unless-specifically-requested
 [subset]: ch11-02-running-tests.html#running-a-subset-of-tests-by-name
 [controlling-how-tests-are-run]: ch11-02-running-tests.html#controlling-how-tests-are-run

src/ch16-04-extensible-concurrency-sync-and-send.md

@@ -102,12 +102,8 @@ run on multiple threads without the kinds of hard-to-track-down bugs common in
 other languages. Concurrent programming is no longer a concept to be afraid of:
 Go forth and make your programs concurrent, fearlessly!
 
-<<<<<<< HEAD
 {{#quiz ../quizzes/ch16-04-extensible-concurrency-send-and-sync.toml}}
 
 [sharing-a-mutext-between-multiple-threads]: ch16-03-shared-state.html#sharing-a-mutext-between-multiple-threads
-=======
-[shared-access]: ch16-03-shared-state.html#shared-access-to-mutext
->>>>>>> upstream/main
-[nomicon]: ../nomicon/index.html
+[nomicon]: https://doc.rust-lang.org/nomicon/index.html
 [mutex-guards-are-not-send]: https://github.com/rust-lang/rust/issues/23465#issuecomment-82730326

src/ch20-01-unsafe-rust.md

@@ -562,12 +562,12 @@ Rust’s official guide for `unsafe`, [The Rustonomicon][nomicon].
 {{#quiz ../quizzes/ch19-01-unsafe-rust.toml}}
 
 [permission-violations]: ch04-02-references-and-borrowing.html#the-borrow-checker-finds-permission-violations
-[ABI]: ../reference/items/external-blocks.html#abi
+[ABI]: https://doc.rust-lang.org/reference/items/external-blocks.html#abi
 [the-slice-type]: ch04-04-slices.html#the-slice-type
 [constants]: ch03-01-variables-and-mutability.html#declaring-constants
 [send-and-sync]: ch16-04-extensible-concurrency-sync-and-send.html
 [the-slice-type]: ch04-03-slices.html#the-slice-type
-[unions]: ../reference/items/unions.html
+[unions]: https://doc.rust-lang.org/reference/items/unions.html
 [miri]: https://github.com/rust-lang/miri
 [editions]: appendix-05-editions.html
 [nightly]: appendix-07-nightly-rust.html

src/ch20-05-macros.md

@@ -523,7 +523,7 @@ you to solutions.
 Next, we’ll put everything we’ve discussed throughout the book into practice
 and do one more project!
 
-[ref]: ../reference/macros-by-example.html
+[ref]: https://doc.rust-lang.org/reference/macros-by-example.html
 [tlborm]: https://veykril.github.io/tlborm/
 [syn]: https://crates.io/crates/syn
 [quote]: https://crates.io/crates/quote