Rename count_tts -> count_tokens

Author: MrGVSV

crates/bevy_reflect/src/func/macros.rs

@@ -103,10 +103,10 @@ pub(crate) use impl_function_traits;
 /// See [here] for details.
 ///
 /// [here]: https://veykril.github.io/tlborm/decl-macros/building-blocks/counting.html#bit-twiddling
-macro_rules! count_tts {
+macro_rules! count_tokens {
     () => { 0 };
-    ($odd:tt $($a:tt $b:tt)*) => { ($crate::func::macros::count_tts!($($a)*) << 1) | 1 };
-    ($($a:tt $even:tt)*) => { $crate::func::macros::count_tts!($($a)*) << 1 };
+    ($odd:tt $($a:tt $b:tt)*) => { ($crate::func::macros::count_tokens!($($a)*) << 1) | 1 };
+    ($($a:tt $even:tt)*) => { $crate::func::macros::count_tokens!($($a)*) << 1 };
 }
 
-pub(crate) use count_tts;
+pub(crate) use count_tokens;

crates/bevy_reflect/src/func/reflect_fn.rs

@@ -1,7 +1,7 @@
 use bevy_utils::all_tuples;
 
 use crate::func::args::FromArg;
-use crate::func::macros::count_tts;
+use crate::func::macros::count_tokens;
 use crate::func::{ArgList, FunctionError, FunctionInfo, FunctionResult, IntoReturn, ReflectFnMut};
 use crate::Reflect;
 
@@ -85,7 +85,7 @@ macro_rules! impl_reflect_fn {
             Function: for<'a> Fn($($Arg::Item<'a>),*) -> ReturnType + 'env,
         {
             fn reflect_call<'a>(&self, args: ArgList<'a>, _info: &FunctionInfo) -> FunctionResult<'a> {
-                const COUNT: usize = count_tts!($($Arg)*);
+                const COUNT: usize = count_tokens!($($Arg)*);
 
                 if args.len() != COUNT {
                     return Err(FunctionError::InvalidArgCount {
@@ -120,7 +120,7 @@ macro_rules! impl_reflect_fn {
             Function: for<'a> Fn(&'a Receiver, $($Arg::Item<'a>),*) -> &'a ReturnType + 'env,
         {
             fn reflect_call<'a>(&self, args: ArgList<'a>, _info: &FunctionInfo) -> FunctionResult<'a> {
-                const COUNT: usize = count_tts!(Receiver $($Arg)*);
+                const COUNT: usize = count_tokens!(Receiver $($Arg)*);
 
                 if args.len() != COUNT {
                     return Err(FunctionError::InvalidArgCount {
@@ -157,7 +157,7 @@ macro_rules! impl_reflect_fn {
             Function: for<'a> Fn(&'a mut Receiver, $($Arg::Item<'a>),*) -> &'a mut ReturnType + 'env,
         {
             fn reflect_call<'a>(&self, args: ArgList<'a>, _info: &FunctionInfo) -> FunctionResult<'a> {
-                const COUNT: usize = count_tts!(Receiver $($Arg)*);
+                const COUNT: usize = count_tokens!(Receiver $($Arg)*);
 
                 if args.len() != COUNT {
                     return Err(FunctionError::InvalidArgCount {
@@ -194,7 +194,7 @@ macro_rules! impl_reflect_fn {
             Function: for<'a> Fn(&'a mut Receiver, $($Arg::Item<'a>),*) -> &'a ReturnType + 'env,
         {
             fn reflect_call<'a>(&self, args: ArgList<'a>, _info: &FunctionInfo) -> FunctionResult<'a> {
-                const COUNT: usize = count_tts!(Receiver $($Arg)*);
+                const COUNT: usize = count_tokens!(Receiver $($Arg)*);
 
                 if args.len() != COUNT {
                     return Err(FunctionError::InvalidArgCount {

crates/bevy_reflect/src/func/reflect_fn_mut.rs

@@ -1,7 +1,7 @@
 use bevy_utils::all_tuples;
 
 use crate::func::args::FromArg;
-use crate::func::macros::count_tts;
+use crate::func::macros::count_tokens;
 use crate::func::{ArgList, FunctionError, FunctionInfo, FunctionResult, IntoReturn};
 use crate::Reflect;
 
@@ -95,7 +95,7 @@ macro_rules! impl_reflect_fn_mut {
             Function: for<'a> FnMut($($Arg::Item<'a>),*) -> ReturnType + 'env,
         {
             fn reflect_call_mut<'a>(&mut self, args: ArgList<'a>, _info: &FunctionInfo) -> FunctionResult<'a> {
-                const COUNT: usize = count_tts!($($Arg)*);
+                const COUNT: usize = count_tokens!($($Arg)*);
 
                 if args.len() != COUNT {
                     return Err(FunctionError::InvalidArgCount {
@@ -130,7 +130,7 @@ macro_rules! impl_reflect_fn_mut {
             Function: for<'a> FnMut(&'a Receiver, $($Arg::Item<'a>),*) -> &'a ReturnType + 'env,
         {
             fn reflect_call_mut<'a>(&mut self, args: ArgList<'a>, _info: &FunctionInfo) -> FunctionResult<'a> {
-                const COUNT: usize = count_tts!(Receiver $($Arg)*);
+                const COUNT: usize = count_tokens!(Receiver $($Arg)*);
 
                 if args.len() != COUNT {
                     return Err(FunctionError::InvalidArgCount {
@@ -167,7 +167,7 @@ macro_rules! impl_reflect_fn_mut {
             Function: for<'a> FnMut(&'a mut Receiver, $($Arg::Item<'a>),*) -> &'a mut ReturnType + 'env,
         {
             fn reflect_call_mut<'a>(&mut self, args: ArgList<'a>, _info: &FunctionInfo) -> FunctionResult<'a> {
-                const COUNT: usize = count_tts!(Receiver $($Arg)*);
+                const COUNT: usize = count_tokens!(Receiver $($Arg)*);
 
                 if args.len() != COUNT {
                     return Err(FunctionError::InvalidArgCount {
@@ -204,7 +204,7 @@ macro_rules! impl_reflect_fn_mut {
             Function: for<'a> FnMut(&'a mut Receiver, $($Arg::Item<'a>),*) -> &'a ReturnType + 'env,
         {
             fn reflect_call_mut<'a>(&mut self, args: ArgList<'a>, _info: &FunctionInfo) -> FunctionResult<'a> {
-                const COUNT: usize = count_tts!(Receiver $($Arg)*);
+                const COUNT: usize = count_tokens!(Receiver $($Arg)*);
 
                 if args.len() != COUNT {
                     return Err(FunctionError::InvalidArgCount {