From cfa1fb3c0f0c471ad572c1e630847acf1cccdfa3 Mon Sep 17 00:00:00 2001
From: CoolCat467 <52022020+CoolCat467@users.noreply.github.com>
Date: Sat, 2 Sep 2023 21:24:51 -0500
Subject: [PATCH 1/2] Ignore generics not matching

---
 trio/_core/_multierror.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/trio/_core/_multierror.py b/trio/_core/_multierror.py
index 6e4cb8b923..a719873adb 100644
--- a/trio/_core/_multierror.py
+++ b/trio/_core/_multierror.py
@@ -261,11 +261,11 @@ def __str__(self) -> str:
     def __repr__(self) -> str:
         return f"<MultiError: {self}>"
 
-    @overload
+    @overload  # type: ignore[override]  # 'Exception' != '_ExceptionT'
     def derive(self, excs: Sequence[Exception], /) -> NonBaseMultiError:
         ...
 
-    @overload
+    @overload  # type: ignore[override]  # 'BaseException' != '_BaseExceptionT'
     def derive(self, excs: Sequence[BaseException], /) -> MultiError:
         ...
 

From 721bfcaada965018a89b8fadaf8c96ad5149051d Mon Sep 17 00:00:00 2001
From: CoolCat467 <52022020+CoolCat467@users.noreply.github.com>
Date: Sun, 3 Sep 2023 00:54:05 -0500
Subject: [PATCH 2/2] Fix unused type ignore

---
 trio/_core/_multierror.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/trio/_core/_multierror.py b/trio/_core/_multierror.py
index a719873adb..d55e89554d 100644
--- a/trio/_core/_multierror.py
+++ b/trio/_core/_multierror.py
@@ -265,7 +265,7 @@ def __repr__(self) -> str:
     def derive(self, excs: Sequence[Exception], /) -> NonBaseMultiError:
         ...
 
-    @overload  # type: ignore[override]  # 'BaseException' != '_BaseExceptionT'
+    @overload
     def derive(self, excs: Sequence[BaseException], /) -> MultiError:
         ...