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

Jump to bottom

Improve build times by generating less IR #1192

Merged
merged 12 commits into from Jul 25, 2022
Merged

Improve build times by generating less IR #1192

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
03f2b88
example
davidpdrsn Jul 25, 2022
d70eda5
`MethodRouter::merge`
davidpdrsn Jul 25, 2022
afd3356
`set_content_length` and `set_allow_header`
davidpdrsn Jul 25, 2022
0c80a8b
`MethodRouter::on_service_boxed_response_body`
davidpdrsn Jul 25, 2022
c4fdb10
`Router::route`
davidpdrsn Jul 25, 2022
f1a9a21
`MethodRouter::merge` again
davidpdrsn Jul 25, 2022
4fed037
`MethodRouter::on_service_boxed_response_body`
davidpdrsn Jul 25, 2022
985726b
`Router::call_route`
davidpdrsn Jul 25, 2022
2f9cd06
`MethodRouter::{layer, route_layer}`
davidpdrsn Jul 25, 2022
bbdba7d
revert example
davidpdrsn Jul 25, 2022
f4c3f57
fix test
davidpdrsn Jul 25, 2022
1bd680f
move function to method on `AllowHeader`
davidpdrsn Jul 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
91 changes: 51 additions & 40 deletions axum/src/routing/method_routing.rs
View file
Open in desktop
Expand Up @@ -777,19 +777,47 @@ impl<ReqBody, E> MethodRouter<ReqBody, E> {

#[doc = include_str!("../docs/method_routing/merge.md")]
pub fn merge(self, other: MethodRouter<ReqBody, E>) -> Self {
macro_rules! merge {
( $first:ident, $second:ident ) => {
match ($first, $second) {
(Some(_), Some(_)) => panic!(concat!(
"Overlapping method route. Cannot merge two method routes that both define `",
stringify!($first),
"`"
)),
(Some(svc), None) => Some(svc),
(None, Some(svc)) => Some(svc),
(None, None) => None,
// written using inner functions to generate less IR
fn merge_inner<T>(name: &str, first: Option<T>, second: Option<T>) -> Option<T> {
match (first, second) {
(Some(_), Some(_)) => panic!(
"Overlapping method route. Cannot merge two method routes that both define `{}`", name
),
(Some(svc), None) => Some(svc),
(None, Some(svc)) => Some(svc),
(None, None) => None,
}
}

fn merge_allow_header(
davidpdrsn marked this conversation as resolved.
Show resolved Hide resolved
allow_header: AllowHeader,
allow_header_other: AllowHeader,
) -> AllowHeader {
match (allow_header, allow_header_other) {
(AllowHeader::Skip, _) | (_, AllowHeader::Skip) => AllowHeader::Skip,
(AllowHeader::None, AllowHeader::None) => AllowHeader::None,
(AllowHeader::None, AllowHeader::Bytes(pick)) => AllowHeader::Bytes(pick),
(AllowHeader::Bytes(pick), AllowHeader::None) => AllowHeader::Bytes(pick),
(AllowHeader::Bytes(mut a), AllowHeader::Bytes(b)) => {
a.extend_from_slice(b",");
a.extend_from_slice(&b);
AllowHeader::Bytes(a)
}
};
}
}

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")
}
}
}

let Self {
Expand Down Expand Up @@ -820,35 +848,18 @@ impl<ReqBody, E> MethodRouter<ReqBody, E> {
_request_body: _,
} = other;

let get = merge!(get, get_other);
let head = merge!(head, head_other);
let delete = merge!(delete, delete_other);
let options = merge!(options, options_other);
let patch = merge!(patch, patch_other);
let post = merge!(post, post_other);
let put = merge!(put, put_other);
let trace = merge!(trace, trace_other);

let fallback = 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")
}
};
let get = merge_inner("get", get, get_other);
let head = merge_inner("head", head, head_other);
let delete = merge_inner("delete", delete, delete_other);
let options = merge_inner("options", options, options_other);
let patch = merge_inner("patch", patch, patch_other);
let post = merge_inner("post", post, post_other);
let put = merge_inner("put", put, put_other);
let trace = merge_inner("trace", trace, trace_other);

let allow_header = match (allow_header, allow_header_other) {
(AllowHeader::Skip, _) | (_, AllowHeader::Skip) => AllowHeader::Skip,
(AllowHeader::None, AllowHeader::None) => AllowHeader::None,
(AllowHeader::None, AllowHeader::Bytes(pick)) => AllowHeader::Bytes(pick),
(AllowHeader::Bytes(pick), AllowHeader::None) => AllowHeader::Bytes(pick),
(AllowHeader::Bytes(mut a), AllowHeader::Bytes(b)) => {
a.extend_from_slice(b",");
a.extend_from_slice(&b);
AllowHeader::Bytes(a)
}
};
let fallback = merge_fallback(fallback, fallback_other);

let allow_header = merge_allow_header(allow_header, allow_header_other);

Self {
get,
Expand Down