actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2024-11-27 17:52:56 +01:00
Code Issues Releases Wiki Activity

fix clippy async_yields_async lints (#1667)

Browse Source
This commit is contained in:
Rob Ede 2020-09-11 11:29:17 +01:00 committed by GitHub
parent 121075c1ef
commit cf5138e740
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/route.rs
View File

@ -368,7 +368,7 @@ mod tests {
})) }))
.route(web::post().to(|| async { .route(web::post().to(|| async {
delay_for(Duration::from_millis(100)).await; delay_for(Duration::from_millis(100)).await;
HttpResponse::Created() Ok::<_, ()>(HttpResponse::Created())
})) }))
.route(web::delete().to(|| async { .route(web::delete().to(|| async {
delay_for(Duration::from_millis(100)).await; delay_for(Duration::from_millis(100)).await;

10
src/scope.rs
View File

@ -826,7 +826,7 @@ mod tests {
async fn test_scope_variable_segment() { async fn test_scope_variable_segment() {
let mut srv = let mut srv =
init_service(App::new().service(web::scope("/ab-{project}").service( init_service(App::new().service(web::scope("/ab-{project}").service(
web::resource("/path1").to(|r: HttpRequest| async move { web::resource("/path1").to(|r: HttpRequest| {
HttpResponse::Ok() HttpResponse::Ok()
.body(format!("project: {}", &r.match_info()["project"])) .body(format!("project: {}", &r.match_info()["project"]))
}), }),
@ -926,7 +926,7 @@ mod tests {
async fn test_nested_scope_with_variable_segment() { async fn test_nested_scope_with_variable_segment() {
let mut srv = init_service(App::new().service(web::scope("/app").service( let mut srv = init_service(App::new().service(web::scope("/app").service(
web::scope("/{project_id}").service(web::resource("/path1").to( web::scope("/{project_id}").service(web::resource("/path1").to(
|r: HttpRequest| async move { |r: HttpRequest| {
HttpResponse::Created() HttpResponse::Created()
.body(format!("project: {}", &r.match_info()["project_id"])) .body(format!("project: {}", &r.match_info()["project_id"]))
}, },
@ -951,7 +951,7 @@ mod tests {
async fn test_nested2_scope_with_variable_segment() { async fn test_nested2_scope_with_variable_segment() {
let mut srv = init_service(App::new().service(web::scope("/app").service( let mut srv = init_service(App::new().service(web::scope("/app").service(
web::scope("/{project}").service(web::scope("/{id}").service( web::scope("/{project}").service(web::scope("/{id}").service(
web::resource("/path1").to(|r: HttpRequest| async move { web::resource("/path1").to(|r: HttpRequest| {
HttpResponse::Created().body(format!( HttpResponse::Created().body(format!(
"project: {} - {}", "project: {} - {}",
&r.match_info()["project"], &r.match_info()["project"],
@ -1178,7 +1178,7 @@ mod tests {
); );
s.route( s.route(
"/", "/",
web::get().to(|req: HttpRequest| async move { web::get().to(|req: HttpRequest| {
HttpResponse::Ok().body( HttpResponse::Ok().body(
req.url_for("youtube", &["xxxxxx"]).unwrap().to_string(), req.url_for("youtube", &["xxxxxx"]).unwrap().to_string(),
) )
@ -1199,7 +1199,7 @@ mod tests {
async fn test_url_for_nested() { async fn test_url_for_nested() {
let mut srv = init_service(App::new().service(web::scope("/a").service( let mut srv = init_service(App::new().service(web::scope("/a").service(
web::scope("/b").service(web::resource("/c/{stuff}").name("c").route( web::scope("/b").service(web::resource("/c/{stuff}").name("c").route(
web::get().to(|req: HttpRequest| async move { web::get().to(|req: HttpRequest| {
HttpResponse::Ok() HttpResponse::Ok()
.body(format!("{}", req.url_for("c", &["12345"]).unwrap())) .body(format!("{}", req.url_for("c", &["12345"]).unwrap()))
}), }),

39
src/test.rs
View File

@ -1072,14 +1072,9 @@ mod tests {
let mut app = init_service( let mut app = init_service(
App::new().service( App::new().service(
web::resource("/index.html") web::resource("/index.html")
.route(web::put().to(|| async { HttpResponse::Ok().body("put!") })) .route(web::put().to(|| HttpResponse::Ok().body("put!")))
.route( .route(web::patch().to(|| HttpResponse::Ok().body("patch!")))
web::patch().to(|| async { HttpResponse::Ok().body("patch!") }), .route(web::delete().to(|| HttpResponse::Ok().body("delete!"))),
)
.route(
web::delete()
.to(|| async { HttpResponse::Ok().body("delete!") }),
),
), ),
) )
.await; .await;
@ -1107,10 +1102,12 @@ mod tests {
#[actix_rt::test] #[actix_rt::test]
async fn test_response() { async fn test_response() {
let mut app = let mut app = init_service(
init_service(App::new().service(web::resource("/index.html").route( App::new().service(
web::post().to(|| async { HttpResponse::Ok().body("welcome!") }), web::resource("/index.html")
))) .route(web::post().to(|| HttpResponse::Ok().body("welcome!"))),
),
)
.await; .await;
let req = TestRequest::post() let req = TestRequest::post()
@ -1124,10 +1121,12 @@ mod tests {
#[actix_rt::test] #[actix_rt::test]
async fn test_send_request() { async fn test_send_request() {
let mut app = let mut app = init_service(
init_service(App::new().service(web::resource("/index.html").route( App::new().service(
web::get().to(|| async { HttpResponse::Ok().body("welcome!") }), web::resource("/index.html")
))) .route(web::get().to(|| HttpResponse::Ok().body("welcome!"))),
),
)
.await; .await;
let resp = TestRequest::get() let resp = TestRequest::get()
@ -1148,7 +1147,7 @@ mod tests {
#[actix_rt::test] #[actix_rt::test]
async fn test_response_json() { async fn test_response_json() {
let mut app = init_service(App::new().service(web::resource("/people").route( let mut app = init_service(App::new().service(web::resource("/people").route(
web::post().to(|person: web::Json<Person>| async { web::post().to(|person: web::Json<Person>| {
HttpResponse::Ok().json(person.into_inner()) HttpResponse::Ok().json(person.into_inner())
}), }),
))) )))
@ -1169,7 +1168,7 @@ mod tests {
#[actix_rt::test] #[actix_rt::test]
async fn test_body_json() { async fn test_body_json() {
let mut app = init_service(App::new().service(web::resource("/people").route( let mut app = init_service(App::new().service(web::resource("/people").route(
web::post().to(|person: web::Json<Person>| async { web::post().to(|person: web::Json<Person>| {
HttpResponse::Ok().json(person.into_inner()) HttpResponse::Ok().json(person.into_inner())
}), }),
))) )))
@ -1191,7 +1190,7 @@ mod tests {
#[actix_rt::test] #[actix_rt::test]
async fn test_request_response_form() { async fn test_request_response_form() {
let mut app = init_service(App::new().service(web::resource("/people").route( let mut app = init_service(App::new().service(web::resource("/people").route(
web::post().to(|person: web::Form<Person>| async { web::post().to(|person: web::Form<Person>| {
HttpResponse::Ok().json(person.into_inner()) HttpResponse::Ok().json(person.into_inner())
}), }),
))) )))
@ -1217,7 +1216,7 @@ mod tests {
#[actix_rt::test] #[actix_rt::test]
async fn test_request_response_json() { async fn test_request_response_json() {
let mut app = init_service(App::new().service(web::resource("/people").route( let mut app = init_service(App::new().service(web::resource("/people").route(
web::post().to(|person: web::Json<Person>| async { web::post().to(|person: web::Json<Person>| {
HttpResponse::Ok().json(person.into_inner()) HttpResponse::Ok().json(person.into_inner())
}), }),
))) )))