Use custom functions for expecting tuples, this avoids the need for multiple assert_types depending on different type inference

Author: davidhalter

conformance/results/mypy/generics_typevartuple_args.toml

@@ -3,19 +3,17 @@ notes = """
 Does not enforce that tuples captured by TypeVarTuple are same type.
 """
 output = """
-generics_typevartuple_args.py:35: error: Argument 3 to "exec_le" has incompatible type "str"; expected "Env"  [arg-type]
-generics_typevartuple_args.py:36: error: Argument 3 to "exec_le" has incompatible type "str"; expected "Env"  [arg-type]
-generics_typevartuple_args.py:50: error: Argument 2 to "func1" has incompatible type "str"; expected "int"  [arg-type]
-generics_typevartuple_args.py:59: error: Argument 2 to "func2" has incompatible type "int"; expected "*tuple[*tuple[str, ...], str]"  [arg-type]
-generics_typevartuple_args.py:60: error: Too few arguments for "func2"  [call-arg]
-generics_typevartuple_args.py:61: error: Too few arguments for "func2"  [call-arg]
-generics_typevartuple_args.py:61: error: Argument 1 to "func2" has incompatible type "str"; expected "int"  [arg-type]
-generics_typevartuple_args.py:69: error: Too few arguments for "func3"  [call-arg]
+generics_typevartuple_args.py:37: error: Argument 3 to "exec_le" has incompatible type "str"; expected "Env"  [arg-type]
+generics_typevartuple_args.py:38: error: Argument 3 to "exec_le" has incompatible type "str"; expected "Env"  [arg-type]
+generics_typevartuple_args.py:52: error: Argument 2 to "func1" has incompatible type "str"; expected "int"  [arg-type]
+generics_typevartuple_args.py:61: error: Argument 2 to "func2" has incompatible type "int"; expected "*tuple[*tuple[str, ...], str]"  [arg-type]
+generics_typevartuple_args.py:62: error: Too few arguments for "func2"  [call-arg]
+generics_typevartuple_args.py:63: error: Too few arguments for "func2"  [call-arg]
+generics_typevartuple_args.py:63: error: Argument 1 to "func2" has incompatible type "str"; expected "int"  [arg-type]
+generics_typevartuple_args.py:71: error: Too few arguments for "func3"  [call-arg]
 """
 conformance_automated = "Fail"
 errors_diff = """
-Line 77: Expected 1 errors
-Line 78: Expected 1 errors
-Lines 20, 21: Expected error (tag 'args_to_tuple')
-Lines 33, 34: Expected error (tag 'exec_le')
+Line 79: Expected 1 errors
+Line 80: Expected 1 errors
 """

conformance/results/mypy/generics_typevartuple_callable.toml

@@ -1,9 +1,6 @@
-conformant = "Partial"
-notes = "Does use assert_type in two different ways"
 output = """
 generics_typevartuple_callable.py:26: error: Argument "target" to "Process" has incompatible type "Callable[[int, str], None]"; expected "Callable[[str, int], None]"  [arg-type]
 """
-conformance_automated = "Fail"
+conformance_automated = "Pass"
 errors_diff = """
-Lines 49, 50: Expected error (tag 'fun3')
 """

conformance/results/pyrefly/generics_typevartuple_args.toml

