Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace Router::{map_inner, tap_inner_mut} by macros #2954

Merged
merged 1 commit into from
Oct 4, 2024
Merged

Replace Router::{map_inner, tap_inner_mut} by macros #2954

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 37 additions & 32 deletions axum/src/routing/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,31 @@ pub(crate) const NEST_TAIL_PARAM_CAPTURE: &str = "/{*__private__axum_nest_tail_p
pub(crate) const FALLBACK_PARAM: &str = "__private__axum_fallback";
pub(crate) const FALLBACK_PARAM_PATH: &str = "/{*__private__axum_fallback}";

macro_rules! map_inner {
( $self_:ident, $inner:pat_param => $expr:expr) => {
#[allow(redundant_semicolons)]
{
let $inner = $self_.into_inner();
Router {
inner: Arc::new($expr),
}
}
};
}

macro_rules! tap_inner {
( $self_:ident, mut $inner:ident => { $($stmt:stmt)* } ) => {
#[allow(redundant_semicolons)]
{
let mut $inner = $self_.into_inner();
$($stmt)*
Router {
inner: Arc::new($inner),
}
}
};
}

impl<S> Router<S>
where
S: Clone + Send + Sync + 'static,
Expand All @@ -122,26 +147,6 @@ where
}
}

fn map_inner<F, S2>(self, f: F) -> Router<S2>
where
F: FnOnce(RouterInner<S>) -> RouterInner<S2>,
{
Router {
inner: Arc::new(f(self.into_inner())),
}
}

fn tap_inner_mut<F>(self, f: F) -> Self
where
F: FnOnce(&mut RouterInner<S>),
{
let mut inner = self.into_inner();
f(&mut inner);
Router {
inner: Arc::new(inner),
}
}

fn into_inner(self) -> RouterInner<S> {
match Arc::try_unwrap(self.inner) {
Ok(inner) => inner,
Expand All @@ -156,15 +161,15 @@ where

#[doc = include_str!("../docs/routing/without_v07_checks.md")]
pub fn without_v07_checks(self) -> Self {
self.tap_inner_mut(|this| {
tap_inner!(self, mut this => {
this.path_router.without_v07_checks();
})
}

#[doc = include_str!("../docs/routing/route.md")]
#[track_caller]
pub fn route(self, path: &str, method_router: MethodRouter<S>) -> Self {
self.tap_inner_mut(|this| {
tap_inner!(self, mut this => {
panic_on_err!(this.path_router.route(path, method_router));
})
}
Expand All @@ -186,7 +191,7 @@ where
Err(service) => service,
};

self.tap_inner_mut(|this| {
tap_inner!(self, mut this => {
panic_on_err!(this.path_router.route_service(path, service));
})
}
Expand All @@ -205,7 +210,7 @@ where
catch_all_fallback: _,
} = router.into_inner();

self.tap_inner_mut(|this| {
tap_inner!(self, mut this => {
panic_on_err!(this.path_router.nest(path, path_router));

if !default_fallback {
Expand All @@ -222,7 +227,7 @@ where
T::Response: IntoResponse,
T::Future: Send + 'static,
{
self.tap_inner_mut(|this| {
tap_inner!(self, mut this => {
panic_on_err!(this.path_router.nest_service(path, service));
})
}
Expand All @@ -244,7 +249,7 @@ where
catch_all_fallback,
} = other.into_inner();

self.map_inner(|mut this| {
map_inner!(self, mut this => {
panic_on_err!(this.path_router.merge(path_router));

match (this.default_fallback, default_fallback) {
Expand Down Expand Up @@ -288,7 +293,7 @@ where
<L::Service as Service<Request>>::Error: Into<Infallible> + 'static,
<L::Service as Service<Request>>::Future: Send + 'static,
{
self.map_inner(|this| RouterInner {
map_inner!(self, this => RouterInner {
path_router: this.path_router.layer(layer.clone()),
fallback_router: this.fallback_router.layer(layer.clone()),
default_fallback: this.default_fallback,
Expand All @@ -306,7 +311,7 @@ where
<L::Service as Service<Request>>::Error: Into<Infallible> + 'static,
<L::Service as Service<Request>>::Future: Send + 'static,
{
self.map_inner(|this| RouterInner {
map_inner!(self, this => RouterInner {
path_router: this.path_router.route_layer(layer),
fallback_router: this.fallback_router,
default_fallback: this.default_fallback,
Expand All @@ -326,7 +331,7 @@ where
H: Handler<T, S>,
T: 'static,
{
self.tap_inner_mut(|this| {
tap_inner!(self, mut this => {
this.catch_all_fallback =
Fallback::BoxedHandler(BoxedIntoRoute::from_handler(handler.clone()));
})
Expand All @@ -343,22 +348,22 @@ where
T::Future: Send + 'static,
{
let route = Route::new(service);
self.tap_inner_mut(|this| {
tap_inner!(self, mut this => {
this.catch_all_fallback = Fallback::Service(route.clone());
})
.fallback_endpoint(Endpoint::Route(route))
}

fn fallback_endpoint(self, endpoint: Endpoint<S>) -> Self {
self.tap_inner_mut(|this| {
tap_inner!(self, mut this => {
this.fallback_router.set_fallback(endpoint);
this.default_fallback = false;
})
}

#[doc = include_str!("../docs/routing/with_state.md")]
pub fn with_state<S2>(self, state: S) -> Router<S2> {
self.map_inner(|this| RouterInner {
map_inner!(self, this => RouterInner {
path_router: this.path_router.with_state(state.clone()),
fallback_router: this.fallback_router.with_state(state.clone()),
default_fallback: this.default_fallback,
Expand Down