@@ -9,10 +9,9 @@ use rustc_trait_selection::traits::auto_trait::{self, RegionTarget};
9
9
10
10
use thin_vec:: ThinVec ;
11
11
12
- use crate :: clean:: { self , simplify , Lifetime } ;
12
+ use crate :: clean:: { self , Lifetime } ;
13
13
use crate :: clean:: {
14
- clean_generic_param_def, clean_middle_ty, clean_predicate, clean_trait_ref_with_constraints,
15
- clean_ty_generics,
14
+ clean_generic_param_def, clean_middle_ty, clean_trait_ref_with_constraints, clean_ty_generics,
16
15
} ;
17
16
use crate :: core:: DocContext ;
18
17
@@ -169,7 +168,7 @@ fn clean_param_env<'tcx>(
169
168
// FIXME(#111101): Incorporate the explicit predicates of the item here...
170
169
let item_predicates: FxIndexSet < _ > =
171
170
tcx. param_env ( item_def_id) . caller_bounds ( ) . iter ( ) . collect ( ) ;
172
- let where_predicates = param_env
171
+ let predicates = param_env
173
172
. caller_bounds ( )
174
173
. iter ( )
175
174
// FIXME: ...which hopefully allows us to simplify this:
@@ -194,14 +193,14 @@ fn clean_param_env<'tcx>(
194
193
}
195
194
} )
196
195
} )
197
- . flat_map ( |pred| clean_predicate ( pred, cx) )
198
- . chain ( clean_region_outlives_constraints ( & region_data, generics) )
196
+ . map ( |pred| ( pred, rustc_span:: DUMMY_SP ) )
199
197
. collect ( ) ;
200
198
201
- let mut generics = clean:: Generics { params, where_predicates } ;
202
- simplify:: sized_bounds ( cx, & mut generics) ;
203
- generics. where_predicates = simplify:: where_clauses ( cx, generics. where_predicates ) ;
204
- generics
199
+ let mut where_predicates = super :: modern:: clean_predicates ( cx, predicates) ;
200
+ // FIXME: these no longer get "simplif[ied]::where_clauses"
201
+ where_predicates. extend ( clean_region_outlives_constraints ( & region_data, generics) ) ;
202
+
203
+ clean:: Generics { params, where_predicates }
205
204
}
206
205
207
206
/// Clean region outlives constraints to where-predicates.
0 commit comments