Address CI failures

Author: A5rocks

mypyc/test-data/run-singledispatch.test

@@ -347,11 +347,6 @@ def verify_typeinfo(stub: TypeInfo, a: MaybeMissing[Type[Any]], b: List[str]) ->
     yield Error('in TypeInfo')
     yield Error('hello')
 
-@verify.register(TypeVarExpr)
-def verify_typevarexpr(stub: TypeVarExpr, a: MaybeMissing[Any], b: List[str]) -> Iterator[Error]:
-    if False:
-        yield None
-
 def verify_list(stub, a, b) -> List[str]:
     """Helper function that converts iterator of errors to list of messages"""
     return list(err.msg for err in verify(stub, a, b))
@@ -361,7 +356,6 @@ def test_verify() -> None:
     assert verify_list(MypyFile(), MISSING, ['a', 'b']) == ["shouldn't be missing"]
     assert verify_list(MypyFile(), 5, ['a', 'b']) == ['in TypeInfo', 'hello']
     assert verify_list(TypeInfo(), str, ['a', 'b']) == ['in TypeInfo', 'hello']
-    assert verify_list(TypeVarExpr(), 'a', ['x', 'y']) == []
 
 
 [case testArgsInRegisteredImplNamedDifferentlyFromMainFunction]

test-data/unit/daemon.test

@@ -463,8 +463,7 @@ $ dmypy inspect foo.py:1:2:3:4
 Can't find expression at span 1:2:3:4
 == Return code: 1
 $ dmypy inspect foo.py:17:5:17:5
-No known type available for "NameExpr" (maybe unreachable or try --force-reload)
-== Return code: 1
+"int"
 
 [file foo.py]
 from typing import Optional
@@ -523,9 +522,8 @@ $ dmypy inspect foo.py:1:2
 Can't find any expressions at position 1:2
 == Return code: 1
 $ dmypy inspect foo.py:11:5 --force-reload
-No known type available for "NameExpr" (maybe unreachable)
-No known type available for "OpExpr" (maybe unreachable)
-== Return code: 1
+"int"
+"int"
 
 [file foo.py]
 from typing import Optional
@@ -547,8 +545,7 @@ $ dmypy check foo.py bar.py --export-types
 $ dmypy inspect foo.py:9:1 --show attrs --include-span --include-kind -vv
 NameExpr:9:1:9:1 -> {"foo.C": ["a", "x", "y"], "foo.B": ["a", "b"]}
 $ dmypy inspect foo.py:11:10 --show attrs
-No known type available for "StrExpr" (maybe unreachable or try --force-reload)
-== Return code: 1
+{"str": ["__add__", "__contains__", "__eq__", "__ge__", "__getitem__", "__getnewargs__", "__gt__", "__hash__", "__iter__", "__le__", "__len__", "__lt__", "__mod__", "__mul__", "__ne__", "__new__", "__rmul__", "capitalize", "casefold", "center", "count", "encode", "endswith", "expandtabs", "find", "format", "format_map", "index", "isalnum", "isalpha", "isascii", "isdecimal", "isdigit", "isidentifier", "islower", "isnumeric", "isprintable", "isspace", "istitle", "isupper", "join", "ljust", "lower", "lstrip", "maketrans", "partition", "removeprefix", "removesuffix", "replace", "rfind", "rindex", "rjust", "rpartition", "rsplit", "rstrip", "split", "splitlines", "startswith", "strip", "swapcase", "title", "translate", "upper", "zfill"], "Sequence": ["__contains__", "__getitem__", "__iter__", "__reversed__", "count", "index"], "Reversible": ["__reversed__"], "Collection": ["__len__"], "Iterable": ["__iter__"], "Container": ["__contains__"]}
 $ dmypy inspect foo.py:1:1 --show attrs
 Can't find any expressions at position 1:1
 == Return code: 1

test-data/unit/pythoneval.test

@@ -1481,8 +1481,10 @@ if isinstance(x, int):
 [out]
 _testIsInstanceAdHocIntersectionWithStrAndBytes.py:3: error: Subclass of "str" and "bytes" cannot exist: would have incompatible method signatures
 _testIsInstanceAdHocIntersectionWithStrAndBytes.py:4: error: Statement is unreachable
+_testIsInstanceAdHocIntersectionWithStrAndBytes.py:4: note: Revealed type is "Never"
 _testIsInstanceAdHocIntersectionWithStrAndBytes.py:6: error: Subclass of "str" and "int" cannot exist: would have incompatible method signatures
 _testIsInstanceAdHocIntersectionWithStrAndBytes.py:7: error: Statement is unreachable
+_testIsInstanceAdHocIntersectionWithStrAndBytes.py:7: note: Revealed type is "Never"
 
 [case testAsyncioFutureWait]
 # mypy: strict-optional
@@ -1553,6 +1555,7 @@ if isinstance(obj, Awaitable):
 [out]
 _testSpecialTypingProtocols.py:6: note: Revealed type is "Tuple[builtins.int]"
 _testSpecialTypingProtocols.py:8: error: Statement is unreachable
+_testSpecialTypingProtocols.py:8: note: Revealed type is "Never"
 
 [case testTypeshedRecursiveTypesExample]
 from typing import List, Union

test-data/unit/reports.test

@@ -235,7 +235,8 @@ def bar(x):
 <span class="line-any" title="Any Types on this line:
 Explicit (x1)">    any_f(x)</span>
 <span class="line-precise" title="No Anys on this line!">    assert False</span>
-<span class="line-unanalyzed" title="No Anys on this line!">    any_f(x)</span>
+<span class="line-any" title="Any Types on this line:
+Explicit (x1)">    any_f(x)</span>
 </pre></td>
 </tr></tbody>
 </table>
@@ -296,10 +297,10 @@ def bar(x):
 [outfile report/any-exprs.txt]
  Name   Anys   Exprs   Coverage
 ---------------------------------
-    i      1       6     83.33%
+    i      0       8    100.00%
     j      0       5    100.00%
 ---------------------------------
-Total      1      11     90.91%
+Total      0      13    100.00%
 
 [case testAnyExprReportHigherKindedTypesAreNotAny]
 # cmd: mypy --any-exprs-report report i.py