From b31c21116d54eb59e771f2840936810b4b60bdf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Clint=20Air=C3=A9?=
 <111376518+clintaire@users.noreply.github.com>
Date: Mon, 16 Sep 2024 00:32:54 +0100
Subject: [PATCH] Staging unstaged changes before pull

---
 mypy/test/teststubgen.py  | 16 ++++++++--------
 mypy/test/testtypes.py    |  2 +-
 mypyc/irbuild/classdef.py |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/mypy/test/teststubgen.py b/mypy/test/teststubgen.py
index e3e20fee73d5..e65a16c8f395 100644
--- a/mypy/test/teststubgen.py
+++ b/mypy/test/teststubgen.py
@@ -587,10 +587,10 @@ def test_common_dir_prefix_unix(self) -> None:
         assert common_dir_prefix(["foo/bar/x.pyi", "foo/bar/y.pyi"]) == "foo/bar"
         assert common_dir_prefix(["foo/bar/x.pyi", "foo/y.pyi"]) == "foo"
         assert common_dir_prefix(["foo/x.pyi", "foo/bar/y.pyi"]) == "foo"
-        assert common_dir_prefix(["foo/bar/czar/x.pyi", "foo/y.pyi"]) == "foo"
-        assert common_dir_prefix(["foo/x.pyi", "foo/bar/czar/y.pyi"]) == "foo"
-        assert common_dir_prefix(["foo/bar/czar/x.pyi", "foo/bar/y.pyi"]) == "foo/bar"
-        assert common_dir_prefix(["foo/bar/x.pyi", "foo/bar/czar/y.pyi"]) == "foo/bar"
+        assert common_dir_prefix(["foo/bar/zar/x.pyi", "foo/y.pyi"]) == "foo"
+        assert common_dir_prefix(["foo/x.pyi", "foo/bar/zar/y.pyi"]) == "foo"
+        assert common_dir_prefix(["foo/bar/zar/x.pyi", "foo/bar/y.pyi"]) == "foo/bar"
+        assert common_dir_prefix(["foo/bar/x.pyi", "foo/bar/zar/y.pyi"]) == "foo/bar"
         assert common_dir_prefix([r"foo/bar\x.pyi"]) == "foo"
         assert common_dir_prefix([r"foo\bar/x.pyi"]) == r"foo\bar"
 
@@ -604,10 +604,10 @@ def test_common_dir_prefix_win(self) -> None:
         assert common_dir_prefix([r"foo\bar\x.pyi", r"foo\bar\y.pyi"]) == r"foo\bar"
         assert common_dir_prefix([r"foo\bar\x.pyi", r"foo\y.pyi"]) == "foo"
         assert common_dir_prefix([r"foo\x.pyi", r"foo\bar\y.pyi"]) == "foo"
-        assert common_dir_prefix([r"foo\bar\czar\x.pyi", r"foo\y.pyi"]) == "foo"
-        assert common_dir_prefix([r"foo\x.pyi", r"foo\bar\czar\y.pyi"]) == "foo"
-        assert common_dir_prefix([r"foo\bar\czar\x.pyi", r"foo\bar\y.pyi"]) == r"foo\bar"
-        assert common_dir_prefix([r"foo\bar\x.pyi", r"foo\bar\czar\y.pyi"]) == r"foo\bar"
+        assert common_dir_prefix([r"foo\bar\zar\x.pyi", r"foo\y.pyi"]) == "foo"
+        assert common_dir_prefix([r"foo\x.pyi", r"foo\bar\zar\y.pyi"]) == "foo"
+        assert common_dir_prefix([r"foo\bar\zar\x.pyi", r"foo\bar\y.pyi"]) == r"foo\bar"
+        assert common_dir_prefix([r"foo\bar\x.pyi", r"foo\bar\zar\y.pyi"]) == r"foo\bar"
         assert common_dir_prefix([r"foo/bar\x.pyi"]) == r"foo\bar"
         assert common_dir_prefix([r"foo\bar/x.pyi"]) == r"foo\bar"
         assert common_dir_prefix([r"foo/bar/x.pyi"]) == r"foo\bar"
diff --git a/mypy/test/testtypes.py b/mypy/test/testtypes.py
index 5dd3b78c9498..2ee2758cf67f 100644
--- a/mypy/test/testtypes.py
+++ b/mypy/test/testtypes.py
@@ -1208,7 +1208,7 @@ def test_simple_generics(self) -> None:
 
     def test_generics_with_multiple_args(self) -> None:
         self.assert_meet(self.fx.hab, self.fx.hab, self.fx.hab)
-        self.assert_meet(self.fx.hab, self.fx.has, self.fx.hab)
+        self.assert_meet(self.fx.hab, self.fx.haa, self.fx.hab)
         self.assert_meet(self.fx.hab, self.fx.had, self.fx.nonet)
         self.assert_meet(self.fx.hab, self.fx.hbb, self.fx.hbb)
 
diff --git a/mypyc/irbuild/classdef.py b/mypyc/irbuild/classdef.py
index daea4a249c81..7e0a842b1b41 100644
--- a/mypyc/irbuild/classdef.py
+++ b/mypyc/irbuild/classdef.py
@@ -519,7 +519,7 @@ def populate_non_ext_bases(builder: IRBuilder, cdef: ClassDef) -> Value:
             "typing.Container",
             "typing.Sized",
         ):
-            # HEX: Synthesized base classes added by mypy don't exist at runtime, so skip them.
+            # HAX: Synthesized base classes added by mypy don't exist at runtime, so skip them.
             #      This could break if they were added explicitly, though...
             continue
         # Add the current class to the base classes list of concrete subclasses
@@ -529,7 +529,7 @@ def populate_non_ext_bases(builder: IRBuilder, cdef: ClassDef) -> Value:
                 base_ir.children.append(ir)
 
         if cls.fullname in MAGIC_TYPED_DICT_CLASSES:
-            # HEX: Mypy internally represents TypedDict classes differently from what
+            # HAX: Mypy internally represents TypedDict classes differently from what
             #      should happen at runtime. Replace with something that works.
             module = "typing"
             if builder.options.capi_version < (3, 9):