mirrors/actix-web
1
0
Fork 0
mirror of https://github.com/actix/actix-web.git synced 2024-12-21 23:56:35 +00:00
Code Issues Projects Releases Wiki Activity

Add ability to name a handler function as 'config' (#1290)

Browse source 
* eliminate handler naming restrictions #1277

* Update actix-web-codegen/CHANGES.md

Co-authored-by: Yuki Okushi <huyuumi.dev@gmail.com>
This commit is contained in:
Andrey Torsunov 2020-01-26 01:22:40 +03:00 committed by Yuki Okushi
parent 8888520d83
commit 71d11644a7
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
actix-web-codegen/CHANGES.md
View file

@ -1,5 +1,9 @@
# Changes # Changes
## [0.2.NEXT] - 2020-xx-xx
* Allow the handler function to be named as `config` #1290
## [0.2.0] - 2019-12-13 ## [0.2.0] - 2019-12-13
* Generate code for actix-web 2.0 * Generate code for actix-web 2.0

6
actix-web-codegen/src/route.rs
View file

@ -195,15 +195,15 @@ impl Route {
pub struct #name; pub struct #name;
impl actix_web::dev::HttpServiceFactory for #name { impl actix_web::dev::HttpServiceFactory for #name {
fn register(self, config: &mut actix_web::dev::AppService) { fn register(self, __config: &mut actix_web::dev::AppService) {
#ast #ast
let resource = actix_web::Resource::new(#path) let __resource = actix_web::Resource::new(#path)
.name(#resource_name) .name(#resource_name)
.guard(actix_web::guard::#guard()) .guard(actix_web::guard::#guard())
#(.guard(actix_web::guard::fn_guard(#extra_guards)))* #(.guard(actix_web::guard::fn_guard(#extra_guards)))*
.#resource_type(#name); .#resource_type(#name);
actix_web::dev::HttpServiceFactory::register(resource, config) actix_web::dev::HttpServiceFactory::register(__resource, __config)
} }
} }
}; };

6
actix-web-codegen/tests/test_macro.rs
View file

@ -2,6 +2,12 @@ use actix_web::{http, test, web::Path, App, HttpResponse, Responder};
use actix_web_codegen::{connect, delete, get, head, options, patch, post, put, trace}; use actix_web_codegen::{connect, delete, get, head, options, patch, post, put, trace};
use futures::{future, Future}; use futures::{future, Future};
// Make sure that we can name function as 'config'
#[get("/config")]
async fn config() -> impl Responder {
HttpResponse::Ok()
}
#[get("/test")] #[get("/test")]
async fn test_handler() -> impl Responder { async fn test_handler() -> impl Responder {
HttpResponse::Ok() HttpResponse::Ok()