diff options
| author | Benjamin Peterson <benjamin@python.org> | 2020-10-20 23:10:47 -0500 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2020-12-03 23:37:26 -0600 |
| commit | 4d8a7c282935ccb4452e371c1f572e75b7fd180e (patch) | |
| tree | 37c0855affb6940e4b8349fd2d733ac933aec7d5 | |
| parent | cb56b1a7e99735238908206b6a5febf8fd6a29c0 (diff) | |
| download | rust-4d8a7c282935ccb4452e371c1f572e75b7fd180e.tar.gz rust-4d8a7c282935ccb4452e371c1f572e75b7fd180e.zip | |
Unnest some .chain calls, so it's clearer what's going on.
| -rw-r--r-- | compiler/rustc_typeck/src/bounds.rs | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/compiler/rustc_typeck/src/bounds.rs b/compiler/rustc_typeck/src/bounds.rs index 683707470f4..497754f20e4 100644 --- a/compiler/rustc_typeck/src/bounds.rs +++ b/compiler/rustc_typeck/src/bounds.rs @@ -67,22 +67,18 @@ impl<'tcx> Bounds<'tcx> { sized_predicate .into_iter() + .chain(self.region_bounds.iter().map(|&(region_bound, span)| { + let outlives = ty::OutlivesPredicate(param_ty, region_bound); + (ty::Binder::bind(outlives).to_predicate(tcx), span) + })) + .chain(self.trait_bounds.iter().map(|&(bound_trait_ref, span, constness)| { + let predicate = bound_trait_ref.with_constness(constness).to_predicate(tcx); + (predicate, span) + })) .chain( - self.region_bounds + self.projection_bounds .iter() - .map(|&(region_bound, span)| { - let outlives = ty::OutlivesPredicate(param_ty, region_bound); - (ty::Binder::bind(outlives).to_predicate(tcx), span) - }) - .chain(self.trait_bounds.iter().map(|&(bound_trait_ref, span, constness)| { - let predicate = bound_trait_ref.with_constness(constness).to_predicate(tcx); - (predicate, span) - })) - .chain( - self.projection_bounds - .iter() - .map(|&(projection, span)| (projection.to_predicate(tcx), span)), - ), + .map(|&(projection, span)| (projection.to_predicate(tcx), span)), ) .collect() } |