Edition 2024 cleanup: rename expr_2021 -> expr

Summary:
X-link: meta-pytorch/monarch#949

This renames `expr_2021` to `expr` for rust macros. The `expr_2021` was used during the Rust Edition upgrade to ensure compatibility between the two editions. Now that we are using Rust Edition 2024 as the default, and none of the macros are triggering a build failure with this rename, we can rename this back to `expr`

Reviewed By: diliop

Differential Revision: D80508019

fbshipit-source-id: 5ebdc9a11067ff66d2ec475790e9df97a6e1fa46

Author: cjlongoria

crates/base_db/src/test_utils.rs

@@ -22,10 +22,10 @@ pub use dissimilar::diff as __diff;
 /// `eprintln!()` macro in case of text inequality.
 #[macro_export]
 macro_rules! assert_eq_text {
-    ($left:expr_2021, $right:expr_2021) => {
+    ($left:expr, $right:expr) => {
         assert_eq_text!($left, $right,)
     };
-    ($left:expr_2021, $right:expr_2021, $($tt:tt)*) => {{
+    ($left:expr, $right:expr, $($tt:tt)*) => {{
         let left = $left;
         let right = $right;
         if left != right {

crates/elp/src/bin/lint_cli.rs

@@ -950,7 +950,7 @@ mod tests {
     use crate::args::Command;
 
     macro_rules! args_vec {
-        ($($e:expr_2021$(,)?)+) => {
+        ($($e:expr$(,)?)+) => {
             vec![$(OsString::from($e),)+]
         }
     }

crates/elp/src/bin/main.rs

@@ -237,7 +237,7 @@ mod tests {
     const BUCK_QUERY_CONFIG: BuckQueryConfig = BuckQueryConfig::BuildGeneratedCode;
 
     macro_rules! args_vec {
-        ($($e:expr_2021$(,)?)+) => {
+        ($($e:expr$(,)?)+) => {
             vec![$(OsString::from($e),)+]
         }
     }

crates/elp/src/config.rs

@@ -143,12 +143,12 @@ pub struct EqwalizerConfig {
 }
 
 macro_rules! try_ {
-    ($expr:expr_2021) => {
+    ($expr:expr) => {
         || -> _ { Some($expr) }()
     };
 }
 macro_rules! try_or {
-    ($expr:expr_2021, $or:expr_2021) => {
+    ($expr:expr, $or:expr) => {
         try_!($expr).unwrap_or($or)
     };
 }
@@ -401,7 +401,7 @@ macro_rules! _config_data {
     (struct $name:ident {
         $(
             $(#[doc=$doc:literal])*
-            $field:ident $(| $alias:ident)*: $ty:ty = $default:expr_2021,
+            $field:ident $(| $alias:ident)*: $ty:ty = $default:expr,
         )*
     }) => {
         #[allow(non_snake_case)]

crates/elp_log/src/lib.rs

@@ -128,7 +128,7 @@ impl Log for Logger {
 /// so `drop` happens at the end of the function
 #[macro_export]
 macro_rules! timeit {
-    ($display:expr_2021) => {
+    ($display:expr) => {
         $crate::TimeIt::new(module_path!(), $display, $crate::Telemetry::No)
     };
     ($($arg:tt)+) => {
@@ -140,7 +140,7 @@ macro_rules! timeit {
 /// Same as timeit!, but also send a LSP telemetry/event
 #[macro_export]
 macro_rules! timeit_with_telemetry {
-    ($display:expr_2021) => {
+    ($display:expr) => {
         $crate::TimeIt::new(module_path!(), $display, $crate::Telemetry::Always)
     };
     ($($arg:tt)+) => {
@@ -152,7 +152,7 @@ macro_rules! timeit_with_telemetry {
 /// Same as timeit_with_telemetry!, but do work only if latency is more than configured value
 #[macro_export]
 macro_rules! timeit_exceeds {
-    ($display:expr_2021, $duration:expr_2021) => {
+    ($display:expr, $duration:expr) => {
         $crate::TimeIt::new(
             module_path!(),
             $display,

crates/hir/src/body/tests.rs

@@ -2436,7 +2436,7 @@ fn triple_quoted_strings_2() {
 // - Proper location reporting for failing tests
 macro_rules! my_expect {
     [$data:literal] => { $crate::expect![[$data]] };
-    [[$data:expr_2021]] => {expect_test::Expect {
+    [[$data:expr]] => {expect_test::Expect {
         position: expect_test::Position {
             file: file!(),
             line: line!(),

crates/ide_db/src/rename.rs

@@ -42,8 +42,8 @@ impl fmt::Display for RenameError {
 
 #[macro_export]
 macro_rules! _format_err {
-    ($fmt:expr_2021) => { RenameError(format!($fmt)) };
-    ($fmt:expr_2021, $($arg:tt)+) => { RenameError(format!($fmt, $($arg)+)) }
+    ($fmt:expr) => { RenameError(format!($fmt)) };
+    ($fmt:expr, $($arg:tt)+) => { RenameError(format!($fmt, $($arg)+)) }
 }
 pub use _format_err as format_err;
 

crates/ide_ssr/src/errors.rs

@@ -12,8 +12,8 @@
 
 /// Constructs an SsrError taking arguments like the format macro.
 macro_rules! _error {
-    ($fmt:expr_2021) => {$crate::SsrError::new(format!($fmt))};
-    ($fmt:expr_2021, $($arg:tt)+) => {$crate::SsrError::new(format!($fmt, $($arg)+))}
+    ($fmt:expr) => {$crate::SsrError::new(format!($fmt))};
+    ($fmt:expr, $($arg:tt)+) => {$crate::SsrError::new(format!($fmt, $($arg)+))}
 }
 #[allow(unused_imports)]
 pub(crate) use _error as error;

crates/ide_ssr/src/matching.rs

@@ -63,7 +63,7 @@ use crate::get_literal_subid;
 
 // Creates a match error.
 macro_rules! match_error {
-    ($e:expr_2021) => {{
+    ($e:expr) => {{
             MatchFailed {
                 reason: if recording_match_fail_reasons() {
                     Some(format!("{}", $e))
@@ -72,7 +72,7 @@ macro_rules! match_error {
                 }
             }
     }};
-    ($fmt:expr_2021, $($arg:tt)+) => {{
+    ($fmt:expr, $($arg:tt)+) => {{
         MatchFailed {
             reason: if recording_match_fail_reasons() {
                 Some(format!($fmt, $($arg)+))

crates/syntax/src/lib.rs

@@ -374,9 +374,9 @@ impl SourceFile {
 macro_rules! match_ast {
     (match $node:ident { $($tt:tt)* }) => { match_ast!(match ($node) { $($tt)* }) };
 
-    (match ($node:expr_2021) {
-        $( ast::$ast:ident($it:pat) => $res:expr_2021, )*
-        _ => $catch_all:expr_2021 $(,)?
+    (match ($node:expr) {
+        $( ast::$ast:ident($it:pat) => $res:expr, )*
+        _ => $catch_all:expr $(,)?
     }) => {{
         $( if let Some($it) = ast::$ast::cast($node.clone()) { $res } else )*
         { $catch_all }