diff --git a/2018-edition/src/ch19-03-advanced-traits.md b/2018-edition/src/ch19-03-advanced-traits.md index 4219b208b9..30b6cabf20 100644 --- a/2018-edition/src/ch19-03-advanced-traits.md +++ b/2018-edition/src/ch19-03-advanced-traits.md @@ -3,8 +3,8 @@ The 2018 edition of the book is no longer distributed with Rust's documentation. If you came here via a link or web search, you may want to check out [the current -version of the book](../ch19-03-advanced-traits.html) instead. +version of the book](../ch19-02-advanced-traits.html) instead. If you have an internet connection, you can [find a copy distributed with Rust -1.30](https://doc.rust-lang.org/1.30.0/book/2018-edition/ch19-03-advanced-traits.html). \ No newline at end of file +1.30](https://doc.rust-lang.org/1.30.0/book/2018-edition/ch19-02-advanced-traits.html). \ No newline at end of file diff --git a/2018-edition/src/ch19-04-advanced-types.md b/2018-edition/src/ch19-04-advanced-types.md index fecbd52dc8..9e808169b4 100644 --- a/2018-edition/src/ch19-04-advanced-types.md +++ b/2018-edition/src/ch19-04-advanced-types.md @@ -3,8 +3,8 @@ The 2018 edition of the book is no longer distributed with Rust's documentation. If you came here via a link or web search, you may want to check out [the current -version of the book](../ch19-04-advanced-types.html) instead. +version of the book](../ch19-03-advanced-types.html) instead. If you have an internet connection, you can [find a copy distributed with Rust -1.30](https://doc.rust-lang.org/1.30.0/book/2018-edition/ch19-04-advanced-types.html). \ No newline at end of file +1.30](https://doc.rust-lang.org/1.30.0/book/2018-edition/ch19-03-advanced-types.html). \ No newline at end of file diff --git a/2018-edition/src/ch19-06-macros.md b/2018-edition/src/ch19-06-macros.md index bf019c5d68..b327930ba5 100644 --- a/2018-edition/src/ch19-06-macros.md +++ b/2018-edition/src/ch19-06-macros.md @@ -3,8 +3,8 @@ The 2018 edition of the book is no longer distributed with Rust's documentation. If you came here via a link or web search, you may want to check out [the current -version of the book](../ch19-06-macros.html) instead. +version of the book](../ch19-05-macros.html) instead. If you have an internet connection, you can [find a copy distributed with Rust -1.30](https://doc.rust-lang.org/1.30.0/book/2018-edition/ch19-06-macros.html). \ No newline at end of file +1.30](https://doc.rust-lang.org/1.30.0/book/2018-edition/ch19-05-macros.html). \ No newline at end of file diff --git a/first-edition/src/associated-types.md b/first-edition/src/associated-types.md index 626048e9e6..4996c12e30 100644 --- a/first-edition/src/associated-types.md +++ b/first-edition/src/associated-types.md @@ -3,7 +3,7 @@ The first edition of the book is no longer distributed with Rust's documentation. If you came here via a link or web search, you may want to check out [the current -version of the book](../ch19-03-advanced-traits.html#specifying-placeholder-types-in-trait-definitions-with-associated-types) instead. +version of the book](../ch19-02-advanced-traits.html#specifying-placeholder-types-in-trait-definitions-with-associated-types) instead. If you have an internet connection, you can [find a copy distributed with Rust diff --git a/first-edition/src/operators-and-overloading.md b/first-edition/src/operators-and-overloading.md index 921a2a6854..6994b87fac 100644 --- a/first-edition/src/operators-and-overloading.md +++ b/first-edition/src/operators-and-overloading.md @@ -3,7 +3,7 @@ The first edition of the book is no longer distributed with Rust's documentation. If you came here via a link or web search, you may want to check out [the current -version of the book](../ch19-03-advanced-traits.html#default-generic-type-parameters-and-operator-overloading) instead. +version of the book](../ch19-02-advanced-traits.html#default-generic-type-parameters-and-operator-overloading) instead. If you have an internet connection, you can [find a copy distributed with Rust diff --git a/first-edition/src/procedural-macros.md b/first-edition/src/procedural-macros.md index 9778383d80..01a2eccc8d 100644 --- a/first-edition/src/procedural-macros.md +++ b/first-edition/src/procedural-macros.md @@ -3,7 +3,7 @@ The first edition of the book is no longer distributed with Rust's documentation. If you came here via a link or web search, you may want to check out [the current -version of the book](../ch19-06-macros.html?highlight=procedural#procedural-macros-for-generating-code-from-attributes) instead. +version of the book](../ch19-05-macros.html?highlight=procedural#procedural-macros-for-generating-code-from-attributes) instead. If you have an internet connection, you can [find a copy distributed with Rust diff --git a/first-edition/src/type-aliases.md b/first-edition/src/type-aliases.md index 7ac51ff191..2e4cd3a27b 100644 --- a/first-edition/src/type-aliases.md +++ b/first-edition/src/type-aliases.md @@ -3,7 +3,7 @@ The first edition of the book is no longer distributed with Rust's documentation. If you came here via a link or web search, you may want to check out [the current -version of the book](../ch19-04-advanced-types.html#creating-type-synonyms-with-type-aliases) instead. +version of the book](../ch19-03-advanced-types.html#creating-type-synonyms-with-type-aliases) instead. If you have an internet connection, you can [find a copy distributed with Rust diff --git a/first-edition/src/unsized-types.md b/first-edition/src/unsized-types.md index 4ec43ecadf..b56993f919 100644 --- a/first-edition/src/unsized-types.md +++ b/first-edition/src/unsized-types.md @@ -3,7 +3,7 @@ The first edition of the book is no longer distributed with Rust's documentation. If you came here via a link or web search, you may want to check out [the current -version of the book](../ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait) instead. +version of the book](../ch19-03-advanced-types.html#dynamically-sized-types-and-the-sized-trait) instead. If you have an internet connection, you can [find a copy distributed with Rust diff --git a/redirects/associated-types.md b/redirects/associated-types.md index b222f3298f..3bf0d5375a 100644 --- a/redirects/associated-types.md +++ b/redirects/associated-types.md @@ -14,4 +14,4 @@ pub trait Iterator { --- You can find the latest version of this information -[here](ch19-03-advanced-traits.html#specifying-placeholder-types-in-trait-definitions-with-associated-types). \ No newline at end of file +[here](ch19-02-advanced-traits.html#specifying-placeholder-types-in-trait-definitions-with-associated-types). \ No newline at end of file diff --git a/redirects/macros.md b/redirects/macros.md index 08217d115d..89a893cc72 100644 --- a/redirects/macros.md +++ b/redirects/macros.md @@ -25,6 +25,6 @@ Here are the relevant sections in the new and old books: [1]: https://doc.rust-lang.org/1.30.0/book/first-edition/macros.html -[2]: ch19-06-macros.html +[2]: ch19-05-macros.html [3]: https://rustbyexample.com/macros.html [4]: ../reference/macros-by-example.html diff --git a/redirects/operators-and-overloading.md b/redirects/operators-and-overloading.md index ff9a33048a..85c9102d96 100644 --- a/redirects/operators-and-overloading.md +++ b/redirects/operators-and-overloading.md @@ -33,4 +33,4 @@ fn main() { --- You can find the latest version of this information -[here](ch19-03-advanced-traits.html). +[here](ch19-02-advanced-traits.html). diff --git a/redirects/procedural-macros.md b/redirects/procedural-macros.md index bf6665f1a6..2f87b433da 100644 --- a/redirects/procedural-macros.md +++ b/redirects/procedural-macros.md @@ -16,6 +16,6 @@ You can check out other resources that describe macros. [1]: https://doc.rust-lang.org/1.30.0/book/first-edition/procedural-macros.html -[2]: ch19-06-macros.html +[2]: ch19-05-macros.html [3]: ../proc_macro/index.html [4]: ../reference/procedural-macros.html diff --git a/redirects/traits.md b/redirects/traits.md index dcb577e97b..e8c3499612 100644 --- a/redirects/traits.md +++ b/redirects/traits.md @@ -21,4 +21,4 @@ Here are the relevant sections in the new and old books: [1]: https://doc.rust-lang.org/1.30.0/book/first-edition/traits.html [2]: ch10-02-traits.html -[3]: ch19-03-advanced-traits.html +[3]: ch19-02-advanced-traits.html diff --git a/redirects/type-aliases.md b/redirects/type-aliases.md index 85cd4c9ecc..52aae73218 100644 --- a/redirects/type-aliases.md +++ b/redirects/type-aliases.md @@ -11,4 +11,4 @@ type Kilometers = i32; --- You can find the latest version of this information -[here](ch19-04-advanced-types.html#creating-type-synonyms-with-type-aliases). \ No newline at end of file +[here](ch19-03-advanced-types.html#creating-type-synonyms-with-type-aliases). \ No newline at end of file diff --git a/redirects/ufcs.md b/redirects/ufcs.md index 2959c06bd0..e7ecf6f449 100644 --- a/redirects/ufcs.md +++ b/redirects/ufcs.md @@ -45,4 +45,4 @@ fn main() { --- You can find the latest version of this information -[here](ch19-03-advanced-traits.html#fully-qualified-syntax-for-disambiguation-calling-methods-with-the-same-name). \ No newline at end of file +[here](ch19-02-advanced-traits.html#fully-qualified-syntax-for-disambiguation-calling-methods-with-the-same-name). \ No newline at end of file diff --git a/redirects/unsized-types.md b/redirects/unsized-types.md index bd9582cbac..df23d8c1a8 100644 --- a/redirects/unsized-types.md +++ b/redirects/unsized-types.md @@ -15,4 +15,4 @@ fn generic(t: &T) { --- You can find the latest version of this information -[here](ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait). \ No newline at end of file +[here](ch19-03-advanced-types.html#dynamically-sized-types-and-the-sized-trait). \ No newline at end of file diff --git a/second-edition/src/appendix-04-macros.md b/second-edition/src/appendix-04-macros.md index 2798b5d50a..c03480420d 100644 --- a/second-edition/src/appendix-04-macros.md +++ b/second-edition/src/appendix-04-macros.md @@ -3,7 +3,7 @@ The second edition of the book is no longer distributed with Rust's documentation. If you came here via a link or web search, you may want to check out [the current -version of the book](../ch19-06-macros.html) instead. +version of the book](../ch19-05-macros.html) instead. If you have an internet connection, you can [find a copy distributed with Rust diff --git a/second-edition/src/ch19-03-advanced-traits.md b/second-edition/src/ch19-03-advanced-traits.md index cc8433fb38..f06c51b742 100644 --- a/second-edition/src/ch19-03-advanced-traits.md +++ b/second-edition/src/ch19-03-advanced-traits.md @@ -3,8 +3,8 @@ The second edition of the book is no longer distributed with Rust's documentation. If you came here via a link or web search, you may want to check out [the current -version of the book](../ch19-03-advanced-traits.html) instead. +version of the book](../ch19-02-advanced-traits.html) instead. If you have an internet connection, you can [find a copy distributed with Rust -1.30](https://doc.rust-lang.org/1.30.0/book/second-edition/ch19-03-advanced-traits.html). \ No newline at end of file +1.30](https://doc.rust-lang.org/1.30.0/book/second-edition/ch19-02-advanced-traits.html). \ No newline at end of file diff --git a/second-edition/src/ch19-04-advanced-types.md b/second-edition/src/ch19-04-advanced-types.md index 5081457292..b89751e0e7 100644 --- a/second-edition/src/ch19-04-advanced-types.md +++ b/second-edition/src/ch19-04-advanced-types.md @@ -3,8 +3,8 @@ The second edition of the book is no longer distributed with Rust's documentation. If you came here via a link or web search, you may want to check out [the current -version of the book](../ch19-04-advanced-types.html) instead. +version of the book](../ch19-03-advanced-types.html) instead. If you have an internet connection, you can [find a copy distributed with Rust -1.30](https://doc.rust-lang.org/1.30.0/book/second-edition/ch19-04-advanced-types.html). \ No newline at end of file +1.30](https://doc.rust-lang.org/1.30.0/book/second-edition/ch19-03-advanced-types.html). \ No newline at end of file diff --git a/src/SUMMARY.md b/src/SUMMARY.md index b4b58afdee..6d8ff7670b 100644 --- a/src/SUMMARY.md +++ b/src/SUMMARY.md @@ -115,10 +115,10 @@ - [Advanced Features](ch19-00-advanced-features.md) - [Unsafe Rust](ch19-01-unsafe-rust.md) - - [Advanced Traits](ch19-03-advanced-traits.md) - - [Advanced Types](ch19-04-advanced-types.md) - - [Advanced Functions and Closures](ch19-05-advanced-functions-and-closures.md) - - [Macros](ch19-06-macros.md) + - [Advanced Traits](ch19-02-advanced-traits.md) + - [Advanced Types](ch19-03-advanced-types.md) + - [Advanced Functions and Closures](ch19-04-advanced-functions-and-closures.md) + - [Macros](ch19-05-macros.md) - [Final Project: Building a Multithreaded Web Server](ch20-00-final-project-a-web-server.md) - [Building a Single-Threaded Web Server](ch20-01-single-threaded.md) diff --git a/src/appendix-03-derivable-traits.md b/src/appendix-03-derivable-traits.md index 299796dbf7..7b6a6b3329 100644 --- a/src/appendix-03-derivable-traits.md +++ b/src/appendix-03-derivable-traits.md @@ -184,4 +184,4 @@ ch05-01-defining-structs.html#creating-instances-from-other-instances-with-struc ch04-01-what-is-ownership.html#stack-only-data-copy [ways-variables-and-data-interact-clone]: ch04-01-what-is-ownership.html#ways-variables-and-data-interact-clone -[macros]: ch19-06-macros.html#macros +[macros]: ch19-05-macros.html#macros diff --git a/src/ch17-02-trait-objects.md b/src/ch17-02-trait-objects.md index 2d3fea24a1..43907d340c 100644 --- a/src/ch17-02-trait-objects.md +++ b/src/ch17-02-trait-objects.md @@ -253,4 +253,4 @@ support in Listing 17-9, so it’s a trade-off to consider. [performance-of-code-using-generics]: ch10-01-syntax.html#performance-of-code-using-generics -[dynamically-sized]: ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait +[dynamically-sized]: ch19-03-advanced-types.html#dynamically-sized-types-and-the-sized-trait diff --git a/src/ch17-03-oo-design-patterns.md b/src/ch17-03-oo-design-patterns.md index 13503ef02b..598205a816 100644 --- a/src/ch17-03-oo-design-patterns.md +++ b/src/ch17-03-oo-design-patterns.md @@ -513,4 +513,4 @@ lots of flexibility. We’ve looked at them briefly throughout the book but haven’t seen their full capability yet. Let’s go! [more-info-than-rustc]: ch09-03-to-panic-or-not-to-panic.html#cases-in-which-you-have-more-information-than-the-compiler -[macros]: ch19-06-macros.html#macros +[macros]: ch19-05-macros.html#macros diff --git a/src/ch19-03-advanced-traits.md b/src/ch19-02-advanced-traits.md similarity index 99% rename from src/ch19-03-advanced-traits.md rename to src/ch19-02-advanced-traits.md index 6fd3e09f49..277ecf7282 100644 --- a/src/ch19-03-advanced-traits.md +++ b/src/ch19-02-advanced-traits.md @@ -459,7 +459,7 @@ behavior—we would have to implement just the methods we do want manually. This newtype pattern is also useful even when traits are not involved. Let’s switch focus and look at some advanced ways to interact with Rust’s type system. -[newtype]: ch19-03-advanced-traits.html#using-the-newtype-pattern-to-implement-external-traits-on-external-types +[newtype]: ch19-02-advanced-traits.html#using-the-newtype-pattern-to-implement-external-traits-on-external-types [implementing-a-trait-on-a-type]: ch10-02-traits.html#implementing-a-trait-on-a-type [traits-defining-shared-behavior]: diff --git a/src/ch19-04-advanced-types.md b/src/ch19-03-advanced-types.md similarity index 99% rename from src/ch19-04-advanced-types.md rename to src/ch19-03-advanced-types.md index 2dfed23cca..a16619f570 100644 --- a/src/ch19-04-advanced-types.md +++ b/src/ch19-03-advanced-types.md @@ -294,4 +294,4 @@ ch17-01-what-is-oo.html#encapsulation-that-hides-implementation-details ch06-02-match.html#the-match-control-flow-operator [using-trait-objects-that-allow-for-values-of-different-types]: ch17-02-trait-objects.html#using-trait-objects-that-allow-for-values-of-different-types -[using-the-newtype-pattern]: ch19-03-advanced-traits.html#using-the-newtype-pattern-to-implement-external-traits-on-external-types +[using-the-newtype-pattern]: ch19-02-advanced-traits.html#using-the-newtype-pattern-to-implement-external-traits-on-external-types diff --git a/src/ch19-05-advanced-functions-and-closures.md b/src/ch19-04-advanced-functions-and-closures.md similarity index 99% rename from src/ch19-05-advanced-functions-and-closures.md rename to src/ch19-04-advanced-functions-and-closures.md index 88c46847d5..44fe2f5293 100644 --- a/src/ch19-05-advanced-functions-and-closures.md +++ b/src/ch19-04-advanced-functions-and-closures.md @@ -124,7 +124,7 @@ ignore --> in Chapter 17. Next, let’s look at macros! [advanced-traits]: -ch19-03-advanced-traits.html#advanced-traits +ch19-02-advanced-traits.html#advanced-traits [enum-values]: ch06-01-defining-an-enum.html#enum-values [using-trait-objects-that-allow-for-values-of-different-types]: ch17-02-trait-objects.html#using-trait-objects-that-allow-for-values-of-different-types diff --git a/src/ch19-06-macros.md b/src/ch19-05-macros.md similarity index 100% rename from src/ch19-06-macros.md rename to src/ch19-05-macros.md diff --git a/src/ch20-02-multithreaded.md b/src/ch20-02-multithreaded.md index 5a4a50ac01..4f5788df17 100644 --- a/src/ch20-02-multithreaded.md +++ b/src/ch20-02-multithreaded.md @@ -690,7 +690,7 @@ the associated block. In Listing 20-21, the lock remains held for the duration of the call to `job()`, meaning other workers cannot receive jobs. [creating-type-synonyms-with-type-aliases]: -ch19-04-advanced-types.html#creating-type-synonyms-with-type-aliases +ch19-03-advanced-types.html#creating-type-synonyms-with-type-aliases [integer-types]: ch03-02-data-types.html#integer-types [fn-traits]: ch13-01-closures.html#moving-captured-values-out-of-the-closure-and-the-fn-traits