Switch expr_2021 macro fragment back to expr

Author: coolreader18

crates/bindings-macro/src/util.rs

@@ -90,18 +90,18 @@ macro_rules! match_meta {
     (@match $acc:tt, $comparisons:tt, $meta:ident { $sym:path => $body:block $($rest:tt)* }) => {
         match_meta!(@case $acc, $comparisons, $meta, _, $sym, $body, { $($rest)* })
     };
-    (@match $acc:tt, $comparisons:tt, $meta:ident { $sym:path => $body:expr_2021, $($rest:tt)* }) => {
+    (@match $acc:tt, $comparisons:tt, $meta:ident { $sym:path => $body:expr, $($rest:tt)* }) => {
         match_meta!(@case $acc, $comparisons, $meta, _, $sym, $body, { $($rest)* })
     };
 
-    (@match ($($acc:tt)*), ($($comparisons:expr_2021),*), $meta:ident {}) => {
+    (@match ($($acc:tt)*), ($($comparisons:expr),*), $meta:ident {}) => {
         match () {
             $($acc)*
             _ => return Err($meta.error($crate::util::one_of(&[$($comparisons),*]))),
         }
     };
 
-    (@case ($($acc:tt)*), ($($comparisons:expr_2021),*), $meta:ident, $binding:tt, $sym:path, $body:expr_2021, { $($rest:tt)* }) => {
+    (@case ($($acc:tt)*), ($($comparisons:expr),*), $meta:ident, $binding:tt, $sym:path, $body:expr, { $($rest:tt)* }) => {
         match_meta!(@match (
             $($acc)*
             _ if $meta.path == $sym => $body,

crates/bindings/src/http.rs

@@ -248,7 +248,7 @@ impl Default for Body {
 }
 
 macro_rules! impl_body_from_bytes {
-    ($bytes:ident : $t:ty => $conv:expr_2021) => {
+    ($bytes:ident : $t:ty => $conv:expr) => {
         impl From<$t> for Body {
             fn from($bytes: $t) -> Body {
                 Body::from_bytes($conv)

crates/bindings/src/lib.rs

@@ -1551,10 +1551,10 @@ macro_rules! __volatile_nonatomic_schedule_immediate_impl {
     ([$($cur:tt)*] [$next:tt $($rest:tt)*]) => {
         $crate::__volatile_nonatomic_schedule_immediate_impl!([$($cur)* $next] [$($rest)*])
     };
-    (@process_args $repeater:path, ($($args:expr_2021),* $(,)?)) => {
+    (@process_args $repeater:path, ($($args:expr),* $(,)?)) => {
         $crate::__volatile_nonatomic_schedule_immediate_impl!(@call $repeater, ($($args),*))
     };
-    (@call $repeater:path, ($($args:expr_2021),*)) => {
+    (@call $repeater:path, ($($args:expr),*)) => {
         if false {
             let _ = $repeater(&$crate::ReducerContext::__dummy(), $($args,)*);
         } else {

crates/bindings/src/query_builder/expr.rs

@@ -71,7 +71,7 @@ impl LiteralValue {
 }
 
 macro_rules! impl_rhs {
-    ($ty:ty, $formatter:expr_2021) => {
+    ($ty:ty, $formatter:expr) => {
         impl<T> RHS<T, $ty> for $ty {
             fn to_expr(self) -> Operand<T> {
                 Operand::Literal(LiteralValue($formatter(self)))

crates/cli/src/tasks/csharp.rs

@@ -12,7 +12,7 @@ pub(crate) fn build_csharp(project_path: &Path, build_debug: bool) -> anyhow::Re
     // All `dotnet` commands must execute in the project directory, otherwise
     // global.json won't have any effect and wrong .NET SDK might be picked.
     macro_rules! dotnet {
-        ($($arg:expr_2021),*) => {
+        ($($arg:expr),*) => {
             duct::cmd!("dotnet", $($arg),*).dir(project_path)
         };
     }

crates/codegen/examples/regen-csharp-moduledef.rs

@@ -10,7 +10,7 @@ use std::path::Path;
 use std::sync::OnceLock;
 
 macro_rules! regex_replace {
-    ($value:expr_2021, $re:expr_2021, $replace:expr_2021) => {{
+    ($value:expr, $re:expr, $replace:expr) => {{
         static RE: OnceLock<Regex> = OnceLock::new();
         RE.get_or_init(|| Regex::new($re).unwrap())
             .replace_all($value, $replace)

crates/codegen/examples/regen-typescript-moduledef.rs

@@ -13,7 +13,7 @@ use std::path::Path;
 use std::sync::OnceLock;
 
 macro_rules! regex_replace {
-    ($value:expr_2021, $re:expr_2021, $replace:expr_2021) => {{
+    ($value:expr, $re:expr, $replace:expr) => {{
         static RE: OnceLock<Regex> = OnceLock::new();
         RE.get_or_init(|| Regex::new($re).unwrap())
             .replace_all($value, $replace)

crates/codegen/tests/codegen.rs

@@ -11,7 +11,7 @@ fn compiled_module() -> &'static ModuleDef {
 }
 
 macro_rules! declare_tests {
-    ($($name:ident => $lang:expr_2021,)*) => ($(
+    ($($name:ident => $lang:expr,)*) => ($(
         #[test]
         fn $name() {
             let module = compiled_module();

crates/core/src/db/update.rs

@@ -80,7 +80,7 @@ fn manual_migrate_database(
 
 /// Logs with `info` level to `$logger` as well as via the `log` crate.
 macro_rules! log {
-    ($logger:expr_2021, $($tokens:tt)*) => {
+    ($logger:expr, $($tokens:tt)*) => {
         $logger.info(&format!($($tokens)*));
         log::info!($($tokens)*);
     };

crates/core/src/host/v8/builtins/mod.rs

@@ -31,7 +31,7 @@ fn eval_builtin(
 }
 
 macro_rules! create_synthetic_module {
-    ($scope:expr_2021, $module_name:expr_2021 $(,  $fun:ident)* $(,)?) => {{
+    ($scope:expr, $module_name:expr $(,  $fun:ident)* $(,)?) => {{
         let export_names = &[$(str_from_ident!($fun).string($scope)),*];
         let eval_steps = |context, module| {
             v8::callback_scope!(unsafe scope, context);