Use assert_type with tuples in functions so types cannot be inferred as literals

Author: davidhalter

conformance/results/mypy/generics_typevartuple_args.toml

@@ -3,17 +3,17 @@ notes = """
 Does not enforce that tuples captured by TypeVarTuple are same type.
 """
 output = """
-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]
+generics_typevartuple_args.py:33: error: Argument 3 to "exec_le" has incompatible type "str"; expected "Env"  [arg-type]
+generics_typevartuple_args.py:34: error: Argument 3 to "exec_le" has incompatible type "str"; expected "Env"  [arg-type]
+generics_typevartuple_args.py:48: error: Argument 2 to "func1" has incompatible type "str"; expected "int"  [arg-type]
+generics_typevartuple_args.py:57: error: Argument 2 to "func2" has incompatible type "int"; expected "*tuple[*tuple[str, ...], str]"  [arg-type]
+generics_typevartuple_args.py:58: error: Too few arguments for "func2"  [call-arg]
+generics_typevartuple_args.py:59: error: Too few arguments for "func2"  [call-arg]
+generics_typevartuple_args.py:59: error: Argument 1 to "func2" has incompatible type "str"; expected "int"  [arg-type]
+generics_typevartuple_args.py:67: error: Too few arguments for "func3"  [call-arg]
 """
 conformance_automated = "Fail"
 errors_diff = """
-Line 79: Expected 1 errors
-Line 80: Expected 1 errors
+Line 75: Expected 1 errors
+Line 76: Expected 1 errors
 """

conformance/results/mypy/generics_typevartuple_callable.toml

@@ -1,3 +1,4 @@
+conformant = "Pass"
 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/results/pyrefly/generics_typevartuple_args.toml

@@ -3,13 +3,13 @@ conformance_automated = "Pass"
 errors_diff = """
 """
 output = """
-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]
+ERROR generics_typevartuple_args.py:33:12-23: 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:34:12-34: 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:48: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:57: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:58: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:59: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:67: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:75: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:76:13-19: Argument `tuple[Literal['1']]` is not assignable to parameter `*args` with type `tuple[int]` in function `func4` [bad-argument-type]
 """

conformance/results/pyright/generics_typevartuple_args.toml

@@ -1,20 +1,20 @@
 conformant = "Pass"
 output = """
-generics_typevartuple_args.py:37:16 - error: Argument of type "Literal['']" cannot be assigned to parameter of type "Env" in function "exec_le"
+generics_typevartuple_args.py:33:20 - 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:38:16 - error: Argument of type "Literal['']" cannot be assigned to parameter of type "Env" in function "exec_le"
+generics_typevartuple_args.py:34:20 - 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:52:10 - error: Argument of type "Literal['2']" cannot be assigned to parameter of type "int" in function "func1"
+generics_typevartuple_args.py:48: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:61:10 - error: Argument of type "Literal[1]" cannot be assigned to parameter of type "str" in function "func2"
+generics_typevartuple_args.py:57: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: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"
+generics_typevartuple_args.py:58:1 - error: Argument missing for parameter "args[2]" (reportCallIssue)
+generics_typevartuple_args.py:59:1 - error: Argument missing for parameter "args[2]" (reportCallIssue)
+generics_typevartuple_args.py:67:1 - error: Argument missing for parameter "args[1]" (reportCallIssue)
+generics_typevartuple_args.py:75: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:80: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:76: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/zuban/generics_typevartuple_args.toml

@@ -2,14 +2,14 @@ conformance_automated = "Pass"
 errors_diff = """
 """
 output = """
-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]
+generics_typevartuple_args.py:33: error: Argument 3 to "exec_le" has incompatible type "str"; expected "Env"  [arg-type]
+generics_typevartuple_args.py:34: error: Argument 3 to "exec_le" has incompatible type "str"; expected "Env"  [arg-type]
+generics_typevartuple_args.py:48: error: Argument 2 to "func1" has incompatible type "str"; expected "int"  [arg-type]
+generics_typevartuple_args.py:57: error: Argument 2 to "func2" has incompatible type "int"; expected "str"  [arg-type]
+generics_typevartuple_args.py:58: error: Too few arguments for "func2"  [call-arg]
+generics_typevartuple_args.py:59: error: Too few arguments for "func2"  [call-arg]
+generics_typevartuple_args.py:59: error: Argument 1 to "func2" has incompatible type "str"; expected "int"  [arg-type]
+generics_typevartuple_args.py:67: error: Too few arguments for "func3"  [call-arg]
+generics_typevartuple_args.py:75: error: Argument 2 to "func4" has incompatible type "tuple[Literal[1], int]"; expected "tuple[int]"  [arg-type]
+generics_typevartuple_args.py:76: error: Argument 2 to "func4" has incompatible type "tuple[Literal['1']]"; expected "tuple[int]"  [arg-type]
 """

conformance/tests/generics_typevartuple_args.py

@@ -7,7 +7,7 @@
 # > If *args is annotated as a type variable tuple, the types of the individual
 # > arguments become the types in the type variable tuple.
 
-from typing import TypeVarTuple, assert_type, Literal
+from typing import TypeVarTuple, assert_type
 
 
 Ts = TypeVarTuple("Ts")
@@ -17,13 +17,6 @@ def args_to_tuple(*args: *Ts) -> tuple[*Ts]:
     raise NotImplementedError
 
 
-def takes_int_and_str(tup: tuple[int, str]) -> None:
-    raise NotImplementedError
-
-
-takes_int_and_str(args_to_tuple(1, "a"))
-
-
 class Env:
     ...
 
@@ -32,10 +25,13 @@ def exec_le(path: str, *args: * tuple[*Ts, Env], env: Env | None = None) -> tupl
     raise NotImplementedError
 
 
-assert_type(exec_le("", Env()), tuple[()])  # OK
-takes_int_and_str(exec_le("", 0, "", Env()))
-exec_le("", 0, "")  # E
-exec_le("", 0, "", env=Env())  # E
+def has_int_and_str(x: int, y: str):
+    assert_type(args_to_tuple(x, y), tuple[int, str])
+
+    assert_type(exec_le("", Env()), tuple[()])  # OK
+    assert_type(exec_le(y, x, y, Env()), tuple[int, str])  # OK
+    exec_le("", 0, "")  # E
+    exec_le("", 0, "", env=Env())  # E
 
 
 # > Using an unpacked unbounded tuple is equivalent to the

conformance/tests/generics_typevartuple_callable.py

@@ -7,7 +7,7 @@
 # > Type variable tuples can also be used in the arguments section of a Callable.
 
 
-from typing import Callable, TypeVar, TypeVarTuple, assert_type, Literal
+from typing import Callable, TypeVar, TypeVarTuple, assert_type
 
 Ts = TypeVarTuple("Ts")
 T = TypeVar("T")
@@ -46,8 +46,5 @@ def func3(*args: * tuple[int, *Ts, T]) -> tuple[T, *Ts]:
     raise NotImplementedError
 
 
-def takes_float_str_complex(tup: tuple[float, str, complex]) -> None:
-    raise NotImplementedError
-
-
-takes_float_str_complex(func3(1, "", 3j, 3.4))
+def has_int_and_str(x: int, y: str):
+    assert_type(func3(x, y, 3j, 3.4), tuple[float, str, complex])