@@ -3,15 +3,13 @@ conformance_automated = "Pass"
 errors_diff = """
 """
 output = """
-ERROR generics_typevartuple_args.py:21:12-68: assert_type(tuple[int, str], tuple[Literal[1], Literal['a']]) failed [assert-type]
-ERROR generics_typevartuple_args.py:34:12-71: assert_type(tuple[int, str], tuple[Literal[0], Literal['']]) failed [assert-type]
-ERROR generics_typevartuple_args.py:35:8-19: Unpacked argument `tuple[Literal[0], Literal['']]` is not assignable to parameter `*args` with type `tuple[*@_, Env]` in function `exec_le` [bad-argument-type]
-ERROR generics_typevartuple_args.py:36:8-30: Unpacked argument `tuple[Literal[0], Literal['']]` is not assignable to parameter `*args` with type `tuple[*@_, Env]` in function `exec_le` [bad-argument-type]
-ERROR generics_typevartuple_args.py:50:6-17: Unpacked argument `tuple[Literal[1], Literal['2'], Literal[3]]` is not assignable to parameter `*args` with type `tuple[int, ...]` in function `func1` [bad-argument-type]
-ERROR generics_typevartuple_args.py:59:6-16: Unpacked argument `tuple[Literal[1], Literal[1], Literal['']]` is not assignable to parameter `*args` with type `tuple[int, *tuple[str, ...], str]` in function `func2` [bad-argument-type]
-ERROR generics_typevartuple_args.py:60:6-9: Unpacked argument `tuple[Literal[1]]` is not assignable to parameter `*args` with type `tuple[int, *tuple[str, ...], str]` in function `func2` [bad-argument-type]
-ERROR generics_typevartuple_args.py:61:6-10: Unpacked argument `tuple[Literal['']]` is not assignable to parameter `*args` with type `tuple[int, *tuple[str, ...], str]` in function `func2` [bad-argument-type]
-ERROR generics_typevartuple_args.py:69:6-9: Unpacked argument `tuple[Literal[1]]` is not assignable to parameter `*args` with type `tuple[int, str]` in function `func3` [bad-argument-type]
-ERROR generics_typevartuple_args.py:77:13-19: Argument `tuple[Literal[1], Literal[2]]` is not assignable to parameter `*args` with type `tuple[int]` in function `func4` [bad-argument-type]
-ERROR generics_typevartuple_args.py:78:13-19: Argument `tuple[Literal['1']]` is not assignable to parameter `*args` with type `tuple[int]` in function `func4` [bad-argument-type]
+ERROR generics_typevartuple_args.py:37:8-19: Unpacked argument `tuple[Literal[0], Literal['']]` is not assignable to parameter `*args` with type `tuple[*@_, Env]` in function `exec_le` [bad-argument-type]
+ERROR generics_typevartuple_args.py:38:8-30: Unpacked argument `tuple[Literal[0], Literal['']]` is not assignable to parameter `*args` with type `tuple[*@_, Env]` in function `exec_le` [bad-argument-type]
+ERROR generics_typevartuple_args.py:52:6-17: Unpacked argument `tuple[Literal[1], Literal['2'], Literal[3]]` is not assignable to parameter `*args` with type `tuple[int, ...]` in function `func1` [bad-argument-type]
+ERROR generics_typevartuple_args.py:61:6-16: Unpacked argument `tuple[Literal[1], Literal[1], Literal['']]` is not assignable to parameter `*args` with type `tuple[int, *tuple[str, ...], str]` in function `func2` [bad-argument-type]
+ERROR generics_typevartuple_args.py:62:6-9: Unpacked argument `tuple[Literal[1]]` is not assignable to parameter `*args` with type `tuple[int, *tuple[str, ...], str]` in function `func2` [bad-argument-type]
+ERROR generics_typevartuple_args.py:63:6-10: Unpacked argument `tuple[Literal['']]` is not assignable to parameter `*args` with type `tuple[int, *tuple[str, ...], str]` in function `func2` [bad-argument-type]
+ERROR generics_typevartuple_args.py:71:6-9: Unpacked argument `tuple[Literal[1]]` is not assignable to parameter `*args` with type `tuple[int, str]` in function `func3` [bad-argument-type]
+ERROR generics_typevartuple_args.py:79:13-19: Argument `tuple[Literal[1], Literal[2]]` is not assignable to parameter `*args` with type `tuple[int]` in function `func4` [bad-argument-type]
+ERROR generics_typevartuple_args.py:80:13-19: Argument `tuple[Literal['1']]` is not assignable to parameter `*args` with type `tuple[int]` in function `func4` [bad-argument-type]
 """

conformance/results/pyrefly/generics_typevartuple_callable.toml

@@ -4,5 +4,4 @@ errors_diff = """
 """
 output = """
 ERROR generics_typevartuple_callable.py:26:28-35: Argument `tuple[Literal[''], Literal[0]]` is not assignable to parameter `args` with type `tuple[int, str]` in function `Process.__init__` [bad-argument-type]
-ERROR generics_typevartuple_callable.py:50:12-71: assert_type(tuple[float, str, complex], tuple[float, Literal[''], complex]) failed [assert-type]
 """

conformance/results/pyright/generics_typevartuple_args.toml

