variant

hauntsaninja · hauntsaninja · commit d11ee1d1e288 · 2025-01-01T16:42:21.000-08:00
diff --git a/mypy/join.py b/mypy/join.py
@@ -415,7 +415,7 @@ def visit_callable_type(self, t: CallableType) -> ProperType:
                     return join_types(t.fallback, self.s)
             else:
                 s, t = self.s, t
-                if s.min_args < t.min_args:
+                if t.is_var_arg:
                     s, t = t, s
                 if is_subtype(self.s, t):
                     result = t.copy_modified()
diff --git a/test-data/unit/check-functions.test b/test-data/unit/check-functions.test
@@ -3503,8 +3503,8 @@ fdict = {
     "f_any": f_any,
     "f_3": f_3,
 }
-reveal_type(fdict)  # N: Revealed type is "builtins.dict[builtins.str, def (*_: Any, **__: Any) -> Any]"
+reveal_type(fdict)  # N: Revealed type is "builtins.dict[builtins.str, def (common: Any, a: Any =) -> Any]"
 
-reveal_type(join(f_1, f_any, f_3))  # N: Revealed type is "def (*_: Any, **__: Any) -> Any"
+reveal_type(join(f_1, f_any, f_3))  # N: Revealed type is "def (common: Any, a: Any =) -> Any"
 
 [builtins fixtures/tuple.pyi]

Original file line number	Diff line number	Diff line change
`@@ -3503,8 +3503,8 @@ fdict = {`
`3503`	`3503`	`"f_any": f_any,`
`3504`	`3504`	`"f_3": f_3,`
`3505`	`3505`	`}`
`3506`		`-reveal_type(fdict) # N: Revealed type is "builtins.dict[builtins.str, def (_: Any, *__: Any) -> Any]"`
	`3506`	`+reveal_type(fdict) # N: Revealed type is "builtins.dict[builtins.str, def (common: Any, a: Any =) -> Any]"`
`3507`	`3507`
`3508`		`-reveal_type(join(f_1, f_any, f_3)) # N: Revealed type is "def (_: Any, *__: Any) -> Any"`
	`3508`	`+reveal_type(join(f_1, f_any, f_3)) # N: Revealed type is "def (common: Any, a: Any =) -> Any"`
`3509`	`3509`
`3510`	`3510`	`[builtins fixtures/tuple.pyi]`