Cleanup

Author: cdce8p

mypy/checker.py

@@ -5568,7 +5568,8 @@ def visit_match_stmt(self, s: MatchStmt) -> None:
             # will be a union of all capture types). This pass ignores
             # guard expressions.
             pattern_types = [
-                self.pattern_checker.accept(p, subject_type, [s.subject]) for p in s.patterns
+                self.pattern_checker.accept(p, subject_type, [unwrapped_subject])
+                for p in s.patterns
             ]
             type_maps: list[TypeMap] = [t.captures for t in pattern_types]
             inferred_types = self.infer_variable_types_from_type_maps(type_maps)
@@ -5579,7 +5580,9 @@ def visit_match_stmt(self, s: MatchStmt) -> None:
                 current_subject_type = self.expr_checker.narrow_type_from_binder(
                     named_subject, subject_type
                 )
-                pattern_type = self.pattern_checker.accept(p, current_subject_type, [s.subject])
+                pattern_type = self.pattern_checker.accept(
+                    p, current_subject_type, [unwrapped_subject]
+                )
                 with self.binder.frame_context(can_skip=True, fall_through=2):
                     if b.is_unreachable or isinstance(
                         get_proper_type(pattern_type.type), UninhabitedType

mypy/checkpattern.py

@@ -16,7 +16,6 @@
 from mypy.messages import MessageBuilder
 from mypy.nodes import (
     ARG_POS,
-    AssignmentExpr,
     Context,
     Expression,
     IndexExpr,
@@ -881,8 +880,6 @@ def get_var(expr: Expression) -> Var | None:
         return get_var(expr.expr)
     if isinstance(expr, IndexExpr):
         return get_var(expr.base)
-    if isinstance(expr, AssignmentExpr):
-        return get_var(expr.target)
     if not isinstance(expr, NameExpr):
         return None
     node = expr.node