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

Support State with #[derive(FromRequest[Parts])] #1391

Merged
merged 6 commits into from Sep 23, 2022
Merged

Support State with #[derive(FromRequest[Parts])] #1391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fb91330
Support `State` with `#[derive(FromRequest[Parts])]`
davidpdrsn Sep 18, 2022
a1217b3
make sure things can be combined with other extractors
davidpdrsn Sep 19, 2022
8859dcd
main functions in ui tests don't need to be async
davidpdrsn Sep 19, 2022
013c6d0
Add test for multiple identicaly state types
davidpdrsn Sep 22, 2022
e907695
Merge branch 'main' into from-request-state
davidpdrsn Sep 22, 2022
f163193
Add failing test for multiple states
davidpdrsn Sep 22, 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
2 changes: 1 addition & 1 deletion axum-macros/Cargo.toml
View file
Open in desktop
Expand Up @@ -26,7 +26,7 @@ syn = { version = "1.0", features = [

[dev-dependencies]
axum = { path = "../axum", version = "0.6.0-rc.2", features = ["headers"] }
axum-extra = { path = "../axum-extra", version = "0.4.0-rc.1", features = ["typed-routing"] }
axum-extra = { path = "../axum-extra", version = "0.4.0-rc.1", features = ["typed-routing", "cookie-private"] }
rustversion = "1.0"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
Expand Down
43 changes: 3 additions & 40 deletions axum-macros/src/debug_handler.rs
View file
Open in desktop
Expand Up @@ -4,7 +4,6 @@ use crate::{
};
use proc_macro2::TokenStream;
use quote::{format_ident, quote, quote_spanned};
use std::collections::HashSet;
use syn::{parse::Parse, parse_quote, spanned::Spanned, FnArg, ItemFn, Token, Type};

pub(crate) fn expand(attr: Attrs, item_fn: ItemFn) -> TokenStream {
Expand Down Expand Up @@ -435,52 +434,16 @@ fn self_receiver(item_fn: &ItemFn) -> Option<TokenStream> {
///
/// Returns `None` if there are no `State` args or multiple of different types.
fn state_type_from_args(item_fn: &ItemFn) -> Option<Type> {
let state_inputs = item_fn
let types = item_fn
.sig
.inputs
.iter()
.filter_map(|input| match input {
FnArg::Receiver(_) => None,
FnArg::Typed(pat_type) => Some(pat_type),
})
.map(|pat_type| &pat_type.ty)
.filter_map(|ty| {
if let Type::Path(path) = &**ty {
Some(&path.path)
} else {
None
}
})
.filter_map(|path| {
if let Some(last_segment) = path.segments.last() {
if last_segment.ident != "State" {
return None;
}

match &last_segment.arguments {
syn::PathArguments::AngleBracketed(args) if args.args.len() == 1 => {
Some(args.args.first().unwrap())
}
_ => None,
}
} else {
None
}
})
.filter_map(|generic_arg| {
if let syn::GenericArgument::Type(ty) = generic_arg {
Some(ty)
} else {
None
}
})
.collect::<HashSet<_>>();

if state_inputs.len() == 1 {
state_inputs.iter().next().map(|&ty| ty.clone())
} else {
None
}
.map(|pat_type| &*pat_type.ty);
crate::infer_state_type(types)
}

#[test]
Expand Down