Incorporated feedback from Carl's code review.

Author: erictraut

conformance/results/mypy/overloads_evaluation.toml

@@ -4,7 +4,7 @@ Does not expand boolean arguments to Literal[True] and Literal[False].
 Does not expand enum arguments to literal variants.
 Does not expand tuple arguments to possible combinations.
 Does not evaluate Any in some cases where overload is ambiguous.
-Evaluates Any is some cases where overload is not ambiguous.
+Evaluates Any in some cases where overload is not ambiguous.
 """
 conformance_automated = "Fail"
 errors_diff = """
@@ -16,8 +16,8 @@ Line 204: Unexpected errors ['overloads_evaluation.py:204: error: Argument 1 to
 Line 205: Unexpected errors ['overloads_evaluation.py:205: error: Expression is of type "int", not "int | str"  [assert-type]']
 Line 264: Unexpected errors ['overloads_evaluation.py:264: error: Expression is of type "list[Any]", not "Any"  [assert-type]']
 Line 280: Unexpected errors ['overloads_evaluation.py:280: error: Expression is of type "list[Any]", not "Any"  [assert-type]']
-Line 298: Unexpected errors ['overloads_evaluation.py:298: error: Expression is of type "Any", not "float"  [assert-type]']
-Line 336: Unexpected errors ['overloads_evaluation.py:336: error: Expression is of type "list[Any]", not "Any"  [assert-type]']
+Line 301: Unexpected errors ['overloads_evaluation.py:301: error: Expression is of type "Any", not "float"  [assert-type]']
+Line 345: Unexpected errors ['overloads_evaluation.py:345: error: Expression is of type "list[Any]", not "Any"  [assert-type]']
 """
 output = """
 overloads_evaluation.py:38: error: All overload variants of "example1_1" require at least one argument  [call-overload]
@@ -48,6 +48,6 @@ overloads_evaluation.py:204: error: Argument 1 to "expand_tuple" has incompatibl
 overloads_evaluation.py:205: error: Expression is of type "int", not "int | str"  [assert-type]
 overloads_evaluation.py:264: error: Expression is of type "list[Any]", not "Any"  [assert-type]
 overloads_evaluation.py:280: error: Expression is of type "list[Any]", not "Any"  [assert-type]
-overloads_evaluation.py:298: error: Expression is of type "Any", not "float"  [assert-type]
-overloads_evaluation.py:336: error: Expression is of type "list[Any]", not "Any"  [assert-type]
+overloads_evaluation.py:301: error: Expression is of type "Any", not "float"  [assert-type]
+overloads_evaluation.py:345: error: Expression is of type "list[Any]", not "Any"  [assert-type]
 """

conformance/results/pyre/overloads_evaluation.toml

@@ -22,8 +22,7 @@ Line 205: Unexpected errors ['overloads_evaluation.py:205:4 Assert type [70]: Ex
 Line 234: Unexpected errors ['overloads_evaluation.py:234:4 Assert type [70]: Expected `int` but got `str`.']
 Line 264: Unexpected errors ['overloads_evaluation.py:264:4 Assert type [70]: Expected `typing.Any` but got `List[int]`.']
 Line 280: Unexpected errors ['overloads_evaluation.py:280:4 Assert type [70]: Expected `typing.Any` but got `List[int]`.']
-Line 307: Unexpected errors ["overloads_evaluation.py:307:4 Assert type [70]: Expected `str` but got `typing_extensions.Literal['']`."]
-Line 336: Unexpected errors ['overloads_evaluation.py:336:4 Assert type [70]: Expected `typing.Any` but got `List[int]`.']
+Line 345: Unexpected errors ['overloads_evaluation.py:345:4 Assert type [70]: Expected `typing.Any` but got `List[int]`.']
 """
 output = """
 overloads_evaluation.py:38:0 Missing argument [20]: Call `example1_1` expects argument `x`.
@@ -44,6 +43,5 @@ overloads_evaluation.py:205:4 Assert type [70]: Expected `Union[int, str]` but g
 overloads_evaluation.py:234:4 Assert type [70]: Expected `int` but got `str`.
 overloads_evaluation.py:264:4 Assert type [70]: Expected `typing.Any` but got `List[int]`.
 overloads_evaluation.py:280:4 Assert type [70]: Expected `typing.Any` but got `List[int]`.
-overloads_evaluation.py:307:4 Assert type [70]: Expected `str` but got `typing_extensions.Literal['']`.
-overloads_evaluation.py:336:4 Assert type [70]: Expected `typing.Any` but got `List[int]`.
+overloads_evaluation.py:345:4 Assert type [70]: Expected `typing.Any` but got `List[int]`.
 """

conformance/results/pyre/version.toml

@@ -1,2 +1,2 @@
 version = "pyre 0.9.23"
-test_duration = 7.3
+test_duration = 6.4

conformance/results/pytype/overloads_evaluation.toml

@@ -26,7 +26,7 @@ Line 234: Unexpected errors ['overloads_evaluation.py:234:5: \\x1b[1m\\x1b[31mer
 Line 264: Unexpected errors ['overloads_evaluation.py:264:5: \\x1b[1m\\x1b[31merror\\x1b[39m\\x1b[0m: in check_example4: list[int] [assert-type]']
 Line 280: Unexpected errors ['overloads_evaluation.py:280:5: \\x1b[1m\\x1b[31merror\\x1b[39m\\x1b[0m: in check_example5: list[int] [assert-type]']
 Line 291: Unexpected errors ['overloads_evaluation.py:291:1: \\x1b[1m\\x1b[31merror\\x1b[39m\\x1b[0m: in example6: bad return type [bad-return-type]', 'overloads_evaluation.py:291:1: \\x1b[1m\\x1b[31merror\\x1b[39m\\x1b[0m: in example6: bad return type [bad-return-type]', 'overloads_evaluation.py:291:1: \\x1b[1m\\x1b[31merror\\x1b[39m\\x1b[0m: in example6: bad return type [bad-return-type]']
-Line 336: Unexpected errors ['overloads_evaluation.py:336:5: \\x1b[1m\\x1b[31merror\\x1b[39m\\x1b[0m: in check_example7: list[int] [assert-type]']
+Line 345: Unexpected errors ['overloads_evaluation.py:345:5: \\x1b[1m\\x1b[31merror\\x1b[39m\\x1b[0m: in check_example7: list[int] [assert-type]']
 """
 output = """
 overloads_evaluation.py:33:12: \u001b[1m\u001b[31merror\u001b[39m\u001b[0m: in example1_1: bad return type [bad-return-type]
@@ -152,20 +152,20 @@ def example6(a: float, b: T) -> T: ...
 \u001b[1m\u001b[31m\u001b[39m\u001b[0m
 
 Called from (traceback):
-  line 312, in check_example6
+  line 321, in check_example6
 overloads_evaluation.py:291:1: \u001b[1m\u001b[31merror\u001b[39m\u001b[0m: in example6: bad return type [bad-return-type]
 
 def example6(a: float, b: T) -> T: ...
 \u001b[1m\u001b[31m\u001b[39m\u001b[0m
 
 Called from (traceback):
-  line 306, in check_example6
+  line 315, in check_example6
 overloads_evaluation.py:291:1: \u001b[1m\u001b[31merror\u001b[39m\u001b[0m: in example6: bad return type [bad-return-type]
 
 def example6(a: float, b: T) -> T: ...
 \u001b[1m\u001b[31m\u001b[39m\u001b[0m
 
-overloads_evaluation.py:336:5: \u001b[1m\u001b[31merror\u001b[39m\u001b[0m: in check_example7: list[int] [assert-type]
+overloads_evaluation.py:345:5: \u001b[1m\u001b[31merror\u001b[39m\u001b[0m: in check_example7: list[int] [assert-type]
 
     assert_type(ret3, Any)
     \u001b[1m\u001b[31m~~~~~~~~~~~~~~~~~~~~~~\u001b[39m\u001b[0m

conformance/results/pytype/version.toml

@@ -1,2 +1,2 @@
 version = "pytype 2024.10.11"
-test_duration = 33.4
+test_duration = 32.7

conformance/results/results.html

@@ -165,10 +165,10 @@ <h3>Python Type System Conformance Test Results</h3>
 <div class='tc-time'>1.3sec</div>
 </th>
 <th class='tc-header'><div class='tc-name'>pyre 0.9.23</div>
-<div class='tc-time'>7.3sec</div>
+<div class='tc-time'>6.4sec</div>
 </th>
 <th class='tc-header'><div class='tc-name'>pytype 2024.10.11</div>
-<div class='tc-time'>33.4sec</div>
+<div class='tc-time'>32.7sec</div>
 </th>
 </tr>
 <tr><th class="column" colspan="5">
@@ -691,7 +691,7 @@ <h3>Python Type System Conformance Test Results</h3>
 <th class="column col2 not-conformant"><div class="hover-text">Fail<span class="tooltip-text" id="bottom"><p>Does not enforce any of the specified rules regarding overload definitions.</p></span></div></th>
 </tr>
 <tr><th class="column col1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;overloads_evaluation</th>
-<th class="column col2 partially-conformant"><div class="hover-text">Partial<span class="tooltip-text" id="bottom"><p>Does not expand boolean arguments to Literal[True] and Literal[False].</p><p>Does not expand enum arguments to literal variants.</p><p>Does not expand tuple arguments to possible combinations.</p><p>Does not evaluate Any in some cases where overload is ambiguous.</p><p>Evaluates Any is some cases where overload is not ambiguous.</p></span></div></th>
+<th class="column col2 partially-conformant"><div class="hover-text">Partial<span class="tooltip-text" id="bottom"><p>Does not expand boolean arguments to Literal[True] and Literal[False].</p><p>Does not expand enum arguments to literal variants.</p><p>Does not expand tuple arguments to possible combinations.</p><p>Does not evaluate Any in some cases where overload is ambiguous.</p><p>Evaluates Any in some cases where overload is not ambiguous.</p></span></div></th>
 <th class="column col2 partially-conformant"><div class="hover-text">Partial<span class="tooltip-text" id="bottom"><p>Does not evaluate Any in some cases where overload is ambiguous.</p></span></div></th>
 <th class="column col2 partially-conformant"><div class="hover-text">Partial<span class="tooltip-text" id="bottom"><p>Does not expand boolean arguments to Literal[True] and Literal[False].</p><p>Does not expand enum arguments to literal variants.</p><p>Does not expand type[A | B] to type[A] and type[B].</p><p>Does not expand tuple arguments to possible combinations.</p><p>Does not prefer variadic match to indeterminate-length unpacked argument.</p><p>Does not treat multiple matches due to gradual types as ambiguous.</p></span></div></th>
 <th class="column col2 partially-conformant"><div class="hover-text">Partial<span class="tooltip-text" id="bottom"><p>Does not perform argument expansion (on any types) when matching overloads.</p><p>Does not treat multiple matches due to gradual types as ambiguous.</p><p>Does not prefer variadic match to indeterminate-length unpacked argument.</p></span></div></th>

conformance/tests/overloads_evaluation.py

@@ -291,19 +291,28 @@ def example6(a: float, b: T) -> T: ...
 def example6(a: float, b: T) -> T: ...
 
 
-def check_example6(a: list, b: Any) -> None:
+def check_example6(a: list[Any], b: Any, c: str) -> None:
     m: list[int] = []
 
+    # All possible materializations of list[Any] are
+    # assignable to Any, so this matches the first overload
+    # and eliminates all subsequent overloads.
     v1 = example6(1, a)
     assert_type(v1, float)
 
+    # All possible materializations of Any are
+    # assignable to Any, so this matches the first overload
+    # and eliminates all subsequent overloads.
     v2 = example6(1, b)
     assert_type(v2, float)
 
+    # All possible materializations of list[int] are
+    # assignable to Any, so this matches the first overload
+    # and eliminates all subsequent overloads.
     v3 = example6(1, m)
     assert_type(v3, float)
 
-    v4 = example6(1.0, "")
+    v4 = example6(1.0, c)
     assert_type(v4, str)
 
     v5 = example6(1.0, b)