fix(es): Support stable rustc again (#7057)

**Related issue:**

 - Closes #7039.

Author: kdy1

crates/swc_ecma_transforms_base/src/fixer.rs

@@ -907,36 +907,45 @@ impl Fixer<'_> {
             Expr::Call(CallExpr {
                 callee: Callee::Expr(callee),
                 ..
-            })
-            | Expr::OptChain(OptChainExpr {
-                base: box OptChainBase::Call(OptCall { callee, .. }),
-                ..
-            }) if callee.is_seq() => {
+            }) if callee.is_seq()
+                || callee.is_arrow()
+                || callee.is_await_expr()
+                || callee.is_assign() =>
+            {
                 *callee = Box::new(Expr::Paren(ParenExpr {
                     span: callee.span(),
                     expr: callee.take(),
                 }))
             }
+            Expr::OptChain(OptChainExpr { base, .. }) => match &mut **base {
+                OptChainBase::Call(OptCall { callee, .. })
+                    if callee.is_seq()
+                        || callee.is_arrow()
+                        || callee.is_await_expr()
+                        || callee.is_assign() =>
+                {
+                    *callee = Box::new(Expr::Paren(ParenExpr {
+                        span: callee.span(),
+                        expr: callee.take(),
+                    }))
+                }
 
-            Expr::Call(CallExpr {
-                callee: Callee::Expr(callee),
-                ..
-            })
-            | Expr::OptChain(OptChainExpr {
-                base: box OptChainBase::Call(OptCall { callee, .. }),
-                ..
-            }) if callee.is_arrow() || callee.is_await_expr() || callee.is_assign() => {
-                self.wrap(callee);
-            }
+                OptChainBase::Call(OptCall { callee, .. }) if callee.is_fn_expr() => match self.ctx
+                {
+                    Context::ForcedExpr | Context::FreeExpr => {}
+
+                    Context::Callee { is_new: true } => self.wrap(e),
+
+                    _ => self.wrap(callee),
+                },
+
+                _ => {}
+            },
 
             // Function expression cannot start with `function`
             Expr::Call(CallExpr {
                 callee: Callee::Expr(callee),
                 ..
-            })
-            | Expr::OptChain(OptChainExpr {
-                base: box OptChainBase::Call(OptCall { callee, .. }),
-                ..
             }) if callee.is_fn_expr() => match self.ctx {
                 Context::ForcedExpr | Context::FreeExpr => {}
 

crates/swc_ecma_transforms_base/src/lib.rs

@@ -1,5 +1,4 @@
 #![cfg_attr(test, deny(warnings))]
-#![feature(box_patterns)]
 
 pub use self::resolver::resolver;
 

crates/swc_ecma_transforms_compat/src/es2022/class_properties/private_field.rs

@@ -439,10 +439,19 @@ impl<'a> VisitMut for PrivateAccessVisitor<'a> {
             }
 
             Expr::OptChain(OptChainExpr {
-                base: box OptChainBase::Call(call),
+                base,
                 question_dot_token,
                 span,
-            }) if call.callee.is_member() => {
+            }) if match &**base {
+                OptChainBase::Call(call) => call.callee.is_member(),
+                _ => false,
+            } =>
+            {
+                let call = match &mut **base {
+                    OptChainBase::Call(call) => call,
+                    _ => unreachable!(),
+                };
+
                 let mut callee = call.callee.take().member().unwrap();
                 callee.visit_mut_with(self);
                 call.args.visit_mut_with(self);
@@ -474,17 +483,26 @@ impl<'a> VisitMut for PrivateAccessVisitor<'a> {
                 member_expr.visit_mut_children_with(self);
                 *e = self.visit_mut_private_get(member_expr, None).0;
             }
-            Expr::OptChain(OptChainExpr {
-                base:
-                    box OptChainBase::Member(
+            Expr::OptChain(OptChainExpr { base, span, .. })
+                if matches!(
+                    &**base,
+                    OptChainBase::Member(MemberExpr {
+                        prop: MemberProp::PrivateName(..),
+                        ..
+                    },)
+                ) =>
+            {
+                let member = match &mut **base {
+                    OptChainBase::Member(
                         member @ MemberExpr {
                             prop: MemberProp::PrivateName(..),
                             ..
                         },
-                    ),
-                span,
-                ..
-            }) => {
+                    ) => member,
+                    _ => {
+                        unreachable!()
+                    }
+                };
                 member.visit_mut_children_with(self);
                 let (ident, aliased) = alias_if_required(&member.obj, "_ref");
                 if aliased {

crates/swc_ecma_transforms_compat/src/lib.rs

@@ -3,7 +3,6 @@
 #![allow(clippy::vec_box)]
 #![allow(clippy::boxed_local)]
 #![allow(clippy::match_like_matches_macro)]
-#![feature(box_patterns)]
 
 pub use self::{
     bugfixes::bugfixes, es2015::es2015, es2016::es2016, es2017::es2017, es2018::es2018,