Update enum and method names for clarity

Author: aaron-ang

pyrefly/lib/alt/answers.rs

@@ -79,7 +79,7 @@ enum OverloadedCallee {
     Resolved {
         ty: Arc<Type>,
     },
-    Overload {
+    Candidates {
         all: Vec<Type>,
         closest: Arc<Type>,
         is_closest_chosen: bool,
@@ -576,7 +576,7 @@ impl Answers {
         let lock = self.trace.as_ref()?.lock();
         match lock.overloaded_callees.get(&range)? {
             OverloadedCallee::Resolved { ty } => Some(self.deep_force(ty.as_ref().clone())),
-            OverloadedCallee::Overload {
+            OverloadedCallee::Candidates {
                 closest,
                 is_closest_chosen,
                 ..
@@ -595,7 +595,7 @@ impl Answers {
         let lock = self.trace.as_ref()?.lock();
         match lock.overloaded_callees.get(&range)? {
             OverloadedCallee::Resolved { ty } => Some((vec![ty.as_ref().clone()], Some(0))),
-            OverloadedCallee::Overload { all, closest, .. } => {
+            OverloadedCallee::Candidates { all, closest, .. } => {
                 let chosen_index = all
                     .iter()
                     .position(|signature| signature == closest.as_ref());
@@ -627,7 +627,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
         &self.current().solver
     }
 
-    pub fn record_overload_trace_from_type(&self, loc: TextRange, ty: Type) {
+    pub fn record_resolved_trace(&self, loc: TextRange, ty: Type) {
         if let Some(trace) = &self.current().trace {
             trace
                 .lock()
@@ -648,7 +648,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
         if let Some(trace) = &self.current().trace {
             trace.lock().overloaded_callees.insert(
                 loc,
-                OverloadedCallee::Overload {
+                OverloadedCallee::Candidates {
                     all: all_overloads,
                     closest: Arc::new(closest_overload),
                     is_closest_chosen: is_closest_overload_chosen,

pyrefly/lib/alt/call.rs

@@ -471,8 +471,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
             && !self.is_compatible_constructor_return(&ret, cls.class_object())
         {
             if let Some(metaclass_dunder_call) = self.get_metaclass_dunder_call(&cls) {
-                // Not quite an overload, but close enough
-                self.record_overload_trace_from_type(range, metaclass_dunder_call);
+                self.record_resolved_trace(range, metaclass_dunder_call);
             }
             // Got something other than an instance of the class under construction.
             return ret;
@@ -503,8 +502,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
                 );
                 let has_errors = !dunder_new_errors.is_empty();
                 errors.extend(dunder_new_errors);
-                // Not quite an overload, but close enough
-                self.record_overload_trace_from_type(range, new_method);
+                self.record_resolved_trace(range, new_method);
                 if self.is_compatible_constructor_return(&ret, cls.class_object()) {
                     dunder_new_ret = Some(ret);
                 } else if !matches!(ret, Type::Any(AnyStyle::Error | AnyStyle::Implicit)) {
@@ -546,8 +544,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
             if !dunder_new_has_errors {
                 errors.extend(dunder_init_errors);
             }
-            // Not quite an overload, but close enough
-            self.record_overload_trace_from_type(range, init_method);
+            self.record_resolved_trace(range, init_method);
         }
         self.solver()
             .finish_class_targs(cls.targs_mut(), self.uniques);

pyrefly/lib/alt/operators.rs

@@ -46,7 +46,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
         opname: &Name,
         call_arg_type: &Type,
     ) -> Type {
-        self.record_overload_trace_from_type(range, method_type.clone());
+        self.record_resolved_trace(range, method_type.clone());
         let callable = self.as_call_target_or_error(
             method_type,
             CallStyle::Method(opname),