Move where clause to the bounds chapter

Organizationally I think it makes more sense, since this chapter is all
about defining bounds.

Author: ehuss

book.toml

@@ -51,6 +51,7 @@ use-boolean-and = true
 "/glossary.html#object-safe-traits" = "glossary.html#dyn-compatible-traits"
 "/items/extern-crates.html#extern-prelude" = "../names/preludes.html#extern-prelude"
 "/items/generics.html" = "../types/generics.html"
+"/items/generics.html#where-clauses" = "../trait-bounds.html#where-clauses"
 "/items/modules.html#prelude-items" = "../names/preludes.html"
 "/items/traits.html#object-safety" = "traits.html#dyn-compatibility"
 "/lifetime-elision.html#static-lifetime-elision" = "lifetime-elision.html#const-and-static-elision"

src/crates-and-source-files.md

@@ -139,4 +139,4 @@ The crate name must not be empty, and must only contain [Unicode alphanumeric] o
 [panic-docs]: panic.md#unwinding-across-ffi-boundaries
 [shebang]: input-format.md#shebang-removal
 [trait or lifetime bounds]: trait-bounds.md
-[where clauses]: types/generics.md#where-clauses
+[where clauses]: bound.where

src/items/associated-items.md

@@ -510,5 +510,5 @@ fn main() {
 [path]: ../paths.md
 [regular function parameters]: functions.md#attributes-on-function-parameters
 [generic parameters]: ../types/generics.md
-[where clauses]: ../types/generics.md#where-clauses
+[where clauses]: bound.where
 [constant evaluation]: ../const_eval.md

src/items/traits.md

@@ -374,7 +374,7 @@ fn main() {
 [supertraits]: #supertraits
 [implementations]: implementations.md
 [generics]: ../types/generics.md
-[where clauses]: ../types/generics.md#where-clauses
+[where clauses]: bound.where
 [generic functions]: functions.md#generic-functions
 [unsafe]: ../unsafety.md
 [trait implementation]: implementations.md#trait-implementations

src/syntax-index.md

@@ -450,6 +450,6 @@ This appendix provides an index of tokens and common forms with links to where t
 [use items]: items.use
 [variadic functions]: items.extern.variadic
 [visibility]: vis
-[where clauses]: generics.where
+[where clauses]: bound.where
 [while let]: expr.loop.while.let
 [wildcard pattern]: patterns.wildcard

src/trait-bounds.md

@@ -95,6 +95,40 @@ struct UsesA<'a, T>(A<'a, T>);
 r[bound.trait-object]
 Trait and lifetime bounds are also used to name [trait objects].
 
+r[bound.where]
+## Where clauses
+
+r[bound.where.intro]
+*Where clauses* provide another way to specify bounds on type and lifetime parameters as well as a way to specify bounds on types that aren't type parameters.
+
+r[bound.where.syntax]
+```grammar,items
+WhereClause -> `where` ( WhereClauseItem `,` )* WhereClauseItem?
+
+WhereClauseItem ->
+      LifetimeWhereClauseItem
+    | TypeBoundWhereClauseItem
+
+LifetimeWhereClauseItem -> Lifetime `:` LifetimeBounds
+
+TypeBoundWhereClauseItem -> ForLifetimes? Type `:` TypeParamBounds?
+```
+
+r[bound.where.higher-ranked-lifetimes]
+The `for` keyword can be used to introduce [higher-ranked lifetimes]. It only allows [LifetimeParam] parameters.
+
+```rust
+struct A<T>
+where
+    T: Iterator,            // Could use A<T: Iterator> instead
+    T::Item: Copy,          // Bound on an associated type
+    String: PartialEq<T>,   // Bound on `String`, using the type parameter
+    i32: Default,           // Allowed, but not useful
+{
+    f: T,
+}
+```
+
 r[bound.sized]
 ## `?Sized`
 
@@ -251,4 +285,4 @@ Certain bounds lists may include a `use<..>` bound to control which generic para
 [trait object]: types/trait-object.md
 [trait objects]: types/trait-object.md
 [type parameters]: types/parameters.md
-[where clause]: types/generics.md#where-clauses
+[where clause]: bound.where

src/types/generics.md

@@ -225,40 +225,6 @@ fn generic<const B: bool>() {
 }
 ```
 
-r[generics.where]
-## Where clauses
-
-r[generics.where.syntax]
-```grammar,items
-WhereClause -> `where` ( WhereClauseItem `,` )* WhereClauseItem?
-
-WhereClauseItem ->
-      LifetimeWhereClauseItem
-    | TypeBoundWhereClauseItem
-
-LifetimeWhereClauseItem -> Lifetime `:` LifetimeBounds
-
-TypeBoundWhereClauseItem -> ForLifetimes? Type `:` TypeParamBounds?
-```
-
-r[generics.where.intro]
-*Where clauses* provide another way to specify bounds on type and lifetime parameters as well as a way to specify bounds on types that aren't type parameters.
-
-r[generics.where.higher-ranked-lifetimes]
-The `for` keyword can be used to introduce [higher-ranked lifetimes]. It only allows [LifetimeParam] parameters.
-
-```rust
-struct A<T>
-where
-    T: Iterator,            // Could use A<T: Iterator> instead
-    T::Item: Copy,          // Bound on an associated type
-    String: PartialEq<T>,   // Bound on `String`, using the type parameter
-    i32: Default,           // Allowed, but not useful
-{
-    f: T,
-}
-```
-
 r[generics.parameters.attributes]
 ## Attributes