Tweak formattting in macros.
- Some lines are too long. - Some whitespace is excessive.
This commit is contained in:
parent
14c8de25e1
commit
e40a275fe4
@ -13,7 +13,9 @@ pub(crate) fn impl_from_arg(where_clause_options: &WhereClauseOptions) -> proc_m
|
|||||||
quote! {
|
quote! {
|
||||||
impl #impl_generics #bevy_reflect::func::args::FromArg for #type_path #ty_generics #where_reflect_clause {
|
impl #impl_generics #bevy_reflect::func::args::FromArg for #type_path #ty_generics #where_reflect_clause {
|
||||||
type This<'from_arg> = #type_path #ty_generics;
|
type This<'from_arg> = #type_path #ty_generics;
|
||||||
fn from_arg(arg: #bevy_reflect::func::args::Arg) -> #FQResult<Self::This<'_>, #bevy_reflect::func::args::ArgError> {
|
fn from_arg(arg: #bevy_reflect::func::args::Arg) ->
|
||||||
|
#FQResult<Self::This<'_>, #bevy_reflect::func::args::ArgError>
|
||||||
|
{
|
||||||
arg.take_owned()
|
arg.take_owned()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -13,7 +13,9 @@ pub(crate) fn impl_into_return(
|
|||||||
|
|
||||||
quote! {
|
quote! {
|
||||||
impl #impl_generics #bevy_reflect::func::IntoReturn for #type_path #ty_generics #where_reflect_clause {
|
impl #impl_generics #bevy_reflect::func::IntoReturn for #type_path #ty_generics #where_reflect_clause {
|
||||||
fn into_return<'into_return>(self) -> #bevy_reflect::func::Return<'into_return> where Self: 'into_return {
|
fn into_return<'into_return>(self) -> #bevy_reflect::func::Return<'into_return>
|
||||||
|
where Self: 'into_return
|
||||||
|
{
|
||||||
#bevy_reflect::func::Return::Owned(#bevy_reflect::__macro_exports::alloc_utils::Box::new(self))
|
#bevy_reflect::func::Return::Owned(#bevy_reflect::__macro_exports::alloc_utils::Box::new(self))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -59,18 +59,13 @@ macro_rules! impl_from_arg {
|
|||||||
(
|
(
|
||||||
$ty: ty
|
$ty: ty
|
||||||
$(;
|
$(;
|
||||||
<
|
< $($T: ident $(: $T1: tt $(+ $T2: tt)*)?),* >
|
||||||
$($T: ident $(: $T1: tt $(+ $T2: tt)*)?),*
|
|
||||||
>
|
|
||||||
)?
|
)?
|
||||||
$(
|
$(
|
||||||
[
|
[ $(const $N: ident : $size: ident),* ]
|
||||||
$(const $N: ident : $size: ident),*
|
|
||||||
]
|
|
||||||
)?
|
)?
|
||||||
$(
|
$(
|
||||||
where
|
where $($U: ty $(: $U1: tt $(+ $U2: tt)*)?),*
|
||||||
$($U: ty $(: $U1: tt $(+ $U2: tt)*)?),*
|
|
||||||
)?
|
)?
|
||||||
) => {
|
) => {
|
||||||
impl <
|
impl <
|
||||||
@ -78,12 +73,13 @@ macro_rules! impl_from_arg {
|
|||||||
$(, $(const $N : $size),*)?
|
$(, $(const $N : $size),*)?
|
||||||
> $crate::func::args::FromArg for $ty
|
> $crate::func::args::FromArg for $ty
|
||||||
$(
|
$(
|
||||||
where
|
where $($U $(: $U1 $(+ $U2)*)?),*
|
||||||
$($U $(: $U1 $(+ $U2)*)?),*
|
|
||||||
)?
|
)?
|
||||||
{
|
{
|
||||||
type This<'from_arg> = $ty;
|
type This<'from_arg> = $ty;
|
||||||
fn from_arg(arg: $crate::func::args::Arg) -> Result<Self::This<'_>, $crate::func::args::ArgError> {
|
fn from_arg(arg: $crate::func::args::Arg) ->
|
||||||
|
Result<Self::This<'_>, $crate::func::args::ArgError>
|
||||||
|
{
|
||||||
arg.take_owned()
|
arg.take_owned()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -65,18 +65,13 @@ macro_rules! impl_get_ownership {
|
|||||||
(
|
(
|
||||||
$ty: ty
|
$ty: ty
|
||||||
$(;
|
$(;
|
||||||
<
|
< $($T: ident $(: $T1: tt $(+ $T2: tt)*)?),* >
|
||||||
$($T: ident $(: $T1: tt $(+ $T2: tt)*)?),*
|
|
||||||
>
|
|
||||||
)?
|
)?
|
||||||
$(
|
$(
|
||||||
[
|
[ $(const $N: ident : $size: ident),* ]
|
||||||
$(const $N: ident : $size: ident),*
|
|
||||||
]
|
|
||||||
)?
|
)?
|
||||||
$(
|
$(
|
||||||
where
|
where $($U: ty $(: $U1: tt $(+ $U2: tt)*)?),*
|
||||||
$($U: ty $(: $U1: tt $(+ $U2: tt)*)?),*
|
|
||||||
)?
|
)?
|
||||||
) => {
|
) => {
|
||||||
impl <
|
impl <
|
||||||
@ -84,8 +79,7 @@ macro_rules! impl_get_ownership {
|
|||||||
$(, $(const $N : $size),*)?
|
$(, $(const $N : $size),*)?
|
||||||
> $crate::func::args::GetOwnership for $ty
|
> $crate::func::args::GetOwnership for $ty
|
||||||
$(
|
$(
|
||||||
where
|
where $($U $(: $U1 $(+ $U2)*)?),*
|
||||||
$($U $(: $U1 $(+ $U2)*)?),*
|
|
||||||
)?
|
)?
|
||||||
{}
|
{}
|
||||||
};
|
};
|
||||||
|
@ -28,69 +28,49 @@ macro_rules! impl_function_traits {
|
|||||||
(
|
(
|
||||||
$ty: ty
|
$ty: ty
|
||||||
$(;
|
$(;
|
||||||
<
|
< $($T: ident $(: $T1: tt $(+ $T2: tt)*)?),* >
|
||||||
$($T: ident $(: $T1: tt $(+ $T2: tt)*)?),*
|
|
||||||
>
|
|
||||||
)?
|
)?
|
||||||
$(
|
$(
|
||||||
[
|
[ $(const $N: ident : $size: ident),* ]
|
||||||
$(const $N: ident : $size: ident),*
|
|
||||||
]
|
|
||||||
)?
|
)?
|
||||||
$(
|
$(
|
||||||
where
|
where $($U: ty $(: $U1: tt $(+ $U2: tt)*)?),*
|
||||||
$($U: ty $(: $U1: tt $(+ $U2: tt)*)?),*
|
|
||||||
)?
|
)?
|
||||||
) => {
|
) => {
|
||||||
$crate::func::args::impl_get_ownership!(
|
$crate::func::args::impl_get_ownership!(
|
||||||
$ty
|
$ty
|
||||||
$(;
|
$(;
|
||||||
<
|
< $($T $(: $T1 $(+ $T2)*)?),* >
|
||||||
$($T $(: $T1 $(+ $T2)*)?),*
|
|
||||||
>
|
|
||||||
)?
|
)?
|
||||||
$(
|
$(
|
||||||
[
|
[ $(const $N : $size),* ]
|
||||||
$(const $N : $size),*
|
|
||||||
]
|
|
||||||
)?
|
)?
|
||||||
$(
|
$(
|
||||||
where
|
where $($U $(: $U1 $(+ $U2)*)?),*
|
||||||
$($U $(: $U1 $(+ $U2)*)?),*
|
|
||||||
)?
|
)?
|
||||||
);
|
);
|
||||||
$crate::func::args::impl_from_arg!(
|
$crate::func::args::impl_from_arg!(
|
||||||
$ty
|
$ty
|
||||||
$(;
|
$(;
|
||||||
<
|
< $($T $(: $T1 $(+ $T2)*)?),* >
|
||||||
$($T $(: $T1 $(+ $T2)*)?),*
|
|
||||||
>
|
|
||||||
)?
|
)?
|
||||||
$(
|
$(
|
||||||
[
|
[ $(const $N : $size),* ]
|
||||||
$(const $N : $size),*
|
|
||||||
]
|
|
||||||
)?
|
)?
|
||||||
$(
|
$(
|
||||||
where
|
where $($U $(: $U1 $(+ $U2)*)?),*
|
||||||
$($U $(: $U1 $(+ $U2)*)?),*
|
|
||||||
)?
|
)?
|
||||||
);
|
);
|
||||||
$crate::func::impl_into_return!(
|
$crate::func::impl_into_return!(
|
||||||
$ty
|
$ty
|
||||||
$(;
|
$(;
|
||||||
<
|
< $($T $(: $T1 $(+ $T2)*)?),* >
|
||||||
$($T $(: $T1 $(+ $T2)*)?),*
|
|
||||||
>
|
|
||||||
)?
|
)?
|
||||||
$(
|
$(
|
||||||
[
|
[ $(const $N : $size),* ]
|
||||||
$(const $N : $size),*
|
|
||||||
]
|
|
||||||
)?
|
)?
|
||||||
$(
|
$(
|
||||||
where
|
where $($U $(: $U1 $(+ $U2)*)?),*
|
||||||
$($U $(: $U1 $(+ $U2)*)?),*
|
|
||||||
)?
|
)?
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
@ -126,18 +126,13 @@ macro_rules! impl_into_return {
|
|||||||
(
|
(
|
||||||
$ty: ty
|
$ty: ty
|
||||||
$(;
|
$(;
|
||||||
<
|
< $($T: ident $(: $T1: tt $(+ $T2: tt)*)?),* >
|
||||||
$($T: ident $(: $T1: tt $(+ $T2: tt)*)?),*
|
|
||||||
>
|
|
||||||
)?
|
)?
|
||||||
$(
|
$(
|
||||||
[
|
[ $(const $N: ident : $size: ident),* ]
|
||||||
$(const $N: ident : $size: ident),*
|
|
||||||
]
|
|
||||||
)?
|
)?
|
||||||
$(
|
$(
|
||||||
where
|
where $($U: ty $(: $U1: tt $(+ $U2: tt)*)?),*
|
||||||
$($U: ty $(: $U1: tt $(+ $U2: tt)*)?),*
|
|
||||||
)?
|
)?
|
||||||
) => {
|
) => {
|
||||||
impl <
|
impl <
|
||||||
@ -145,11 +140,12 @@ macro_rules! impl_into_return {
|
|||||||
$(, $(const $N : $size),*)?
|
$(, $(const $N : $size),*)?
|
||||||
> $crate::func::IntoReturn for $ty
|
> $crate::func::IntoReturn for $ty
|
||||||
$(
|
$(
|
||||||
where
|
where $($U $(: $U1 $(+ $U2)*)?),*
|
||||||
$($U $(: $U1 $(+ $U2)*)?),*
|
|
||||||
)?
|
)?
|
||||||
{
|
{
|
||||||
fn into_return<'into_return>(self) -> $crate::func::Return<'into_return> where Self: 'into_return {
|
fn into_return<'into_return>(self) -> $crate::func::Return<'into_return>
|
||||||
|
where Self: 'into_return
|
||||||
|
{
|
||||||
$crate::func::Return::Owned(bevy_platform::prelude::Box::new(self))
|
$crate::func::Return::Owned(bevy_platform::prelude::Box::new(self))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user