@@ -1,22 +1,20 @@
 conformant = "Pass"
 output = """
-generics_typevartuple_args.py:21:13 - error: "assert_type" mismatch: expected "tuple[Literal[1], Literal['a']]" but received "tuple[int, str]" (reportAssertTypeFailure)
-generics_typevartuple_args.py:34:13 - error: "assert_type" mismatch: expected "tuple[Literal[0], Literal['']]" but received "tuple[int, str]" (reportAssertTypeFailure)
-generics_typevartuple_args.py:35:16 - error: Argument of type "Literal['']" cannot be assigned to parameter of type "Env" in function "exec_le"
+generics_typevartuple_args.py:37:16 - error: Argument of type "Literal['']" cannot be assigned to parameter of type "Env" in function "exec_le"
   "Literal['']" is not assignable to "Env" (reportArgumentType)
-generics_typevartuple_args.py:36:16 - error: Argument of type "Literal['']" cannot be assigned to parameter of type "Env" in function "exec_le"
+generics_typevartuple_args.py:38:16 - error: Argument of type "Literal['']" cannot be assigned to parameter of type "Env" in function "exec_le"
   "Literal['']" is not assignable to "Env" (reportArgumentType)
-generics_typevartuple_args.py:50:10 - error: Argument of type "Literal['2']" cannot be assigned to parameter of type "int" in function "func1"
+generics_typevartuple_args.py:52:10 - error: Argument of type "Literal['2']" cannot be assigned to parameter of type "int" in function "func1"
   "Literal['2']" is not assignable to "int" (reportArgumentType)
-generics_typevartuple_args.py:59:10 - error: Argument of type "Literal[1]" cannot be assigned to parameter of type "str" in function "func2"
+generics_typevartuple_args.py:61:10 - error: Argument of type "Literal[1]" cannot be assigned to parameter of type "str" in function "func2"
   "Literal[1]" is not assignable to "str" (reportArgumentType)
-generics_typevartuple_args.py:60:1 - error: Argument missing for parameter "args[2]" (reportCallIssue)
-generics_typevartuple_args.py:61:1 - error: Argument missing for parameter "args[2]" (reportCallIssue)
-generics_typevartuple_args.py:69:1 - error: Argument missing for parameter "args[1]" (reportCallIssue)
-generics_typevartuple_args.py:77:13 - error: Argument of type "tuple[Literal[1], Literal[2]]" cannot be assigned to parameter "args" of type "tuple[*Ts@func4]" in function "func4"
+generics_typevartuple_args.py:62:1 - error: Argument missing for parameter "args[2]" (reportCallIssue)
+generics_typevartuple_args.py:63:1 - error: Argument missing for parameter "args[2]" (reportCallIssue)
+generics_typevartuple_args.py:71:1 - error: Argument missing for parameter "args[1]" (reportCallIssue)
+generics_typevartuple_args.py:79:13 - error: Argument of type "tuple[Literal[1], Literal[2]]" cannot be assigned to parameter "args" of type "tuple[*Ts@func4]" in function "func4"
   "tuple[Literal[1], Literal[2]]" is not assignable to "tuple[int]"
     Tuple size mismatch; expected 1 but received 2 (reportArgumentType)
-generics_typevartuple_args.py:78:14 - error: Argument of type "tuple[Literal['1']]" cannot be assigned to parameter "args" of type "tuple[*Ts@func4]" in function "func4"
+generics_typevartuple_args.py:80:14 - error: Argument of type "tuple[Literal['1']]" cannot be assigned to parameter "args" of type "tuple[*Ts@func4]" in function "func4"
   "Literal['1']" is not assignable to "int" (reportArgumentType)
 """
 conformance_automated = "Pass"

conformance/results/pyright/generics_typevartuple_callable.toml

@@ -3,7 +3,6 @@ output = """
 generics_typevartuple_callable.py:26:28 - error: Argument of type "tuple[Literal[''], Literal[0]]" cannot be assigned to parameter "args" of type "tuple[*Ts@__init__]" in function "__init__"
   "Literal['']" is not assignable to "int"
   "Literal[0]" is not assignable to "str" (reportArgumentType)
-generics_typevartuple_callable.py:50:13 - error: "assert_type" mismatch: expected "tuple[float, Literal[''], complex]" but received "tuple[float, str, complex]" (reportAssertTypeFailure)
 """
 conformance_automated = "Pass"
 errors_diff = """

conformance/results/results.html

@@ -383,7 +383,7 @@ <h3>Python Type System Conformance Test Results</h3>
 <th class="column col2 partially-conformant"><div class="hover-text">Partial<span class="tooltip-text" id="bottom"><p>TypeVarTuple is pinned too early when calling generic function</p></span></div></th>
 </tr>
 <tr><th class="column col1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;generics_typevartuple_callable</th>
-<th class="column col2 partially-conformant"><div class="hover-text">Partial<span class="tooltip-text" id="bottom"><p>Does use assert_type in two different ways</p></span></div></th>
+<th class="column col2 conformant">Pass</th>
 <th class="column col2 conformant">Pass</th>
 <th class="column col2 conformant">Pass</th>
 <th class="column col2 conformant">Pass</th>

conformance/results/zuban/generics_typevartuple_args.toml

@@ -2,16 +2,14 @@ conformance_automated = "Pass"
 errors_diff = """
 """
 output = """
