diff --git a/actix-http/src/test.rs b/actix-http/src/test.rs index 4f6b88c09..8f0a7d21a 100644 --- a/actix-http/src/test.rs +++ b/actix-http/src/test.rs @@ -105,12 +105,13 @@ impl TestRequest { match header.try_into_header_pair() { Ok((key, value)) => { parts(&mut self.0).headers.insert(key, value); - return self; } Err(err) => { panic!("Error inserting test header: {}.", err.into()); } } + + self } /// Append a header, keeping any that were set with an equivalent field name. @@ -121,12 +122,13 @@ impl TestRequest { match header.try_into_header_pair() { Ok((key, value)) => { parts(&mut self.0).headers.append(key, value); - return self; } Err(err) => { panic!("Error inserting test header: {}.", err.into()); } } + + self } /// Set cookie for this request. diff --git a/actix-http/tests/test_rustls.rs b/actix-http/tests/test_rustls.rs index beae359d9..2f6b31f49 100644 --- a/actix-http/tests/test_rustls.rs +++ b/actix-http/tests/test_rustls.rs @@ -181,7 +181,7 @@ async fn test_h2_headers() { HttpService::build().h2(move |_| { let mut config = Response::Ok(); for idx in 0..90 { - config.header( + config.insert_header(( format!("X-TEST-{}", idx).as_str(), "TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST \ TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST \ @@ -196,7 +196,7 @@ async fn test_h2_headers() { TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST \ TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST \ TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST TEST ", - ); + )); } future::ok::<_, ()>(config.body(data.clone())) }) @@ -352,7 +352,7 @@ async fn test_h2_body_chunked_explicit() { let body = once(ok::<_, Error>(Bytes::from_static(STR.as_ref()))); ok::<_, ()>( Response::Ok() - .header(header::TRANSFER_ENCODING, "chunked") + .insert_header((header::TRANSFER_ENCODING, "chunked")) .streaming(body), ) }) @@ -380,7 +380,7 @@ async fn test_h2_response_http_error_handling() { let broken_header = Bytes::from_static(b"\0\0\0"); ok::<_, ()>( Response::Ok() - .header(http::header::CONTENT_TYPE, broken_header) + .insert_header((http::header::CONTENT_TYPE, broken_header)) .body(STR), ) }))