Skip to content

Commit 651215e

Browse files
varkorvarkor
committed
Replace for_each with for
1 parent 11adc13 commit 651215e

File tree

3 files changed

+56
-46
lines changed

3 files changed

+56
-46
lines changed

‎src/librustc_metadata/encoder.rs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1683,15 +1683,17 @@ impl<'a, 'b, 'tcx> IndexBuilder<'a, 'b, 'tcx> {
16831683
}
16841684

16851685
fn encode_info_for_generics(&mut self, generics: &hir::Generics) {
1686-
generics.params.iter().for_each(|param| match param.kind {
1687-
hir::GenericParamKind::Lifetime { .. } => {}
1688-
hir::GenericParamKind::Type { ref default, .. } => {
1689-
let def_id = self.tcx.hir.local_def_id(param.id);
1690-
let has_default = Untracked(default.is_some());
1691-
let encode_info = IsolatedEncoder::encode_info_for_ty_param;
1692-
self.record(def_id, encode_info, (def_id, has_default));
1686+
for param in &generics.params {
1687+
match param.kind {
1688+
hir::GenericParamKind::Lifetime { .. } => {}
1689+
hir::GenericParamKind::Type { ref default, .. } => {
1690+
let def_id = self.tcx.hir.local_def_id(param.id);
1691+
let has_default = Untracked(default.is_some());
1692+
let encode_info = IsolatedEncoder::encode_info_for_ty_param;
1693+
self.record(def_id, encode_info, (def_id, has_default));
1694+
}
16931695
}
1694-
});
1696+
}
16951697
}
16961698

16971699
fn encode_info_for_ty(&mut self, ty: &hir::Ty) {

‎src/librustc_resolve/lib.rs

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2340,28 +2340,30 @@ impl<'a, 'crateloader: 'a> Resolver<'a, 'crateloader> {
23402340
HasTypeParameters(generics, rib_kind) => {
23412341
let mut function_type_rib = Rib::new(rib_kind);
23422342
let mut seen_bindings = FxHashMap();
2343-
generics.params.iter().for_each(|param| match param.kind {
2344-
GenericParamKind::Lifetime { .. } => {}
2345-
GenericParamKind::Type { .. } => {
2346-
let ident = param.ident.modern();
2347-
debug!("with_type_parameter_rib: {}", param.id);
2348-
2349-
if seen_bindings.contains_key(&ident) {
2350-
let span = seen_bindings.get(&ident).unwrap();
2351-
let err = ResolutionError::NameAlreadyUsedInTypeParameterList(
2352-
ident.name,
2353-
span,
2354-
);
2355-
resolve_error(self, param.ident.span, err);
2356-
}
2357-
seen_bindings.entry(ident).or_insert(param.ident.span);
2343+
for param in &generics.params {
2344+
match param.kind {
2345+
GenericParamKind::Lifetime { .. } => {}
2346+
GenericParamKind::Type { .. } => {
2347+
let ident = param.ident.modern();
2348+
debug!("with_type_parameter_rib: {}", param.id);
2349+
2350+
if seen_bindings.contains_key(&ident) {
2351+
let span = seen_bindings.get(&ident).unwrap();
2352+
let err = ResolutionError::NameAlreadyUsedInTypeParameterList(
2353+
ident.name,
2354+
span,
2355+
);
2356+
resolve_error(self, param.ident.span, err);
2357+
}
2358+
seen_bindings.entry(ident).or_insert(param.ident.span);
23582359

2359-
// Plain insert (no renaming).
2360-
let def = Def::TyParam(self.definitions.local_def_id(param.id));
2361-
function_type_rib.bindings.insert(ident, def);
2362-
self.record_def(param.id, PathResolution::new(def));
2360+
// Plain insert (no renaming).
2361+
let def = Def::TyParam(self.definitions.local_def_id(param.id));
2362+
function_type_rib.bindings.insert(ident, def);
2363+
self.record_def(param.id, PathResolution::new(def));
2364+
}
23632365
}
2364-
});
2366+
}
23652367
self.ribs[TypeNS].push(function_type_rib);
23662368
}
23672369

‎src/librustc_save_analysis/dump_visitor.rs

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -824,10 +824,12 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> {
824824
if let Some(ref generic_args) = seg.args {
825825
match **generic_args {
826826
ast::GenericArgs::AngleBracketed(ref data) => {
827-
data.args.iter().for_each(|arg| match arg {
828-
ast::GenericArg::Type(ty) => self.visit_ty(ty),
829-
_ => {}
830-
});
827+
for arg in &data.args {
828+
match arg {
829+
ast::GenericArg::Type(ty) => self.visit_ty(ty),
830+
_ => {}
831+
}
832+
}
831833
}
832834
ast::GenericArgs::Parenthesized(ref data) => {
833835
for t in &data.inputs {
@@ -911,10 +913,12 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> {
911913
// Explicit types in the turbo-fish.
912914
if let Some(ref generic_args) = seg.args {
913915
if let ast::GenericArgs::AngleBracketed(ref data) = **generic_args {
914-
data.args.iter().for_each(|arg| match arg {
915-
ast::GenericArg::Type(ty) => self.visit_ty(ty),
916-
_ => {}
917-
});
916+
for arg in &data.args {
917+
match arg {
918+
ast::GenericArg::Type(ty) => self.visit_ty(ty),
919+
_ => {}
920+
}
921+
}
918922
}
919923
}
920924

@@ -1522,19 +1526,21 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> Visitor<'l> for DumpVisitor<'l, 'tc
15221526
}
15231527

15241528
fn visit_generics(&mut self, generics: &'l ast::Generics) {
1525-
generics.params.iter().for_each(|param| match param.kind {
1526-
ast::GenericParamKind::Lifetime { .. } => {}
1527-
ast::GenericParamKind::Type { ref default, .. } => {
1528-
for bound in &param.bounds {
1529-
if let ast::GenericBound::Trait(ref trait_ref, _) = *bound {
1530-
self.process_path(trait_ref.trait_ref.ref_id, &trait_ref.trait_ref.path)
1529+
for param in &generics.params {
1530+
match param.kind {
1531+
ast::GenericParamKind::Lifetime { .. } => {}
1532+
ast::GenericParamKind::Type { ref default, .. } => {
1533+
for bound in &param.bounds {
1534+
if let ast::GenericBound::Trait(ref trait_ref, _) = *bound {
1535+
self.process_path(trait_ref.trait_ref.ref_id, &trait_ref.trait_ref.path)
1536+
}
1537+
}
1538+
if let Some(ref ty) = default {
1539+
self.visit_ty(&ty);
15311540
}
1532-
}
1533-
if let Some(ref ty) = default {
1534-
self.visit_ty(&ty);
15351541
}
15361542
}
1537-
});
1543+
}
15381544
}
15391545

15401546
fn visit_ty(&mut self, t: &'l ast::Ty) {

0 commit comments

Comments
 (0)