Rollup merge of rust-lang#30997 - bluss:trait-default, r=nikomatsakis

Fix type parameter default error to mention type and trait definitions

Introduced in PR rust-lang#30724, needs to mention that type parameter defaults
are legal in trait and type definitions too.

Author: steveklabnik

src/librustc_typeck/collect.rs

@@ -1918,8 +1918,8 @@ fn get_or_create_type_parameter_def<'a,'tcx>(ccx: &CrateCtxt<'a,'tcx>,
                 lint::builtin::INVALID_TYPE_PARAM_DEFAULT,
                 param.id,
                 param.span,
-                format!("defaults for type parameters are only allowed on type definitions, \
-                         like `struct` or `enum`"));
+                format!("defaults for type parameters are only allowed in `struct`, \
+                         `enum`, `type`, or `trait` definitions."));
         }
     }