forked/hyper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test(lib): fix tests with more feature combinations

Browse Source
This commit is contained in:
Ralf Jung
2022-03-27 14:43:00 -04:00
committed by Sean McArthur
parent ffbf610b16
commit 8834d5a2a7
5 changed files with 54 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/body/to_bytes.rs
View File

@@ -17,7 +17,7 @@ use super::HttpBody;
/// # Example /// # Example
/// ///
/// ``` /// ```
/// # #[cfg(all(feature = "client", any(feature = "http1", feature = "http2")))] /// # #[cfg(all(feature = "client", feature = "tcp", any(feature = "http1", feature = "http2")))]
/// # async fn doc() -> hyper::Result<()> { /// # async fn doc() -> hyper::Result<()> {
/// use hyper::{body::HttpBody}; /// use hyper::{body::HttpBody};
/// ///

2
src/lib.rs
View File

@@ -2,7 +2,7 @@
#![deny(missing_debug_implementations)] #![deny(missing_debug_implementations)]
#![cfg_attr(test, deny(rust_2018_idioms))] #![cfg_attr(test, deny(rust_2018_idioms))]
#![cfg_attr(all(test, feature = "full"), deny(unreachable_pub))] #![cfg_attr(all(test, feature = "full"), deny(unreachable_pub))]
#![cfg_attr(test, deny(warnings))] #![cfg_attr(all(test, feature = "full"), deny(warnings))]
#![cfg_attr(all(test, feature = "nightly"), feature(test))] #![cfg_attr(all(test, feature = "nightly"), feature(test))]
#![cfg_attr(docsrs, feature(doc_cfg))] #![cfg_attr(docsrs, feature(doc_cfg))]

3
src/proto/h1/io.rs
View File

