OpenSource/axum
OpenSource/axum
1
0
Fork 0
mirror of https://github.com/tokio-rs/axum.git synced 2025-01-21 07:50:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

Small routing module refactoring (#1364)

Browse source
This commit is contained in:
Jonas Platte 2022-09-22 12:10:32 +02:00 committed by GitHub
parent 611c50ec8b
commit 18e3fac5d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
axum/src/routing/method_routing.rs
View file

@ -917,27 +917,11 @@ where
panic!("Overlapping method route. Cannot merge two method routes that both define `{name}`") panic!("Overlapping method route. Cannot merge two method routes that both define `{name}`")
} }
} }
(Some(svc), None) => Some(svc), (Some(svc), None) | (None, Some(svc)) => Some(svc),
(None, Some(svc)) => Some(svc),
(None, None) => None, (None, None) => None,
} }
} }
#[track_caller]
fn merge_fallback<B, E>(
fallback: Fallback<B, E>,
fallback_other: Fallback<B, E>,
) -> Fallback<B, E> {
match (fallback, fallback_other) {
(pick @ Fallback::Default(_), Fallback::Default(_)) => pick,
(Fallback::Default(_), pick @ Fallback::Custom(_)) => pick,
(pick @ Fallback::Custom(_), Fallback::Default(_)) => pick,
(Fallback::Custom(_), Fallback::Custom(_)) => {
panic!("Cannot merge two `MethodRouter`s that both have a fallback")
}
}
}
self.get = merge_inner(path, "GET", self.get, other.get); self.get = merge_inner(path, "GET", self.get, other.get);
self.head = merge_inner(path, "HEAD", self.head, other.head); self.head = merge_inner(path, "HEAD", self.head, other.head);
self.delete = merge_inner(path, "DELETE", self.delete, other.delete); self.delete = merge_inner(path, "DELETE", self.delete, other.delete);
@ -947,7 +931,10 @@ where
self.put = merge_inner(path, "PUT", self.put, other.put); self.put = merge_inner(path, "PUT", self.put, other.put);
self.trace = merge_inner(path, "TRACE", self.trace, other.trace); self.trace = merge_inner(path, "TRACE", self.trace, other.trace);
self.fallback = merge_fallback(self.fallback, other.fallback); self.fallback = self
.fallback
.merge(other.fallback)
.expect("Cannot merge two `MethodRouter`s that both have a fallback");
self.allow_header = self.allow_header.merge(other.allow_header); self.allow_header = self.allow_header.merge(other.allow_header);

34
axum/src/routing/mod.rs
View file

@ -323,14 +323,10 @@ where
}; };
} }
self.fallback = match (self.fallback, fallback) { self.fallback = self
(Fallback::Default(_), pick @ Fallback::Default(_)) => pick, .fallback
(Fallback::Default(_), pick @ Fallback::Custom(_)) => pick, .merge(fallback)
(pick @ Fallback::Custom(_), Fallback::Default(_)) => pick, .expect("Cannot merge two `Router`s that both have a fallback");
(Fallback::Custom(_), Fallback::Custom(_)) => {
panic!("Cannot merge two `Router`s that both have a fallback")
}
};
self self
} }
@ -628,11 +624,21 @@ enum Fallback<B, E = Infallible> {
Custom(Route<B, E>), Custom(Route<B, E>),
} }
impl<B, E> Fallback<B, E> {
fn merge(self, other: Self) -> Option<Self> {
match (self, other) {
(Self::Default(_), pick @ Self::Default(_)) => Some(pick),
(Self::Default(_), pick) | (pick, Self::Default(_)) => Some(pick),
_ => None,
}
}
}
impl<B, E> Clone for Fallback<B, E> { impl<B, E> Clone for Fallback<B, E> {
fn clone(&self) -> Self { fn clone(&self) -> Self {
match self { match self {
Fallback::Default(inner) => Fallback::Default(inner.clone()), Self::Default(inner) => Self::Default(inner.clone()),
Fallback::Custom(inner) => Fallback::Custom(inner.clone()), Self::Custom(inner) => Self::Custom(inner.clone()),
} }
} }
} }
@ -652,8 +658,8 @@ impl<B, E> Fallback<B, E> {
F: FnOnce(Route<B, E>) -> Route<B2, E2>, F: FnOnce(Route<B, E>) -> Route<B2, E2>,
{ {
match self { match self {
Fallback::Default(inner) => Fallback::Default(f(inner)), Self::Default(inner) => Fallback::Default(f(inner)),
Fallback::Custom(inner) => Fallback::Custom(f(inner)), Self::Custom(inner) => Fallback::Custom(f(inner)),
} }
} }
} }
@ -666,8 +672,8 @@ enum Endpoint<S, B> {
impl<S, B> Clone for Endpoint<S, B> { impl<S, B> Clone for Endpoint<S, B> {
fn clone(&self) -> Self { fn clone(&self) -> Self {
match self { match self {
Endpoint::MethodRouter(inner) => Endpoint::MethodRouter(inner.clone()), Self::MethodRouter(inner) => Self::MethodRouter(inner.clone()),
Endpoint::Route(inner) => Endpoint::Route(inner.clone()), Self::Route(inner) => Self::Route(inner.clone()),
} }
} }
} }