Remove mgca_direct_lit_hack indirection

Author: reddevilmidzy

compiler/rustc_parse/src/parser/expr.rs

@@ -1628,8 +1628,7 @@ impl<'a> Parser<'a> {
             let first_expr = self.parse_expr()?;
             if self.eat(exp!(Semi)) {
                 // Repeating array syntax: `[ 0; 512 ]`
-                let count =
-                    self.parse_expr_anon_const(|this, expr| this.mgca_direct_lit_hack(expr))?;
+                let count = self.parse_expr_anon_const(|_, _| MgcaDisambiguation::Direct)?;
                 self.expect(close)?;
                 ExprKind::Repeat(first_expr, count)
             } else if self.eat(exp!(Comma)) {

compiler/rustc_parse/src/parser/item.rs

@@ -1587,9 +1587,7 @@ impl<'a> Parser<'a> {
 
         let rhs = match (self.eat(exp!(Eq)), const_arg) {
             (true, true) => ConstItemRhsKind::TypeConst {
-                rhs: Some(
-                    self.parse_expr_anon_const(|this, expr| this.mgca_direct_lit_hack(expr))?,
-                ),
+                rhs: Some(self.parse_expr_anon_const(|_, _| MgcaDisambiguation::Direct)?),
             },
             (true, false) => ConstItemRhsKind::Body { rhs: Some(self.parse_expr()?) },
             (false, true) => ConstItemRhsKind::TypeConst { rhs: None },

compiler/rustc_parse/src/parser/path.rs

@@ -915,14 +915,7 @@ impl<'a> Parser<'a> {
             });
         }
 
-        let mgca_disambiguation = self.mgca_direct_lit_hack(&expr);
-        Ok((expr, mgca_disambiguation))
-    }
-
-    /// Under `min_generic_const_args`, prefer direct const arguments rather than
-    /// wrapping literals in anon consts.
-    pub fn mgca_direct_lit_hack(&self, _expr: &Expr) -> MgcaDisambiguation {
-        MgcaDisambiguation::Direct
+        Ok((expr, MgcaDisambiguation::Direct))
     }
 
     /// Parse a generic argument in a path segment.

compiler/rustc_parse/src/parser/ty.rs

@@ -658,8 +658,7 @@ impl<'a> Parser<'a> {
         };
 
         let ty = if self.eat(exp!(Semi)) {
-            let mut length =
-                self.parse_expr_anon_const(|this, expr| this.mgca_direct_lit_hack(expr))?;
+            let mut length = self.parse_expr_anon_const(|_, _| MgcaDisambiguation::Direct)?;
 
             if let Err(e) = self.expect(exp!(CloseBracket)) {
                 // Try to recover from `X<Y, ...>` when `X::<Y, ...>` works