berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

add function single generic type support

This commit is contained in:
uraneko 2025-09-26 07:26:14 +01:00
parent 41d0176c1d
commit 390555bdb6
3 changed files with 151 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
actix-web-codegen/src/route.rs
View File

@ -328,6 +328,9 @@ pub struct Route {
/// Name of the handler function being annotated. /// Name of the handler function being annotated.
name: syn::Ident, name: syn::Ident,
/// function generic
type_generic: Option<syn::TypeParam>,
/// Args passed to routing macro. /// Args passed to routing macro.
/// ///
/// When using `#[routes]`, this will contain args for each specific routing macro. /// When using `#[routes]`, this will contain args for each specific routing macro.
@ -344,6 +347,13 @@ impl Route {
pub fn new(args: RouteArgs, ast: syn::ItemFn, method: Option<MethodType>) -> syn::Result<Self> { pub fn new(args: RouteArgs, ast: syn::ItemFn, method: Option<MethodType>) -> syn::Result<Self> {
let name = ast.sig.ident.clone(); let name = ast.sig.ident.clone();
let generics = ast.sig.generics.params.clone();
let type_generic = if let Some(syn::GenericParam::Type(ty)) = generics.into_iter().next() {
Some(ty)
} else {
None
};
// Try and pull out the doc comments so that we can reapply them to the generated struct. // Try and pull out the doc comments so that we can reapply them to the generated struct.
// Note that multi line doc comments are converted to multiple doc attributes. // Note that multi line doc comments are converted to multiple doc attributes.
let doc_attributes = ast let doc_attributes = ast
@ -370,6 +380,7 @@ impl Route {
} }
Ok(Self { Ok(Self {
type_generic,
name, name,
args: vec![args], args: vec![args],
ast, ast,
@ -380,6 +391,13 @@ impl Route {
fn multiple(args: Vec<Args>, ast: syn::ItemFn) -> syn::Result<Self> { fn multiple(args: Vec<Args>, ast: syn::ItemFn) -> syn::Result<Self> {
let name = ast.sig.ident.clone(); let name = ast.sig.ident.clone();
let generics = ast.sig.generics.params.clone();
let type_generic = if let Some(syn::GenericParam::Type(ty)) = generics.into_iter().next() {
Some(ty)
} else {
None
};
// Try and pull out the doc comments so that we can reapply them to the generated struct. // Try and pull out the doc comments so that we can reapply them to the generated struct.
// Note that multi line doc comments are converted to multiple doc attributes. // Note that multi line doc comments are converted to multiple doc attributes.
let doc_attributes = ast let doc_attributes = ast
@ -398,6 +416,7 @@ impl Route {
Ok(Self { Ok(Self {
name, name,
type_generic,
args, args,
ast, ast,
doc_attributes, doc_attributes,
@ -409,6 +428,7 @@ impl ToTokens for Route {
fn to_tokens(&self, output: &mut TokenStream2) { fn to_tokens(&self, output: &mut TokenStream2) {
let Self { let Self {
name, name,
type_generic,
ast, ast,
args, args,
doc_attributes, doc_attributes,
@ -421,6 +441,17 @@ impl ToTokens for Route {
#[cfg(feature = "compat-routing-macros-force-pub")] #[cfg(feature = "compat-routing-macros-force-pub")]
let vis = syn::Visibility::Public(<Token![pub]>::default()); let vis = syn::Visibility::Public(<Token![pub]>::default());
let (struct_generic, trait_generic, impl_type_generic) =
if let Some(syn::TypeParam { ident, bounds, .. }) = type_generic {
(
Some(quote! { <#ident> (core::marker::PhantomData<T>) }),
Some(quote! { <#ident: #bounds + 'static> }),
Some(quote! { <#ident> }),
)
} else {
(None, None, None)
};
let registrations: TokenStream2 = args let registrations: TokenStream2 = args
.iter() .iter()
.map(|args| { .map(|args| {
@ -453,13 +484,19 @@ impl ToTokens for Route {
} }
}; };
let type_generic = if let Some(syn::TypeParam { ident, .. }) = type_generic {
Some(quote! { ::<#ident> })
} else {
None
};
quote! { quote! {
let __resource = ::actix_web::Resource::new(#path) let __resource = ::actix_web::Resource::new(#path)
.name(#resource_name) .name(#resource_name)
#method_guards #method_guards
#(.guard(::actix_web::guard::fn_guard(#guards)))* #(.guard(::actix_web::guard::fn_guard(#guards)))*
#(.wrap(#wrappers))* #(.wrap(#wrappers))*
.to(#name); .to(#name #type_generic);
::actix_web::dev::HttpServiceFactory::register(__resource, __config); ::actix_web::dev::HttpServiceFactory::register(__resource, __config);
} }
}) })
@ -468,9 +505,10 @@ impl ToTokens for Route {
let stream = quote! { let stream = quote! {
#(#doc_attributes)* #(#doc_attributes)*
#[allow(non_camel_case_types)] #[allow(non_camel_case_types)]
#vis struct #name; #[derive(Default)]
#vis struct #name #struct_generic;
impl ::actix_web::dev::HttpServiceFactory for #name { impl #trait_generic ::actix_web::dev::HttpServiceFactory for #name #impl_type_generic {
fn register(self, __config: &mut actix_web::dev::AppService) { fn register(self, __config: &mut actix_web::dev::AppService) {
#ast #ast
#registrations #registrations

96
actix-web/Cargo.toml
View File

@ -5,10 +5,10 @@ description = "Actix Web is a powerful, pragmatic, and extremely fast web framew
authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Rob Ede <robjtede@icloud.com>"] authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Rob Ede <robjtede@icloud.com>"]
keywords = ["actix", "http", "web", "framework", "async"] keywords = ["actix", "http", "web", "framework", "async"]
categories = [ categories = [
"network-programming", "network-programming",
"asynchronous", "asynchronous",
"web-programming::http-server", "web-programming::http-server",
"web-programming::websocket", "web-programming::websocket",
] ]
homepage = "https://actix.rs" homepage = "https://actix.rs"
repository = "https://github.com/actix/actix-web" repository = "https://github.com/actix/actix-web"
@ -18,56 +18,56 @@ rust-version.workspace = true
[package.metadata.docs.rs] [package.metadata.docs.rs]
features = [ features = [
"macros", "macros",
"openssl", "openssl",
"rustls-0_20", "rustls-0_20",
"rustls-0_21", "rustls-0_21",
"rustls-0_22", "rustls-0_22",
"rustls-0_23", "rustls-0_23",
"compress-brotli", "compress-brotli",
"compress-gzip", "compress-gzip",
"compress-zstd", "compress-zstd",
"cookies", "cookies",
"secure-cookies", "secure-cookies",
] ]
[package.metadata.cargo_check_external_types] [package.metadata.cargo_check_external_types]
allowed_external_types = [ allowed_external_types = [
"actix_http::*", "actix_http::*",
"actix_router::*", "actix_router::*",
"actix_rt::*", "actix_rt::*",
"actix_server::*", "actix_server::*",
"actix_service::*", "actix_service::*",
"actix_utils::*", "actix_utils::*",
"actix_web_codegen::*", "actix_web_codegen::*",
"bytes::*", "bytes::*",
"cookie::*", "cookie::*",
"cookie", "cookie",
"futures_core::*", "futures_core::*",
"http::*", "http::*",
"language_tags::*", "language_tags::*",
"mime::*", "mime::*",
"openssl::*", "openssl::*",
"rustls::*", "rustls::*",
"serde_json::*", "serde_json::*",
"serde_urlencoded::*", "serde_urlencoded::*",
"serde::*", "serde::*",
"serde::*", "serde::*",
"tokio::*", "tokio::*",
"url::*", "url::*",
] ]
[features] [features]
default = [ default = [
"macros", "macros",
"compress-brotli", "compress-brotli",
"compress-gzip", "compress-gzip",
"compress-zstd", "compress-zstd",
"cookies", "cookies",
"http2", "http2",
"unicode", "unicode",
"compat", "compat",
"ws", "ws",
] ]
# Brotli algorithm content-encoding support # Brotli algorithm content-encoding support
@ -204,6 +204,10 @@ required-features = ["compress-brotli", "compress-gzip", "compress-zstd"]
name = "basic" name = "basic"
required-features = ["compress-gzip"] required-features = ["compress-gzip"]
[[example]]
name = "issue"
path = "examples/2866.rs"
[[example]] [[example]]
name = "uds" name = "uds"
required-features = ["compress-gzip"] required-features = ["compress-gzip"]

60
actix-web/examples/2866.rs Normal file
View File

@ -0,0 +1,60 @@
use actix_web::{
dev::Server,
get,
web::{self, Data},
App, HttpServer, Responder,
};
use serde::Serialize;
#[derive(Debug, Serialize, Clone, Copy)]
pub struct User {
id: u64,
}
pub trait UserRepository {
fn get_user(&self) -> User;
}
#[derive(Clone)]
struct UserClient;
impl UserRepository for UserClient {
fn get_user(&self) -> User {
User { id: 99 }
}
}
// when uncommenting following the line, the type checking is unaccepted
// because of cannot infer type parameter T
#[get("/")]
async fn index<T: UserRepository>(client: web::Data<T>) -> impl Responder {
let user = client.into_inner().get_user();
web::Json(user)
}
#[get("hello/{who}")]
async fn hello(who: web::Path<String>) -> impl Responder {
format!("<h1>hello {who}</h1>")
}
pub fn create_server<T: UserRepository + Send + Sync + 'static + Clone>(
search: T,
) -> Result<Server, std::io::Error> {
let server = HttpServer::new(move || {
App::new()
.app_data(Data::new(search.clone()))
// .route("/", web::get().to(index::<T>))
.service(index::<T>(core::marker::PhantomData::<T>))
.service(hello)
})
.bind("127.0.0.1:8080")?
.run();
Ok(server)
}
#[actix_web::main]
async fn main() -> std::io::Result<()> {
println!("\x1b[1;2;36mserving on http://localhost:8080\x1b[0m");
let user_client = UserClient;
create_server(user_client).unwrap().await
}