]> git.lizzy.rs Git - rust.git/commitdiff
cleanup
authorBastian Kauschke <bastian_kauschke@hotmail.de>
Thu, 23 Jul 2020 11:04:44 +0000 (13:04 +0200)
committerBastian Kauschke <bastian_kauschke@hotmail.de>
Thu, 23 Jul 2020 11:04:44 +0000 (13:04 +0200)
src/librustc_ast_lowering/lib.rs
src/librustc_resolve/late/lifetimes.rs
src/librustc_typeck/collect.rs

index b631686324b1361ab5af0d41db156b4884aca911..1c70eef3bf5e32259b5387ab81c510498818792a 100644 (file)
@@ -936,7 +936,7 @@ fn add_in_band_defs<T>(
                 })
             });
 
-        lowered_generics.params = lowered_generics.params.into_iter().chain(in_band_defs).collect();
+        lowered_generics.params.extend(in_band_defs);
 
         let lowered_generics = lowered_generics.into_generics(self.arena);
         (lowered_generics, res)
index 658528b200dd153ca2a52bf3d1e5ce72fb3de244..3fbb42ece47a0f904c8060e92ff1baefae69210e 100644 (file)
@@ -1299,8 +1299,8 @@ fn add_bounds(set: &mut Set1<hir::LifetimeName>, bounds: &[hir::GenericBound<'_>
             GenericParamKind::Const { .. } => {
                 // Generic consts don't impose any constraints.
                 //
-                // We still store a dummy value here to allow generic paramters
-                // in arbitrary order.
+                // We still store a dummy value here to allow generic parameters
+                // in an arbitrary order.
                 Some(Set1::Empty)
             }
         })
index c4734125e6f01108ca8abd0e106b679fa12bacd5..acf68be1176ddbf0df08563401f8f948359067e8 100644 (file)
@@ -1374,7 +1374,7 @@ fn generics_of(tcx: TyCtxt<'_>, def_id: DefId) -> ty::Generics {
                         |lint| {
                             lint.build(
                                 "defaults for type parameters are only allowed in \
-                                            `struct`, `enum`, `type`, or `trait` definitions.",
+                                 `struct`, `enum`, `type`, or `trait` definitions.",
                             )
                             .emit();
                         },