From 89527c5ec5c6d69688aaad5702c98ac0cb9ba6cc Mon Sep 17 00:00:00 2001 From: uraneko Date: Fri, 26 Sep 2025 08:36:18 +0100 Subject: [PATCH] resolve conflict (removes line added by mistake) --- actix-web-codegen/src/route.rs | 3 ++- actix-web/Cargo.toml | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/actix-web-codegen/src/route.rs b/actix-web-codegen/src/route.rs index 7cea54e11..19b0aeaf8 100644 --- a/actix-web-codegen/src/route.rs +++ b/actix-web-codegen/src/route.rs @@ -508,7 +508,8 @@ impl ToTokens for Route { #[derive(Default)] #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) { #ast #registrations diff --git a/actix-web/Cargo.toml b/actix-web/Cargo.toml index 1cad115d8..6c5291df4 100644 --- a/actix-web/Cargo.toml +++ b/actix-web/Cargo.toml @@ -52,7 +52,6 @@ allowed_external_types = [ "serde_json::*", "serde_urlencoded::*", "serde::*", - "serde::*", "tokio::*", "url::*", ]