@@ -10,12 +10,12 @@ use rustc_trait_selection::traits;
10
10
use smallvec:: SmallVec ;
11
11
12
12
use crate :: astconv:: {
13
- AstConv , ConvertedBinding , ConvertedBindingKind , OnlySelfBounds , PredicateFilter ,
13
+ HirTyLowerer , LoweredBinding , LoweredBindingKind , OnlySelfBounds , PredicateFilter ,
14
14
} ;
15
15
use crate :: bounds:: Bounds ;
16
16
use crate :: errors;
17
17
18
- impl < ' tcx > dyn AstConv < ' tcx > + ' _ {
18
+ impl < ' tcx > dyn HirTyLowerer < ' tcx > + ' _ {
19
19
/// Sets `implicitly_sized` to true on `Bounds` if necessary
20
20
pub ( crate ) fn add_implicitly_sized (
21
21
& self ,
@@ -156,7 +156,7 @@ impl<'tcx> dyn AstConv<'tcx> + '_ {
156
156
) ;
157
157
}
158
158
hir:: GenericBound :: Outlives ( lifetime) => {
159
- let region = self . ast_region_to_region ( lifetime, None ) ;
159
+ let region = self . lower_region ( lifetime, None ) ;
160
160
bounds. push_region_bound (
161
161
self . tcx ( ) ,
162
162
ty:: Binder :: bind_with_vars (
@@ -234,11 +234,11 @@ impl<'tcx> dyn AstConv<'tcx> + '_ {
234
234
/// `trait_ref` here will be `for<'a> T: Iterator`. The `binding` data however is from *inside*
235
235
/// the binder (e.g., `&'a u32`) and hence may reference bound regions.
236
236
#[ instrument( level = "debug" , skip( self , bounds, speculative, dup_bindings, path_span) ) ]
237
- pub ( super ) fn add_predicates_for_ast_type_binding (
237
+ pub ( super ) fn lower_type_bindings_to_predicates (
238
238
& self ,
239
239
hir_ref_id : hir:: HirId ,
240
240
trait_ref : ty:: PolyTraitRef < ' tcx > ,
241
- binding : & ConvertedBinding < ' _ , ' tcx > ,
241
+ binding : & LoweredBinding < ' _ , ' tcx > ,
242
242
bounds : & mut Bounds < ' tcx > ,
243
243
speculative : bool ,
244
244
dup_bindings : & mut FxIndexMap < DefId , Span > ,
@@ -266,15 +266,15 @@ impl<'tcx> dyn AstConv<'tcx> + '_ {
266
266
let assoc_kind =
267
267
if binding. gen_args . parenthesized == hir:: GenericArgsParentheses :: ReturnTypeNotation {
268
268
ty:: AssocKind :: Fn
269
- } else if let ConvertedBindingKind :: Equality ( term) = binding. kind
269
+ } else if let LoweredBindingKind :: Equality ( term) = binding. kind
270
270
&& let ty:: TermKind :: Const ( _) = term. node . unpack ( )
271
271
{
272
272
ty:: AssocKind :: Const
273
273
} else {
274
274
ty:: AssocKind :: Type
275
275
} ;
276
276
277
- let candidate = if self . trait_defines_associated_item_named (
277
+ let candidate = if self . trait_defines_assoc_item_named (
278
278
trait_ref. def_id ( ) ,
279
279
assoc_kind,
280
280
binding. item_name ,
@@ -421,7 +421,7 @@ impl<'tcx> dyn AstConv<'tcx> + '_ {
421
421
infer_args : false ,
422
422
} ;
423
423
424
- let args_trait_ref_and_assoc_item = self . create_args_for_associated_item (
424
+ let args_trait_ref_and_assoc_item = self . lower_args_for_assoc_item (
425
425
path_span,
426
426
assoc_item. def_id ,
427
427
& item_segment,
@@ -442,7 +442,7 @@ impl<'tcx> dyn AstConv<'tcx> + '_ {
442
442
//
443
443
// for<'a> <T as Iterator>::Item = &'a str // <-- 'a is bad
444
444
// for<'a> <T as FnMut<(&'a u32,)>>::Output = &'a str // <-- 'a is ok
445
- if let ConvertedBindingKind :: Equality ( ty) = binding. kind {
445
+ if let LoweredBindingKind :: Equality ( ty) = binding. kind {
446
446
let late_bound_in_trait_ref =
447
447
tcx. collect_constrained_late_bound_regions ( & projection_ty) ;
448
448
let late_bound_in_ty =
@@ -472,12 +472,12 @@ impl<'tcx> dyn AstConv<'tcx> + '_ {
472
472
}
473
473
474
474
match binding. kind {
475
- ConvertedBindingKind :: Equality ( ..) if let ty:: AssocKind :: Fn = assoc_kind => {
475
+ LoweredBindingKind :: Equality ( ..) if let ty:: AssocKind :: Fn = assoc_kind => {
476
476
return Err ( self . tcx ( ) . dcx ( ) . emit_err (
477
477
crate :: errors:: ReturnTypeNotationEqualityBound { span : binding. span } ,
478
478
) ) ;
479
479
}
480
- ConvertedBindingKind :: Equality ( term) => {
480
+ LoweredBindingKind :: Equality ( term) => {
481
481
// "Desugar" a constraint like `T: Iterator<Item = u32>` this to
482
482
// the "projection predicate" for:
483
483
//
@@ -491,7 +491,7 @@ impl<'tcx> dyn AstConv<'tcx> + '_ {
491
491
binding. span ,
492
492
) ;
493
493
}
494
- ConvertedBindingKind :: Constraint ( ast_bounds) => {
494
+ LoweredBindingKind :: Constraint ( ast_bounds) => {
495
495
// "Desugar" a constraint like `T: Iterator<Item: Debug>` to
496
496
//
497
497
// `<T as Iterator>::Item: Debug`
0 commit comments