-generics_typevartuple_args.py:20: error: Expression is of type "tuple[Literal[1], Literal['a']]", not "tuple[int, str]"  [misc]
-generics_typevartuple_args.py:33: error: Expression is of type "tuple[Literal[0], Literal['']]", not "tuple[int, str]"  [misc]
-generics_typevartuple_args.py:35: error: Argument 3 to "exec_le" has incompatible type "str"; expected "Env"  [arg-type]
-generics_typevartuple_args.py:36: error: Argument 3 to "exec_le" has incompatible type "str"; expected "Env"  [arg-type]
-generics_typevartuple_args.py:50: error: Argument 2 to "func1" has incompatible type "str"; expected "int"  [arg-type]
-generics_typevartuple_args.py:59: error: Argument 2 to "func2" has incompatible type "int"; expected "str"  [arg-type]
-generics_typevartuple_args.py:60: error: Too few arguments for "func2"  [call-arg]
-generics_typevartuple_args.py:61: error: Too few arguments for "func2"  [call-arg]
-generics_typevartuple_args.py:61: error: Argument 1 to "func2" has incompatible type "str"; expected "int"  [arg-type]
-generics_typevartuple_args.py:69: error: Too few arguments for "func3"  [call-arg]
-generics_typevartuple_args.py:77: error: Argument 2 to "func4" has incompatible type "tuple[Literal[1], int]"; expected "tuple[int]"  [arg-type]
-generics_typevartuple_args.py:78: error: Argument 2 to "func4" has incompatible type "tuple[Literal['1']]"; expected "tuple[int]"  [arg-type]
+generics_typevartuple_args.py:37: error: Argument 3 to "exec_le" has incompatible type "str"; expected "Env"  [arg-type]
+generics_typevartuple_args.py:38: error: Argument 3 to "exec_le" has incompatible type "str"; expected "Env"  [arg-type]
+generics_typevartuple_args.py:52: error: Argument 2 to "func1" has incompatible type "str"; expected "int"  [arg-type]
+generics_typevartuple_args.py:61: error: Argument 2 to "func2" has incompatible type "int"; expected "str"  [arg-type]
+generics_typevartuple_args.py:62: error: Too few arguments for "func2"  [call-arg]
+generics_typevartuple_args.py:63: error: Too few arguments for "func2"  [call-arg]
+generics_typevartuple_args.py:63: error: Argument 1 to "func2" has incompatible type "str"; expected "int"  [arg-type]
+generics_typevartuple_args.py:71: error: Too few arguments for "func3"  [call-arg]
+generics_typevartuple_args.py:79: error: Argument 2 to "func4" has incompatible type "tuple[Literal[1], int]"; expected "tuple[int]"  [arg-type]
+generics_typevartuple_args.py:80: error: Argument 2 to "func4" has incompatible type "tuple[Literal['1']]"; expected "tuple[int]"  [arg-type]
 """

conformance/results/zuban/generics_typevartuple_callable.toml

@@ -3,5 +3,4 @@ errors_diff = """
 """
 output = """
 generics_typevartuple_callable.py:26: error: Argument "args" to "Process" has incompatible type "tuple[str, int]"; expected "tuple[int, str]"  [arg-type]
-generics_typevartuple_callable.py:49: error: Expression is of type "tuple[float, Literal[''], complex]", not "tuple[float, str, complex]"  [misc]
 """

conformance/tests/generics_typevartuple_args.py

@@ -17,8 +17,11 @@ def args_to_tuple(*args: *Ts) -> tuple[*Ts]:
     raise NotImplementedError
 
 
-assert_type(args_to_tuple(1, "a"), tuple[int, str])  # E[args_to_tuple]
-assert_type(args_to_tuple(1, "a"), tuple[Literal[1], Literal["a"]])  # E[args_to_tuple]
+def takes_int_and_str(tup: tuple[int, str]) -> None:
+    raise NotImplementedError
+
+
+takes_int_and_str(args_to_tuple(1, "a"))
 
 
 class Env:
@@ -30,8 +33,7 @@ def exec_le(path: str, *args: * tuple[*Ts, Env], env: Env | None = None) -> tupl
 
 
 assert_type(exec_le("", Env()), tuple[()])  # OK
-assert_type(exec_le("", 0, "", Env()), tuple[int, str])  # E[exec_le]
-assert_type(exec_le("", 0, "", Env()), tuple[Literal[0], Literal['']])  # E[exec_le]
+takes_int_and_str(exec_le("", 0, "", Env()))
 exec_le("", 0, "")  # E
 exec_le("", 0, "", env=Env())  # E