Merge pull request #2258 from fmease/rn-type-param-bounds

Rename grammar rule `TypeParamBounds` to just `Bounds`

Author: ehuss

src/items/generics.md

@@ -9,7 +9,7 @@ GenericParam -> OuterAttribute* ( LifetimeParam | TypeParam | ConstParam )
 
 LifetimeParam -> Lifetime ( `:` LifetimeBounds )?
 
-TypeParam -> IDENTIFIER ( `:` TypeParamBounds? )? ( `=` Type )?
+TypeParam -> IDENTIFIER ( `:` Bounds? )? ( `=` Type )?
 
 ConstParam ->
     `const` IDENTIFIER `:` Type
@@ -236,7 +236,7 @@ WhereClauseItem ->
 
 LifetimeWhereClauseItem -> Lifetime `:` LifetimeBounds
 
-TypeBoundWhereClauseItem -> ForLifetimes? Type `:` TypeParamBounds?
+TypeBoundWhereClauseItem -> ForLifetimes? Type `:` Bounds?
 ```
 
 r[items.generics.where.intro]

src/items/traits.md

@@ -4,7 +4,7 @@ r[items.traits]
 r[items.traits.syntax]
 ```grammar,items
 Trait ->
-    `unsafe`? `trait` IDENTIFIER GenericParams? ( `:` TypeParamBounds? )? WhereClause?
+    `unsafe`? `trait` IDENTIFIER GenericParams? ( `:` Bounds? )? WhereClause?
     `{`
         InnerAttribute*
         AssociatedItem*

src/items/type-aliases.md

@@ -4,7 +4,7 @@ r[items.type]
 r[items.type.syntax]
 ```grammar,items
 TypeAlias ->
-    `type` IDENTIFIER GenericParams? ( `:` TypeParamBounds )?
+    `type` IDENTIFIER GenericParams? ( `:` Bounds )?
         WhereClause?
         ( `=` Type WhereClause?)? `;`
 ```
@@ -33,13 +33,13 @@ let _ = TypeAlias(5); // Doesn't work
 ```
 
 r[items.type.associated-type]
-A type alias, when not used as an [associated type], must include a [Type][grammar-Type] and may not include [TypeParamBounds].
+A type alias, when not used as an [associated type], must include a [Type][grammar-Type] and may not include [Bounds].
 
 r[items.type.associated-trait]
-A type alias, when used as an [associated type] in a [trait], must not include a [Type][grammar-Type] specification but may include [TypeParamBounds].
+A type alias, when used as an [associated type] in a [trait], must not include a [Type][grammar-Type] specification but may include [Bounds].
 
 r[items.type.associated-impl]
-A type alias, when used as an [associated type] in a [trait impl], must include a [Type][grammar-Type] specification and may not include [TypeParamBounds].
+A type alias, when used as an [associated type] in a [trait impl], must include a [Type][grammar-Type] specification and may not include [Bounds].
 
 r[items.type.deprecated]
 Where clauses before the equals sign on a type alias in a [trait impl] (like `type TypeAlias<T> where T: Foo = Bar<T>`) are deprecated. Where clauses after the equals sign (like `type TypeAlias<T> = Bar<T> where T: Foo`) are preferred.

src/paths.md

@@ -68,7 +68,7 @@ GenericArgsBinding ->
     IDENTIFIER GenericArgs? `=` Type
 
 GenericArgsBounds ->
-    IDENTIFIER GenericArgs? `:` TypeParamBounds
+    IDENTIFIER GenericArgs? `:` Bounds
 ```
 
 r[paths.expr.intro]
@@ -162,7 +162,7 @@ TypePathFnInputs -> Type (`,` Type)* `,`?
 ```
 
 r[paths.type.intro]
-Type paths are used within type definitions, trait bounds, type parameter bounds, and qualified paths.
+Type paths are used within type definitions, trait bounds, and qualified paths.
 
 r[paths.type.turbofish]
 Although the `::` token is allowed before the generics arguments, it is not required because there is no ambiguity like there is in [PathInExpression].

src/trait-bounds.md

@@ -3,9 +3,9 @@ r[bound]
 
 r[bound.syntax]
 ```grammar,miscellaneous
-TypeParamBounds -> TypeParamBound ( `+` TypeParamBound )* `+`?
+Bounds -> Bound ( `+` Bound )* `+`?
 
-TypeParamBound -> Lifetime | TraitBound | UseBound
+Bound -> Lifetime | TraitBound | UseBound
 
 TraitBound ->
       ( `?` | ForLifetimes )? TypePath

src/types/impl-trait.md

@@ -3,7 +3,7 @@ r[type.impl-trait]
 
 r[type.impl-trait.syntax]
 ```grammar,types
-ImplTraitType -> `impl` TypeParamBounds
+ImplTraitType -> `impl` Bounds
 
 ImplTraitTypeOneBound -> `impl` TraitBound
 ```

src/types/trait-object.md

@@ -3,7 +3,7 @@ r[type.trait-object]
 
 r[type.trait-object.syntax]
 ```grammar,types
-TraitObjectType -> `dyn`? TypeParamBounds
+TraitObjectType -> `dyn`? Bounds
 
 TraitObjectTypeOneBound -> `dyn`? TraitBound
 ```