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

fix clippy

This commit is contained in:
Rob Ede 2022-04-08 13:40:55 +01:00
parent 34ef7d1bd1
commit f8860bb4e9
No known key found for this signature in database
GPG Key ID: 97C636207D3EF933
4 changed files with 47 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
actix-http/benches/uninit-headers.rs
View File

@ -119,6 +119,7 @@ mod _original {
let mut headers: [HeaderIndex; MAX_HEADERS] = let mut headers: [HeaderIndex; MAX_HEADERS] =
unsafe { MaybeUninit::uninit().assume_init() }; unsafe { MaybeUninit::uninit().assume_init() };
#[allow(invalid_value)]
let mut parsed: [httparse::Header<'_>; MAX_HEADERS] = let mut parsed: [httparse::Header<'_>; MAX_HEADERS] =
unsafe { MaybeUninit::uninit().assume_init() }; unsafe { MaybeUninit::uninit().assume_init() };

5
actix-http/src/h1/payload.rs
View File

@ -263,10 +263,7 @@ mod tests {
assert_not_impl_any!(Payload: Send, Sync, UnwindSafe, RefUnwindSafe); assert_not_impl_any!(Payload: Send, Sync, UnwindSafe, RefUnwindSafe);
assert_impl_all!(Inner: Unpin, Send, Sync); assert_impl_all!(Inner: Unpin, Send, Sync);
#[rustversion::before(1.60)] // assert_not_impl_any!(Inner: UnwindSafe, RefUnwindSafe);
assert_not_impl_any!(Inner: UnwindSafe, RefUnwindSafe);
#[rustversion::since(1.60)]
assert_impl_all!(Inner: UnwindSafe, RefUnwindSafe);
#[actix_rt::test] #[actix_rt::test]
async fn test_unread_data() { async fn test_unread_data() {

32
actix-web/src/route.rs
View File

@ -357,21 +357,23 @@ mod tests {
#[actix_rt::test] #[actix_rt::test]
async fn route_middleware() { async fn route_middleware() {
let srv = init_service( let srv = init_service(
App::new().service( App::new()
web::resource("/test") .route("/", web::get().to(HttpResponse::Ok).wrap(Logger::default()))
.route(web::get().to(HttpResponse::Ok)) .service(
.route( web::resource("/test")
web::post() .route(web::get().to(HttpResponse::Ok))
.to(HttpResponse::Created) .route(
.wrap(DefaultHeaders::new().add(("x-test", "x-posted"))), web::post()
) .to(HttpResponse::Created)
.route( .wrap(DefaultHeaders::new().add(("x-test", "x-posted"))),
web::delete() )
.to(HttpResponse::Accepted) .route(
// logger changes body type, proving Compat is not needed web::delete()
.wrap(Logger::default()), .to(HttpResponse::Accepted)
), // logger changes body type, proving Compat is not needed
), .wrap(Logger::default()),
),
),
) )
.await; .await;

54
actix-web/tests/test_server.rs
View File

@ -799,34 +799,36 @@ async fn test_server_cookies() {
let res = req.send().await.unwrap(); let res = req.send().await.unwrap();
assert!(res.status().is_success()); assert!(res.status().is_success());
let first_cookie = Cookie::build("first", "first_value") {
.http_only(true) let first_cookie = Cookie::build("first", "first_value")
.finish(); .http_only(true)
let second_cookie = Cookie::new("second", "first_value"); .finish();
let second_cookie = Cookie::new("second", "first_value");
let cookies = res.cookies().expect("To have cookies"); let cookies = res.cookies().expect("To have cookies");
assert_eq!(cookies.len(), 3); assert_eq!(cookies.len(), 3);
if cookies[0] == first_cookie { if cookies[0] == first_cookie {
assert_eq!(cookies[1], second_cookie); assert_eq!(cookies[1], second_cookie);
} else { } else {
assert_eq!(cookies[0], second_cookie); assert_eq!(cookies[0], second_cookie);
assert_eq!(cookies[1], first_cookie); assert_eq!(cookies[1], first_cookie);
} }
let first_cookie = first_cookie.to_string(); let first_cookie = first_cookie.to_string();
let second_cookie = second_cookie.to_string(); let second_cookie = second_cookie.to_string();
// Check that we have exactly two instances of raw cookie headers // Check that we have exactly two instances of raw cookie headers
let cookies = res let cookies = res
.headers() .headers()
.get_all(http::header::SET_COOKIE) .get_all(http::header::SET_COOKIE)
.map(|header| header.to_str().expect("To str").to_string()) .map(|header| header.to_str().expect("To str").to_string())
.collect::<Vec<_>>(); .collect::<Vec<_>>();
assert_eq!(cookies.len(), 3); assert_eq!(cookies.len(), 3);
if cookies[0] == first_cookie { if cookies[0] == first_cookie {
assert_eq!(cookies[1], second_cookie); assert_eq!(cookies[1], second_cookie);
} else { } else {
assert_eq!(cookies[0], second_cookie); assert_eq!(cookies[0], second_cookie);
assert_eq!(cookies[1], first_cookie); assert_eq!(cookies[1], first_cookie);
}
} }
srv.stop().await; srv.stop().await;