Fixed bug in conformance test.

Updated conformance results for latest versions of type checkers.
Removed outdated references to "overlapping overloads" in spec.

Author: erictraut

conformance/results/mypy/overloads_consistency.toml

@@ -3,6 +3,6 @@ conformance_automated = "Pass"
 errors_diff = """
 """
 output = """
-overloads_consistency.py:27: error: Overloaded function implementation cannot produce return type of signature 2  [misc]
-overloads_consistency.py:43: error: Overloaded function implementation does not accept all possible arguments of signature 2  [misc]
+overloads_consistency.py:28: error: Overloaded function implementation cannot produce return type of signature 2  [misc]
+overloads_consistency.py:44: error: Overloaded function implementation does not accept all possible arguments of signature 2  [misc]
 """

conformance/results/mypy/overloads_overlap.toml

@@ -1,2 +1,2 @@
 version = "mypy 1.15.0"
-test_duration = 1.7
+test_duration = 1.6

conformance/results/mypy/version.toml

@@ -4,15 +4,15 @@ Does not apply decorator transforms before checking overload consistency.
 """
 conformance_automated = "Fail"
 errors_diff = """
-Line 107: Unexpected errors ['overloads_consistency.py:107:0 Incompatible overload [43]: The return type of overloaded function `decorated` (`None`) is incompatible with the return type of the implementation (`bytes`).', 'overloads_consistency.py:107:0 Incompatible overload [43]: The implementation of `decorated` does not accept all possible arguments of overload defined on line `107`.']
-Line 111: Unexpected errors ['overloads_consistency.py:111:0 Incompatible overload [43]: The return type of overloaded function `decorated` (`str`) is incompatible with the return type of the implementation (`bytes`).', 'overloads_consistency.py:111:0 Incompatible overload [43]: The implementation of `decorated` does not accept all possible arguments of overload defined on line `111`.', 'overloads_consistency.py:111:0 Incompatible overload [43]: This definition does not have the same decorators as the preceding overload(s).']
+Line 108: Unexpected errors ['overloads_consistency.py:108:0 Incompatible overload [43]: The return type of overloaded function `decorated` (`None`) is incompatible with the return type of the implementation (`bytes`).', 'overloads_consistency.py:108:0 Incompatible overload [43]: The implementation of `decorated` does not accept all possible arguments of overload defined on line `108`.']
+Line 112: Unexpected errors ['overloads_consistency.py:112:0 Incompatible overload [43]: The return type of overloaded function `decorated` (`str`) is incompatible with the return type of the implementation (`bytes`).', 'overloads_consistency.py:112:0 Incompatible overload [43]: The implementation of `decorated` does not accept all possible arguments of overload defined on line `112`.', 'overloads_consistency.py:112:0 Incompatible overload [43]: This definition does not have the same decorators as the preceding overload(s).']
 """
 output = """
-overloads_consistency.py:24:0 Incompatible overload [43]: The return type of overloaded function `return_type` (`str`) is incompatible with the return type of the implementation (`int`).
-overloads_consistency.py:40:0 Incompatible overload [43]: The implementation of `parameter_type` does not accept all possible arguments of overload defined on line `40`.
-overloads_consistency.py:107:0 Incompatible overload [43]: The return type of overloaded function `decorated` (`None`) is incompatible with the return type of the implementation (`bytes`).
-overloads_consistency.py:107:0 Incompatible overload [43]: The implementation of `decorated` does not accept all possible arguments of overload defined on line `107`.
-overloads_consistency.py:111:0 Incompatible overload [43]: The return type of overloaded function `decorated` (`str`) is incompatible with the return type of the implementation (`bytes`).
-overloads_consistency.py:111:0 Incompatible overload [43]: The implementation of `decorated` does not accept all possible arguments of overload defined on line `111`.
-overloads_consistency.py:111:0 Incompatible overload [43]: This definition does not have the same decorators as the preceding overload(s).
+overloads_consistency.py:25:0 Incompatible overload [43]: The return type of overloaded function `return_type` (`str`) is incompatible with the return type of the implementation (`int`).
+overloads_consistency.py:41:0 Incompatible overload [43]: The implementation of `parameter_type` does not accept all possible arguments of overload defined on line `41`.
+overloads_consistency.py:108:0 Incompatible overload [43]: The return type of overloaded function `decorated` (`None`) is incompatible with the return type of the implementation (`bytes`).
+overloads_consistency.py:108:0 Incompatible overload [43]: The implementation of `decorated` does not accept all possible arguments of overload defined on line `108`.
+overloads_consistency.py:112:0 Incompatible overload [43]: The return type of overloaded function `decorated` (`str`) is incompatible with the return type of the implementation (`bytes`).
+overloads_consistency.py:112:0 Incompatible overload [43]: The implementation of `decorated` does not accept all possible arguments of overload defined on line `112`.
+overloads_consistency.py:112:0 Incompatible overload [43]: This definition does not have the same decorators as the preceding overload(s).
 """

conformance/results/pyre/overloads_consistency.toml

@@ -1,2 +1,2 @@
 version = "pyre 0.9.23"
-test_duration = 6.8
+test_duration = 7.4

conformance/results/pyre/overloads_overlap.toml

@@ -3,10 +3,10 @@ conformance_automated = "Pass"
 errors_diff = """
 """
 output = """
