@@ -502,14 +502,14 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
502502 hint : Option < HintRef > ,
503503 ctor_targs : & Option < & mut TArgs > ,
504504 ) -> ( CalledOverload < ' c > , bool ) {
505- // Collect partial vars so we can save/restore them around each overload evaluation. This
506- // prevents premature pinning of partial vars on failed overload calls.
507- let partial_vars = self . collect_partial_vars ( self_obj, args, keywords) ;
505+ // Collect placeholder vars so we can save/restore them around each overload evaluation. This
506+ // prevents premature pinning of vars on failed overload calls.
507+ let placeholder_vars = self . collect_placeholder_vars ( self_obj, args, keywords) ;
508508
509509 let mut matched_overloads = Vec :: with_capacity ( overloads. len ( ) ) ;
510510 let mut closest_unmatched_overload: Option < CalledOverload < ' c > > = None ;
511511 for callable in overloads {
512- let snapshot = self . solver ( ) . snapshot_vars ( & partial_vars ) ;
512+ let snapshot = self . solver ( ) . snapshot_vars ( & placeholder_vars ) ;
513513 let called_overload = self . call_overload (
514514 callable,
515515 metadata,
@@ -630,7 +630,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
630630 matched_overloads
631631 . iter ( )
632632 . find_position ( |o| {
633- let snapshot = self . solver ( ) . snapshot_vars ( & partial_vars ) ;
633+ let snapshot = self . solver ( ) . snapshot_vars ( & placeholder_vars ) ;
634634 let res = self . call_overload (
635635 o. func ,
636636 metadata,
@@ -747,18 +747,18 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
747747 Some ( candidate)
748748 }
749749
750- /// Collect partial vars from self_obj and Type-valued arguments.
751- fn collect_partial_vars (
750+ /// Collect placeholder vars from self_obj and Type-valued arguments.
751+ fn collect_placeholder_vars (
752752 & self ,
753753 self_obj : Option < & Type > ,
754754 args : & [ CallArg ] ,
755755 keywords : & [ CallKeyword ] ,
756756 ) -> Vec < Var > {
757- let mut partial_vars : Vec < Var > = Vec :: new ( ) ;
757+ let mut placeholder_vars : Vec < Var > = Vec :: new ( ) ;
758758 let mut collect = |ty : & Type | {
759759 for var in ty. collect_maybe_placeholder_vars ( ) {
760- if self . solver ( ) . var_is_partial ( var ) && !partial_vars . contains ( & var) {
761- partial_vars . push ( var) ;
760+ if !placeholder_vars . contains ( & var) {
761+ placeholder_vars . push ( var) ;
762762 }
763763 }
764764 } ;
@@ -777,7 +777,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
777777 collect ( ty) ;
778778 }
779779 }
780- partial_vars
780+ placeholder_vars
781781 }
782782
783783 fn call_overload < ' c > (
0 commit comments