tokio-rs/axum
1
0
Fork 0
mirror of https://github.com/tokio-rs/axum.git synced 2026-09-03 00:00:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor all_the_tuples! macros (#1413)

Browse Source
This commit is contained in:
David Pedersen
2022-09-25 15:22:40 +02:00
committed by GitHub
parent 8dd9c8d286
commit bf341fd034
9 changed files with 69 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
axum-core/src/extract/tuple.rs
+1 -25
View File
@@ -74,31 +74,7 @@ macro_rules! impl_from_request {
}; };
} }
impl_from_request!([], T1); all_the_tuples!(impl_from_request);
impl_from_request!([T1], T2);
impl_from_request!([T1, T2], T3);
impl_from_request!([T1, T2, T3], T4);
impl_from_request!([T1, T2, T3, T4], T5);
impl_from_request!([T1, T2, T3, T4, T5], T6);
impl_from_request!([T1, T2, T3, T4, T5, T6], T7);
impl_from_request!([T1, T2, T3, T4, T5, T6, T7], T8);
impl_from_request!([T1, T2, T3, T4, T5, T6, T7, T8], T9);
impl_from_request!([T1, T2, T3, T4, T5, T6, T7, T8, T9], T10);
impl_from_request!([T1, T2, T3, T4, T5, T6, T7, T8, T9, T10], T11);
impl_from_request!([T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11], T12);
impl_from_request!([T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12], T13);
impl_from_request!(
[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13],
T14
);
impl_from_request!(
[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14],
T15
);
impl_from_request!(
[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15],
T16
);
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
axum-core/src/macros.rs
+22
View File
@@ -100,7 +100,29 @@ macro_rules! composite_rejection {
}; };
} }
#[rustfmt::skip]
macro_rules! all_the_tuples { macro_rules! all_the_tuples {
($name:ident) => {
$name!([], T1);
$name!([T1], T2);
$name!([T1, T2], T3);
$name!([T1, T2, T3], T4);
$name!([T1, T2, T3, T4], T5);
$name!([T1, T2, T3, T4, T5], T6);
$name!([T1, T2, T3, T4, T5, T6], T7);
$name!([T1, T2, T3, T4, T5, T6, T7], T8);
$name!([T1, T2, T3, T4, T5, T6, T7, T8], T9);
$name!([T1, T2, T3, T4, T5, T6, T7, T8, T9], T10);
$name!([T1, T2, T3, T4, T5, T6, T7, T8, T9, T10], T11);
$name!([T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11], T12);
$name!([T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12], T13);
$name!([T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13], T14);
$name!([T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14], T15);
$name!([T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15], T16);
};
}
macro_rules! all_the_tuples_no_last_special_case {
($name:ident) => { ($name:ident) => {
$name!(T1); $name!(T1);
$name!(T1, T2); $name!(T1, T2);
axum-core/src/response/into_response.rs
+1 -1
View File
@@ -516,4 +516,4 @@ macro_rules! impl_into_response {
} }
} }
all_the_tuples!(impl_into_response); all_the_tuples_no_last_special_case!(impl_into_response);
axum-core/src/response/into_response_parts.rs
+1 -1
View File
@@ -248,7 +248,7 @@ macro_rules! impl_into_response_parts {
} }
} }
all_the_tuples!(impl_into_response_parts); all_the_tuples_no_last_special_case!(impl_into_response_parts);
impl IntoResponseParts for Extensions { impl IntoResponseParts for Extensions {
type Error = Infallible; type Error = Infallible;
axum/src/error_handling/mod.rs
+16 -1
View File
@@ -204,7 +204,22 @@ macro_rules! impl_service {
} }
} }
all_the_tuples!(impl_service); impl_service!(T1);
impl_service!(T1, T2);
impl_service!(T1, T2, T3);
impl_service!(T1, T2, T3, T4);
impl_service!(T1, T2, T3, T4, T5);
impl_service!(T1, T2, T3, T4, T5, T6);
impl_service!(T1, T2, T3, T4, T5, T6, T7);
impl_service!(T1, T2, T3, T4, T5, T6, T7, T8);
impl_service!(T1, T2, T3, T4, T5, T6, T7, T8, T9);
impl_service!(T1, T2, T3, T4, T5, T6, T7, T8, T9, T10);
impl_service!(T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11);
impl_service!(T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12);
impl_service!(T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13);
impl_service!(T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14);
impl_service!(T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15);
impl_service!(T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16);
pub mod future { pub mod future {
//! Future types. //! Future types.
axum/src/handler/mod.rs
+1 -25
View File
@@ -224,31 +224,7 @@ macro_rules! impl_handler {
}; };
} }
impl_handler!([], T1); all_the_tuples!(impl_handler);
impl_handler!([T1], T2);
impl_handler!([T1, T2], T3);
impl_handler!([T1, T2, T3], T4);
impl_handler!([T1, T2, T3, T4], T5);
impl_handler!([T1, T2, T3, T4, T5], T6);
impl_handler!([T1, T2, T3, T4, T5, T6], T7);
impl_handler!([T1, T2, T3, T4, T5, T6, T7], T8);
impl_handler!([T1, T2, T3, T4, T5, T6, T7, T8], T9);
impl_handler!([T1, T2, T3, T4, T5, T6, T7, T8, T9], T10);
impl_handler!([T1, T2, T3, T4, T5, T6, T7, T8, T9, T10], T11);
impl_handler!([T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11], T12);
impl_handler!([T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12], T13);
impl_handler!(
[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13],
T14
);
impl_handler!(
[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14],
T15
);
impl_handler!(
[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15],
T16
);
/// A [`Service`] created from a [`Handler`] by applying a Tower middleware. /// A [`Service`] created from a [`Handler`] by applying a Tower middleware.
/// ///
axum/src/macros.rs
+25 -16
View File
@@ -180,21 +180,30 @@ macro_rules! composite_rejection {
macro_rules! all_the_tuples { macro_rules! all_the_tuples {
($name:ident) => { ($name:ident) => {
$name!(T1); $name!([], T1);
$name!(T1, T2); $name!([T1], T2);
$name!(T1, T2, T3); $name!([T1, T2], T3);
$name!(T1, T2, T3, T4); $name!([T1, T2, T3], T4);
$name!(T1, T2, T3, T4, T5); $name!([T1, T2, T3, T4], T5);
$name!(T1, T2, T3, T4, T5, T6); $name!([T1, T2, T3, T4, T5], T6);
$name!(T1, T2, T3, T4, T5, T6, T7); $name!([T1, T2, T3, T4, T5, T6], T7);
$name!(T1, T2, T3, T4, T5, T6, T7, T8); $name!([T1, T2, T3, T4, T5, T6, T7], T8);
$name!(T1, T2, T3, T4, T5, T6, T7, T8, T9); $name!([T1, T2, T3, T4, T5, T6, T7, T8], T9);
$name!(T1, T2, T3, T4, T5, T6, T7, T8, T9, T10); $name!([T1, T2, T3, T4, T5, T6, T7, T8, T9], T10);
$name!(T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11); $name!([T1, T2, T3, T4, T5, T6, T7, T8, T9, T10], T11);
$name!(T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12); $name!([T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11], T12);
$name!(T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13); $name!([T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12], T13);
$name!(T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14); $name!(
$name!(T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15); [T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13],
$name!(T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16); T14
);
$name!(
[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14],
T15
);
$name!(
[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15],
T16
);
}; };
} }
axum/src/middleware/from_fn.rs
+1 -25
View File
@@ -304,31 +304,7 @@ macro_rules! impl_service {
}; };
} }
impl_service!([], T1); all_the_tuples!(impl_service);
impl_service!([T1], T2);
impl_service!([T1, T2], T3);
impl_service!([T1, T2, T3], T4);
impl_service!([T1, T2, T3, T4], T5);
impl_service!([T1, T2, T3, T4, T5], T6);
impl_service!([T1, T2, T3, T4, T5, T6], T7);
impl_service!([T1, T2, T3, T4, T5, T6, T7], T8);
impl_service!([T1, T2, T3, T4, T5, T6, T7, T8], T9);
impl_service!([T1, T2, T3, T4, T5, T6, T7, T8, T9], T10);
impl_service!([T1, T2, T3, T4, T5, T6, T7, T8, T9, T10], T11);
impl_service!([T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11], T12);
impl_service!([T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12], T13);
impl_service!(
[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13],
T14
);
impl_service!(
[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14],
T15
);
impl_service!(
[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15],
T16
);
impl<F, S, I, T> fmt::Debug for FromFn<F, S, I, T> impl<F, S, I, T> fmt::Debug for FromFn<F, S, I, T>
where where
axum/src/middleware/map_request.rs
+1 -25
View File
@@ -319,31 +319,7 @@ macro_rules! impl_service {
}; };
} }
impl_service!([], T1); all_the_tuples!(impl_service);
impl_service!([T1], T2);
impl_service!([T1, T2], T3);
impl_service!([T1, T2, T3], T4);
impl_service!([T1, T2, T3, T4], T5);
impl_service!([T1, T2, T3, T4, T5], T6);
impl_service!([T1, T2, T3, T4, T5, T6], T7);
impl_service!([T1, T2, T3, T4, T5, T6, T7], T8);
impl_service!([T1, T2, T3, T4, T5, T6, T7, T8], T9);
impl_service!([T1, T2, T3, T4, T5, T6, T7, T8, T9], T10);
impl_service!([T1, T2, T3, T4, T5, T6, T7, T8, T9, T10], T11);
impl_service!([T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11], T12);
impl_service!([T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12], T13);
impl_service!(
[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13],
T14
);
impl_service!(
[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14],
T15
);
impl_service!(
[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15],
T16
);
impl<F, S, I, T> fmt::Debug for MapRequest<F, S, I, T> impl<F, S, I, T> fmt::Debug for MapRequest<F, S, I, T>
where where