From 6dc6a1f9472d7e4be430368dad79a9f8a34c8de0 Mon Sep 17 00:00:00 2001 From: Bastian Kauschke Date: Thu, 23 Jul 2020 13:04:44 +0200 Subject: [PATCH] cleanup --- src/librustc_ast_lowering/lib.rs | 2 +- src/librustc_resolve/late/lifetimes.rs | 4 ++-- src/librustc_typeck/collect.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/librustc_ast_lowering/lib.rs b/src/librustc_ast_lowering/lib.rs index b631686324b..1c70eef3bf5 100644 --- a/src/librustc_ast_lowering/lib.rs +++ b/src/librustc_ast_lowering/lib.rs @@ -936,7 +936,7 @@ fn add_in_band_defs( }) }); - 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) diff --git a/src/librustc_resolve/late/lifetimes.rs b/src/librustc_resolve/late/lifetimes.rs index 658528b200d..3fbb42ece47 100644 --- a/src/librustc_resolve/late/lifetimes.rs +++ b/src/librustc_resolve/late/lifetimes.rs @@ -1299,8 +1299,8 @@ fn add_bounds(set: &mut Set1, 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) } }) diff --git a/src/librustc_typeck/collect.rs b/src/librustc_typeck/collect.rs index c4734125e6f..acf68be1176 100644 --- a/src/librustc_typeck/collect.rs +++ b/src/librustc_typeck/collect.rs @@ -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(); }, -- 2.44.0