-overloads_consistency.py:27:5 - error: Overloaded implementation is not consistent with signature of overload 2
+overloads_consistency.py:28:5 - error: Overloaded implementation is not consistent with signature of overload 2
   Function return type "str" is incompatible with type "int"
     "str" is not assignable to "int" (reportInconsistentOverload)
-overloads_consistency.py:43:5 - error: Overloaded implementation is not consistent with signature of overload 2
+overloads_consistency.py:44:5 - error: Overloaded implementation is not consistent with signature of overload 2
   Type "(x: int) -> (int | str)" is not assignable to type "(x: str) -> str"
     Parameter 1: type "str" is incompatible with type "int"
       "str" is not assignable to "int" (reportInconsistentOverload)

conformance/results/pyre/version.toml

@@ -5,7 +5,9 @@ Allows @final/@override on all overloads and implementation; should be implement
 conformance_automated = "Fail"
 errors_diff = """
 Line 245: Expected 1 errors
-Lines 148, 150: Expected error (tag 'invalid_final_2')
+Line 155: Unexpected errors ['overloads_definitions.py:155:9 - error: @final decorator should be applied only to the implementation (reportInconsistentOverload)']
+Line 247: Unexpected errors ['overloads_definitions.py:247:9 - error: @override decorator should be applied only to the implementation (reportInconsistentOverload)']
+Line 252: Unexpected errors ['overloads_definitions.py:252:9 - error: @override decorator should be applied only to the implementation (reportInconsistentOverload)']
 """
 output = """
 overloads_definitions.py:15:5 - error: "func1" is marked as overload, but additional overloads are missing (reportInconsistentOverload)
@@ -26,7 +28,11 @@ overloads_definitions.py:88:9 - error: Overloaded implementation is not consiste
     Extra parameter "x" (reportInconsistentOverload)
 overloads_definitions.py:93:9 - error: Overloads for "func6" use @classmethod inconsistently (reportInconsistentOverload)
 overloads_definitions.py:97:15 - warning: Instance methods should take a "self" parameter (reportSelfClsParameterName)
-overloads_definitions.py:135:9 - error: Overload for "invalid_final" is marked @final but implementation is not (reportInconsistentOverload)
+overloads_definitions.py:135:9 - error: @final decorator should be applied only to the implementation (reportInconsistentOverload)
+overloads_definitions.py:150:9 - error: @final decorator should be applied only to the implementation (reportInconsistentOverload)
+overloads_definitions.py:155:9 - error: @final decorator should be applied only to the implementation (reportInconsistentOverload)
 overloads_definitions.py:204:9 - error: Method "final_method" cannot override final method defined in class "Base" (reportIncompatibleMethodOverride)
 overloads_definitions.py:220:9 - error: Method "bad_override" is marked as override, but no base method of same name is present (reportGeneralTypeIssues)
+overloads_definitions.py:247:9 - error: @override decorator should be applied only to the implementation (reportInconsistentOverload)
+overloads_definitions.py:252:9 - error: @override decorator should be applied only to the implementation (reportInconsistentOverload)
 """

conformance/results/pyright/overloads_consistency.toml

@@ -6,15 +6,19 @@ Does not enforce @override when correctly used with an overloaded method in a st
 conformance_automated = "Fail"
 errors_diff = """
 Line 168: Expected 1 errors
-Lines 80, 82, 85, 87: Expected error (tag 'invalid_final')
 Lines 96, 98, 101: Expected error (tag 'invalid_final_2')
-Lines 140, 142: Expected error (tag 'bad_override')
+Line 103: Unexpected errors ['overloads_definitions_stub.pyi:103:9 - error: Only the first overload should be marked @final (reportInconsistentOverload)']
+Line 174: Unexpected errors ['overloads_definitions_stub.pyi:174:9 - error: Only the first overload should be marked @override (reportInconsistentOverload)']
 """
 output = """
 overloads_definitions_stub.pyi:14:5 - error: "func1" is marked as overload, but additional overloads are missing (reportInconsistentOverload)
 overloads_definitions_stub.pyi:38:9 - error: Overloads for "func5" use @staticmethod inconsistently (reportInconsistentOverload)
 overloads_definitions_stub.pyi:38:15 - warning: Instance methods should take a "self" parameter (reportSelfClsParameterName)
 overloads_definitions_stub.pyi:48:9 - error: Overloads for "func6" use @classmethod inconsistently (reportInconsistentOverload)
 overloads_definitions_stub.pyi:52:15 - warning: Instance methods should take a "self" parameter (reportSelfClsParameterName)
+overloads_definitions_stub.pyi:87:9 - error: Only the first overload should be marked @final (reportInconsistentOverload)
+overloads_definitions_stub.pyi:103:9 - error: Only the first overload should be marked @final (reportInconsistentOverload)
 overloads_definitions_stub.pyi:133:9 - error: Method "final_method" cannot override final method defined in class "Base" (reportIncompatibleMethodOverride)
+overloads_definitions_stub.pyi:142:9 - error: Method "bad_override" is marked as override, but no base method of same name is present (reportGeneralTypeIssues)
+overloads_definitions_stub.pyi:174:9 - error: Only the first overload should be marked @override (reportInconsistentOverload)
 """

