@@ -759,7 +759,7 @@ fn make_mirror_unadjusted<'a, 'gcx, 'tcx>(cx: &mut Cx<'a, 'gcx, 'tcx>,
759
759
}
760
760
}
761
761
762
- fn user_annotated_ty_for_def (
762
+ fn user_substs_applied_to_def (
763
763
cx : & mut Cx < ' a , ' gcx , ' tcx > ,
764
764
hir_id : hir:: HirId ,
765
765
def : & Def ,
@@ -795,7 +795,7 @@ fn user_annotated_ty_for_def(
795
795
cx. user_substs_applied_to_ty_of_hir_id ( hir_id) ,
796
796
797
797
_ =>
798
- bug ! ( "user_annotated_ty_for_def : unexpected def {:?} at {:?}" , def, hir_id)
798
+ bug ! ( "user_substs_applied_to_def : unexpected def {:?} at {:?}" , def, hir_id)
799
799
}
800
800
}
801
801
@@ -815,7 +815,7 @@ fn method_callee<'a, 'gcx, 'tcx>(
815
815
. unwrap_or_else ( || {
816
816
span_bug ! ( expr. span, "no type-dependent def for method callee" )
817
817
} ) ;
818
- let user_ty = user_annotated_ty_for_def ( cx, expr. hir_id , def) ;
818
+ let user_ty = user_substs_applied_to_def ( cx, expr. hir_id , def) ;
819
819
( def. def_id ( ) , cx. tables ( ) . node_substs ( expr. hir_id ) , user_ty)
820
820
}
821
821
} ;
@@ -882,7 +882,7 @@ fn convert_path_expr<'a, 'gcx, 'tcx>(cx: &mut Cx<'a, 'gcx, 'tcx>,
882
882
Def :: StructCtor ( _, CtorKind :: Fn ) |
883
883
Def :: VariantCtor ( _, CtorKind :: Fn ) |
884
884
Def :: SelfCtor ( ..) => {
885
- let user_ty = user_annotated_ty_for_def ( cx, expr. hir_id , & def) ;
885
+ let user_ty = user_substs_applied_to_def ( cx, expr. hir_id , & def) ;
886
886
ExprKind :: Literal {
887
887
literal : ty:: Const :: zero_sized (
888
888
cx. tcx ,
0 commit comments