Revert "Use meets in pre_validate_solutions?"

This reverts commit 2e83a0c.

Author: sterliakov

mypy/solve.py

@@ -576,13 +576,16 @@ def pre_validate_solutions(
             new_solutions.append(s)
             continue
         if s is not None and not is_subtype(s, t.upper_bound):
-            bound = t.upper_bound
+            bound_satisfies_all = True
             for c in constraints:
-                bound = meet_types(bound, c.target)
-                if isinstance(bound, UninhabitedType):
+                if c.op == SUBTYPE_OF and not is_subtype(t.upper_bound, c.target):
+                    bound_satisfies_all = False
                     break
-            else:
-                new_solutions.append(bound)
+                if c.op == SUPERTYPE_OF and not is_subtype(c.target, t.upper_bound):
+                    bound_satisfies_all = False
+                    break
+            if bound_satisfies_all:
+                new_solutions.append(t.upper_bound)
                 continue
         new_solutions.append(s)
     return new_solutions

test-data/unit/check-dataclasses.test

@@ -2122,7 +2122,7 @@ TA = TypeVar('TA', bound=A)
 TB = TypeVar('TB', bound=B)
 
 def f(b_or_t: Union[TA, TB, int]) -> None:
-    a2 = replace(b_or_t)   # E: Argument 1 to "replace" has incompatible type "Union[TA, TB, int]"; expected "TA"
+    a2 = replace(b_or_t)   # E: Value of type variable "_DataclassT" of "replace" cannot be "Union[TA, TB, int]"
 
 [builtins fixtures/tuple.pyi]
 
@@ -2202,9 +2202,9 @@ replace(None)  # E: Value of type variable "_DataclassT" of "replace" cannot be
 from dataclasses import is_dataclass, replace
 
 def f(x: object) -> None:
-  _ = replace(x)  # E: Argument 1 to "replace" has incompatible type "object"; expected "DataclassInstance"
+  _ = replace(x)  # E: Value of type variable "_DataclassT" of "replace" cannot be "object"
   if is_dataclass(x):
-    _ = replace(x)  # E: Argument 1 to "replace" has incompatible type "Union[DataclassInstance, type[DataclassInstance]]"; expected "DataclassInstance"
+    _ = replace(x)  # E: Value of type variable "_DataclassT" of "replace" cannot be "Union[DataclassInstance, type[DataclassInstance]]"
     if not isinstance(x, type):
       _ = replace(x)
 

test-data/unit/check-literal.test

@@ -1662,21 +1662,6 @@ reveal_type(func2(b))   # N: Revealed type is "Literal[4]"
 reveal_type(func2(c))   # N: Revealed type is "builtins.int"
 [builtins fixtures/tuple.pyi]
 [out]
-main:13: error: Value of type variable "TLiteral" of "func1" cannot be "TInt"
-main:20: note: Revealed type is "def [TLiteral <: Literal[3]] (x: TLiteral`-1) -> TLiteral`-1"
-main:22: note: Revealed type is "Literal[3]"
-main:23: note: Revealed type is "Literal[3]"
-main:24: error: Value of type variable "TLiteral" of "func1" cannot be "Literal[4]"
-main:24: note: Revealed type is "Literal[4]"
-main:25: error: Value of type variable "TLiteral" of "func1" cannot be "Literal[4]"
-main:25: note: Revealed type is "Literal[4]"
-main:26: note: Revealed type is "Literal[3]"
-main:26: error: Argument 1 to "func1" has incompatible type "int"; expected "Literal[3]"
-main:28: note: Revealed type is "builtins.int"
-main:29: note: Revealed type is "Literal[3]"
-main:30: note: Revealed type is "builtins.int"
-main:31: note: Revealed type is "Literal[4]"
-main:32: note: Revealed type is "builtins.int"
 
 [case testLiteralAndGenericsRespectsValueRestriction]
 from typing import Literal, TypeVar

test-data/unit/check-namedtuple.test

@@ -1362,7 +1362,7 @@ class NT(NamedTuple, Generic[T]):
             return self._replace()
 
 class SNT(NT[int]): ...
-reveal_type(SNT("test", 42).meth())  # N: Revealed type is "tuple[builtins.str, Never, fallback=__main__.SNT]"
+reveal_type(SNT("test", 42).meth())  # N: Revealed type is "tuple[builtins.str, builtins.int, fallback=__main__.SNT]"
 [builtins fixtures/tuple.pyi]
 [typing fixtures/typing-namedtuple.pyi]
 

test-data/unit/check-overloading.test

@@ -1335,14 +1335,6 @@ def g(x: U, y: V) -> None:
     f([x, y]) # E: Value of type variable "T" of "f" cannot be "object"
 [builtins fixtures/list.pyi]
 [out]
-tmp/foo.pyi:12: error: "mystr" not callable
-tmp/foo.pyi:13: error: No overload variant of "f" matches argument type "V"
-tmp/foo.pyi:13: note: Possible overload variants:
-tmp/foo.pyi:13: note:     def [T: str] f(x: T) -> T
-tmp/foo.pyi:13: note:     def [T: str] f(x: list[T]) -> None
-tmp/foo.pyi:15: note: Revealed type is "None"
-tmp/foo.pyi:16: error: Value of type variable "T" of "f" cannot be "V"
-tmp/foo.pyi:17: error: List item 1 has incompatible type "V"; expected "str"
 
 [case testOverloadOverlapWithTypeVars]
 from foo import *