conformance/results/pyright/overloads_definitions.toml

@@ -5,15 +5,8 @@ Does not expand enum arguments to literal variants.
 Does not expand tuple arguments to possible combinations.
 Does not prefer variadic match to indeterminate-length unpacked argument.
 """
-conformance_automated = "Fail"
+conformance_automated = "Pass"
 errors_diff = """
-Line 106: Unexpected errors ['overloads_evaluation.py:106:12 - error: No overloads for "expand_bool" match the provided arguments (reportCallIssue)', 'overloads_evaluation.py:106:24 - error: Argument of type "bool" cannot be assigned to parameter "x" of type "Literal[True]" in function "expand_bool"']
-Line 107: Unexpected errors ['overloads_evaluation.py:107:17 - error: "assert_type" mismatch: expected "Literal[0, 1]" but received "Unknown" (reportAssertTypeFailure)']
-Line 129: Unexpected errors ['overloads_evaluation.py:129:12 - error: No overloads for "expand_enum" match the provided arguments (reportCallIssue)', 'overloads_evaluation.py:129:24 - error: Argument of type "Color" cannot be assigned to parameter "x" of type "Literal[Color.BLUE]" in function "expand_enum"']
-Line 130: Unexpected errors ['overloads_evaluation.py:130:17 - error: "assert_type" mismatch: expected "Literal[0, 1]" but received "Unknown" (reportAssertTypeFailure)']
-Line 169: Unexpected errors ['overloads_evaluation.py:169:12 - error: No overloads for "expand_tuple" match the provided arguments (reportCallIssue)', 'overloads_evaluation.py:169:29 - error: Argument of type "tuple[Literal[1], int | str]" cannot be assigned to parameter "x" of type "tuple[int, str]" in function "expand_tuple"']
-Line 170: Unexpected errors ['overloads_evaluation.py:170:17 - error: "assert_type" mismatch: expected "int | str" but received "Unknown" (reportAssertTypeFailure)']
-Line 196: Unexpected errors ['overloads_evaluation.py:196:17 - error: "assert_type" mismatch: expected "int" but received "str" (reportAssertTypeFailure)']
 """
 output = """
 overloads_evaluation.py:32:1 - error: No overloads for "example1" match the provided arguments
@@ -29,18 +22,4 @@ overloads_evaluation.py:89:14 - error: Argument of type "int | str" cannot be as
 overloads_evaluation.py:89:17 - error: Argument of type "int | str" cannot be assigned to parameter "y" of type "int" in function "example2"
   Type "int | str" is not assignable to type "int"
     "str" is not assignable to "int" (reportArgumentType)
-overloads_evaluation.py:106:12 - error: No overloads for "expand_bool" match the provided arguments (reportCallIssue)
-overloads_evaluation.py:106:24 - error: Argument of type "bool" cannot be assigned to parameter "x" of type "Literal[True]" in function "expand_bool"
-  "bool" is not assignable to type "Literal[True]" (reportArgumentType)
-overloads_evaluation.py:107:17 - error: "assert_type" mismatch: expected "Literal[0, 1]" but received "Unknown" (reportAssertTypeFailure)
-overloads_evaluation.py:129:12 - error: No overloads for "expand_enum" match the provided arguments (reportCallIssue)
-overloads_evaluation.py:129:24 - error: Argument of type "Color" cannot be assigned to parameter "x" of type "Literal[Color.BLUE]" in function "expand_enum"
-  "Color" is not assignable to type "Literal[Color.BLUE]" (reportArgumentType)
-overloads_evaluation.py:130:17 - error: "assert_type" mismatch: expected "Literal[0, 1]" but received "Unknown" (reportAssertTypeFailure)
-overloads_evaluation.py:169:12 - error: No overloads for "expand_tuple" match the provided arguments (reportCallIssue)
-overloads_evaluation.py:169:29 - error: Argument of type "tuple[Literal[1], int | str]" cannot be assigned to parameter "x" of type "tuple[int, str]" in function "expand_tuple"
-  Type "int | str" is not assignable to type "str"
-    "int" is not assignable to "str" (reportArgumentType)
-overloads_evaluation.py:170:17 - error: "assert_type" mismatch: expected "int | str" but received "Unknown" (reportAssertTypeFailure)
-overloads_evaluation.py:196:17 - error: "assert_type" mismatch: expected "int" but received "str" (reportAssertTypeFailure)
 """