@@ -686,7 +686,6 @@ impl<'tcx> RegionInferenceContext<'tcx> {
686
686
test : _,
687
687
} = type_test;
688
688
689
-
690
689
let generic_ty = generic_kind. to_ty ( tcx) ;
691
690
let subject = match self . try_promote_type_test_subject ( infcx, generic_ty) {
692
691
Some ( s) => s,
@@ -704,11 +703,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
704
703
debug ! ( "try_promote_type_test: non_local_ub={:?}" , non_local_ub) ;
705
704
706
705
assert ! ( self . universal_regions. is_universal_region( non_local_ub) ) ;
707
- assert ! (
708
- !self
709
- . universal_regions
710
- . is_local_free_region( non_local_ub)
711
- ) ;
706
+ assert ! ( !self . universal_regions. is_local_free_region( non_local_ub) ) ;
712
707
713
708
let requirement = ClosureOutlivesRequirement {
714
709
subject,
@@ -922,8 +917,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
922
917
// now). Therefore, the sup-region outlives the sub-region if,
923
918
// for each universal region R1 in the sub-region, there
924
919
// exists some region R2 in the sup-region that outlives R1.
925
- let universal_outlives = self
926
- . scc_values
920
+ let universal_outlives = self . scc_values
927
921
. universal_regions_outlived_by ( sub_region_scc)
928
922
. all ( |r1| {
929
923
self . scc_values
@@ -1034,8 +1028,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
1034
1028
// (because `fr` includes `end(o)`).
1035
1029
for shorter_fr in self . scc_values . universal_regions_outlived_by ( longer_fr_scc) {
1036
1030
// If it is known that `fr: o`, carry on.
1037
- if self
1038
- . universal_region_relations
1031
+ if self . universal_region_relations
1039
1032
. outlives ( longer_fr, shorter_fr)
1040
1033
{
1041
1034
continue ;
@@ -1051,8 +1044,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
1051
1044
if let Some ( propagated_outlives_requirements) = propagated_outlives_requirements {
1052
1045
// Shrink `fr` until we find a non-local region (if we do).
1053
1046
// We'll call that `fr-` -- it's ever so slightly smaller than `fr`.
1054
- if let Some ( fr_minus) = self
1055
- . universal_region_relations
1047
+ if let Some ( fr_minus) = self . universal_region_relations
1056
1048
. non_local_lower_bound ( longer_fr)
1057
1049
{
1058
1050
debug ! ( "check_universal_region: fr_minus={:?}" , fr_minus) ;
@@ -1061,8 +1053,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
1061
1053
// region. (We always will.) We'll call that
1062
1054
// `shorter_fr+` -- it's ever so slightly larger than
1063
1055
// `fr`.
1064
- let shorter_fr_plus = self
1065
- . universal_region_relations
1056
+ let shorter_fr_plus = self . universal_region_relations
1066
1057
. non_local_upper_bound ( shorter_fr) ;
1067
1058
debug ! (
1068
1059
"check_universal_region: shorter_fr_plus={:?}" ,
@@ -1122,8 +1113,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
1122
1113
let error_region = match error_element {
1123
1114
RegionElement :: Location ( l) => self . find_sub_region_live_at ( longer_fr, l) ,
1124
1115
RegionElement :: RootUniversalRegion ( r) => r,
1125
- RegionElement :: SubUniversalRegion ( error_ui) => self
1126
- . definitions
1116
+ RegionElement :: SubUniversalRegion ( error_ui) => self . definitions
1127
1117
. iter_enumerated ( )
1128
1118
. filter_map ( |( r, definition) | match definition. origin {
1129
1119
NLLRegionVariableOrigin :: BoundRegion ( ui) if error_ui == ui => Some ( r) ,
@@ -1220,7 +1210,11 @@ impl<'gcx, 'tcx> ClosureRegionRequirementsExt<'gcx, 'tcx> for ClosureRegionRequi
1220
1210
// into a vector. These are the regions that we will be
1221
1211
// relating to one another.
1222
1212
let closure_mapping = & UniversalRegions :: closure_mapping (
1223
- tcx, user_closure_ty, self . num_external_vids , tcx. closure_base_def_id ( closure_def_id) ) ;
1213
+ tcx,
1214
+ user_closure_ty,
1215
+ self . num_external_vids ,
1216
+ tcx. closure_base_def_id ( closure_def_id) ,
1217
+ ) ;
1224
1218
debug ! ( "apply_requirements: closure_mapping={:?}" , closure_mapping) ;
1225
1219
1226
1220
// Create the predicates.
0 commit comments