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

resolve conflict (removes line added by mistake)

This commit is contained in:
uraneko 2025-09-26 08:36:18 +01:00
parent 390555bdb6
commit 89527c5ec5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -508,7 +508,8 @@ impl ToTokens for Route {
#[derive(Default)] #[derive(Default)]
#vis struct #name #struct_generic; #vis struct #name #struct_generic;
impl #trait_generic ::actix_web::dev::HttpServiceFactory for #name #impl_type_generic { 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

1
actix-web/Cargo.toml
View File

@ -52,7 +52,6 @@ allowed_external_types = [
"serde_json::*", "serde_json::*",
"serde_urlencoded::*", "serde_urlencoded::*",
"serde::*", "serde::*",
"serde::*",
"tokio::*", "tokio::*",
"url::*", "url::*",
] ]