@@ -727,8 +727,11 @@ mod tests {
cached_headers: &mut None, cached_headers: &mut None,
req_method: &mut None, req_method: &mut None,
h1_parser_config: Default::default(), h1_parser_config: Default::default(),
#[cfg(feature = "runtime")]
h1_header_read_timeout: None, h1_header_read_timeout: None,
#[cfg(feature = "runtime")]
h1_header_read_timeout_fut: &mut None, h1_header_read_timeout_fut: &mut None,
#[cfg(feature = "runtime")]
h1_header_read_timeout_running: &mut false, h1_header_read_timeout_running: &mut false,
preserve_header_case: false, preserve_header_case: false,
h09_responses: false, h09_responses: false,

48
src/proto/h1/role.rs
View File

@@ -1474,8 +1474,11 @@ mod tests {
cached_headers: &mut None, cached_headers: &mut None,
req_method: &mut method, req_method: &mut method,
h1_parser_config: Default::default(), h1_parser_config: Default::default(),
#[cfg(feature = "runtime")]
h1_header_read_timeout: None, h1_header_read_timeout: None,
#[cfg(feature = "runtime")]
h1_header_read_timeout_fut: &mut None, h1_header_read_timeout_fut: &mut None,
#[cfg(feature = "runtime")]
h1_header_read_timeout_running: &mut false, h1_header_read_timeout_running: &mut false,
preserve_header_case: false, preserve_header_case: false,
h09_responses: false, h09_responses: false,
@@ -1504,8 +1507,11 @@ mod tests {
cached_headers: &mut None, cached_headers: &mut None,
req_method: &mut Some(crate::Method::GET), req_method: &mut Some(crate::Method::GET),
h1_parser_config: Default::default(), h1_parser_config: Default::default(),
#[cfg(feature = "runtime")]
h1_header_read_timeout: None, h1_header_read_timeout: None,
#[cfg(feature = "runtime")]
h1_header_read_timeout_fut: &mut None, h1_header_read_timeout_fut: &mut None,
#[cfg(feature = "runtime")]
h1_header_read_timeout_running: &mut false, h1_header_read_timeout_running: &mut false,
preserve_header_case: false, preserve_header_case: false,
h09_responses: false, h09_responses: false,
@@ -1529,8 +1535,11 @@ mod tests {
cached_headers: &mut None, cached_headers: &mut None,
req_method: &mut None, req_method: &mut None,
h1_parser_config: Default::default(), h1_parser_config: Default::default(),
#[cfg(feature = "runtime")]
h1_header_read_timeout: None, h1_header_read_timeout: None,
#[cfg(feature = "runtime")]
h1_header_read_timeout_fut: &mut None, h1_header_read_timeout_fut: &mut None,
#[cfg(feature = "runtime")]
h1_header_read_timeout_running: &mut false, h1_header_read_timeout_running: &mut false,
preserve_header_case: false, preserve_header_case: false,
h09_responses: false, h09_responses: false,
@@ -1552,8 +1561,11 @@ mod tests {
cached_headers: &mut None, cached_headers: &mut None,
req_method: &mut Some(crate::Method::GET), req_method: &mut Some(crate::Method::GET),
h1_parser_config: Default::default(), h1_parser_config: Default::default(),
#[cfg(feature = "runtime")]
h1_header_read_timeout: None, h1_header_read_timeout: None,
#[cfg(feature = "runtime")]
h1_header_read_timeout_fut: &mut None, h1_header_read_timeout_fut: &mut None,
#[cfg(feature = "runtime")]
h1_header_read_timeout_running: &mut false, h1_header_read_timeout_running: &mut false,
preserve_header_case: false, preserve_header_case: false,
h09_responses: true, h09_responses: true,
@@ -1577,8 +1589,11 @@ mod tests {
cached_headers: &mut None, cached_headers: &mut None,
req_method: &mut Some(crate::Method::GET), req_method: &mut Some(crate::Method::GET),
h1_parser_config: Default::default(), h1_parser_config: Default::default(),
#[cfg(feature = "runtime")]
h1_header_read_timeout: None, h1_header_read_timeout: None,
#[cfg(feature = "runtime")]
h1_header_read_timeout_fut: &mut None, h1_header_read_timeout_fut: &mut None,
#[cfg(feature = "runtime")]
h1_header_read_timeout_running: &mut false, h1_header_read_timeout_running: &mut false,
preserve_header_case: false, preserve_header_case: false,
h09_responses: false, h09_responses: false,
@@ -1606,8 +1621,11 @@ mod tests {
cached_headers: &mut None, cached_headers: &mut None,
req_method: &mut Some(crate::Method::GET), req_method: &mut Some(crate::Method::GET),
h1_parser_config, h1_parser_config,
#[cfg(feature = "runtime")]
h1_header_read_timeout: None, h1_header_read_timeout: None,
#[cfg(feature = "runtime")]
h1_header_read_timeout_fut: &mut None, h1_header_read_timeout_fut: &mut None,
#[cfg(feature = "runtime")]
h1_header_read_timeout_running: &mut false, h1_header_read_timeout_running: &mut false,
preserve_header_case: false, preserve_header_case: false,
h09_responses: false, h09_responses: false,
@@ -1632,8 +1650,11 @@ mod tests {
cached_headers: &mut None, cached_headers: &mut None,
req_method: &mut Some(crate::Method::GET), req_method: &mut Some(crate::Method::GET),
h1_parser_config: Default::default(), h1_parser_config: Default::default(),
#[cfg(feature = "runtime")]
h1_header_read_timeout: None, h1_header_read_timeout: None,
#[cfg(feature = "runtime")]
h1_header_read_timeout_fut: &mut None, h1_header_read_timeout_fut: &mut None,
#[cfg(feature = "runtime")]
h1_header_read_timeout_running: &mut false, h1_header_read_timeout_running: &mut false,
preserve_header_case: false, preserve_header_case: false,
h09_responses: false, h09_responses: false,
@@ -1653,8 +1674,11 @@ mod tests {
cached_headers: &mut None, cached_headers: &mut None,
req_method: &mut None, req_method: &mut None,
h1_parser_config: Default::default(), h1_parser_config: Default::default(),
#[cfg(feature = "runtime")]
h1_header_read_timeout: None, h1_header_read_timeout: None,
#[cfg(feature = "runtime")]
h1_header_read_timeout_fut: &mut None, h1_header_read_timeout_fut: &mut None,
#[cfg(feature = "runtime")]
h1_header_read_timeout_running: &mut false, h1_header_read_timeout_running: &mut false,
preserve_header_case: true, preserve_header_case: true,
h09_responses: false, h09_responses: false,
@@ -1695,8 +1719,11 @@ mod tests {
cached_headers: &mut None, cached_headers: &mut None,
req_method: &mut None, req_method: &mut None,
h1_parser_config: Default::default(), h1_parser_config: Default::default(),
#[cfg(feature = "runtime")]
h1_header_read_timeout: None, h1_header_read_timeout: None,
#[cfg(feature = "runtime")]
h1_header_read_timeout_fut: &mut None, h1_header_read_timeout_fut: &mut None,
#[cfg(feature = "runtime")]
h1_header_read_timeout_running: &mut false, h1_header_read_timeout_running: &mut false,
preserve_header_case: false, preserve_header_case: false,
h09_responses: false, h09_responses: false,
@@ -1718,8 +1745,11 @@ mod tests {
cached_headers: &mut None, cached_headers: &mut None,
req_method: &mut None, req_method: &mut None,
h1_parser_config: Default::default(), h1_parser_config: Default::default(),
#[cfg(feature = "runtime")]
h1_header_read_timeout: None, h1_header_read_timeout: None,
#[cfg(feature = "runtime")]
h1_header_read_timeout_fut: &mut None, h1_header_read_timeout_fut: &mut None,
#[cfg(feature = "runtime")]
h1_header_read_timeout_running: &mut false, h1_header_read_timeout_running: &mut false,
preserve_header_case: false, preserve_header_case: false,
h09_responses: false, h09_responses: false,
@@ -1950,8 +1980,11 @@ mod tests {
cached_headers: &mut None, cached_headers: &mut None,
req_method: &mut Some(Method::GET), req_method: &mut Some(Method::GET),
h1_parser_config: Default::default(), h1_parser_config: Default::default(),
#[cfg(feature = "runtime")]
h1_header_read_timeout: None, h1_header_read_timeout: None,
#[cfg(feature = "runtime")]
h1_header_read_timeout_fut: &mut None, h1_header_read_timeout_fut: &mut None,
#[cfg(feature = "runtime")]
h1_header_read_timeout_running: &mut false, h1_header_read_timeout_running: &mut false,
preserve_header_case: false, preserve_header_case: false,
h09_responses: false, h09_responses: false,
@@ -1973,8 +2006,11 @@ mod tests {
cached_headers: &mut None, cached_headers: &mut None,
req_method: &mut Some(m), req_method: &mut Some(m),
h1_parser_config: Default::default(), h1_parser_config: Default::default(),
#[cfg(feature = "runtime")]
h1_header_read_timeout: None, h1_header_read_timeout: None,
#[cfg(feature = "runtime")]
h1_header_read_timeout_fut: &mut None, h1_header_read_timeout_fut: &mut None,
#[cfg(feature = "runtime")]
h1_header_read_timeout_running: &mut false, h1_header_read_timeout_running: &mut false,
preserve_header_case: false, preserve_header_case: false,
h09_responses: false, h09_responses: false,
@@ -1996,8 +2032,11 @@ mod tests {
cached_headers: &mut None, cached_headers: &mut None,
req_method: &mut Some(Method::GET), req_method: &mut Some(Method::GET),
h1_parser_config: Default::default(), h1_parser_config: Default::default(),
#[cfg(feature = "runtime")]
h1_header_read_timeout: None, h1_header_read_timeout: None,
#[cfg(feature = "runtime")]
h1_header_read_timeout_fut: &mut None, h1_header_read_timeout_fut: &mut None,
#[cfg(feature = "runtime")]
h1_header_read_timeout_running: &mut false, h1_header_read_timeout_running: &mut false,
preserve_header_case: false, preserve_header_case: false,
h09_responses: false, h09_responses: false,
@@ -2496,8 +2535,11 @@ mod tests {
cached_headers: &mut None, cached_headers: &mut None,
req_method: &mut Some(Method::GET), req_method: &mut Some(Method::GET),
h1_parser_config: Default::default(), h1_parser_config: Default::default(),
#[cfg(feature = "runtime")]
h1_header_read_timeout: None, h1_header_read_timeout: None,
#[cfg(feature = "runtime")]
h1_header_read_timeout_fut: &mut None, h1_header_read_timeout_fut: &mut None,
#[cfg(feature = "runtime")]
h1_header_read_timeout_running: &mut false, h1_header_read_timeout_running: &mut false,
preserve_header_case: false, preserve_header_case: false,
h09_responses: false, h09_responses: false,
@@ -2583,8 +2625,11 @@ mod tests {
cached_headers: &mut headers, cached_headers: &mut headers,
req_method: &mut None, req_method: &mut None,
h1_parser_config: Default::default(), h1_parser_config: Default::default(),
#[cfg(feature = "runtime")]
h1_header_read_timeout: None, h1_header_read_timeout: None,
#[cfg(feature = "runtime")]
h1_header_read_timeout_fut: &mut None, h1_header_read_timeout_fut: &mut None,
#[cfg(feature = "runtime")]
h1_header_read_timeout_running: &mut false, h1_header_read_timeout_running: &mut false,
preserve_header_case: false, preserve_header_case: false,
h09_responses: false, h09_responses: false,
@@ -2626,8 +2671,11 @@ mod tests {
cached_headers: &mut headers, cached_headers: &mut headers,
req_method: &mut None, req_method: &mut None,
h1_parser_config: Default::default(), h1_parser_config: Default::default(),
#[cfg(feature = "runtime")]
h1_header_read_timeout: None, h1_header_read_timeout: None,
#[cfg(feature = "runtime")]
h1_header_read_timeout_fut: &mut None, h1_header_read_timeout_fut: &mut None,
#[cfg(feature = "runtime")]
h1_header_read_timeout_running: &mut false, h1_header_read_timeout_running: &mut false,
preserve_header_case: false, preserve_header_case: false,
h09_responses: false, h09_responses: false,

1
src/server/mod.rs
View File

@@ -91,6 +91,7 @@
//! use std::net::SocketAddr; //! use std::net::SocketAddr;
//! use hyper::{Body, Request, Response, Server}; //! use hyper::{Body, Request, Response, Server};
//! use hyper::service::{make_service_fn, service_fn}; //! use hyper::service::{make_service_fn, service_fn};
//! # #[cfg(feature = "runtime")]
//! use hyper::server::conn::AddrStream; //! use hyper::server::conn::AddrStream;
//! //!
//! #[derive(Clone)] //! #[derive(Clone)]