Skip to content

Commit 8834d5a

Browse files
RalfJungseanmonstar
RalfJung
authored and
seanmonstar
committed
test(lib): fix tests with more feature combinations
1 parent ffbf610 commit 8834d5a

File tree

5 files changed

+54
-2
lines changed

5 files changed

+54
-2
lines changed

‎src/body/to_bytes.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use super::HttpBody;
1717
/// # Example
1818
///
1919
/// ```
20-
/// # #[cfg(all(feature = "client", any(feature = "http1", feature = "http2")))]
20+
/// # #[cfg(all(feature = "client", feature = "tcp", any(feature = "http1", feature = "http2")))]
2121
/// # async fn doc() -> hyper::Result<()> {
2222
/// use hyper::{body::HttpBody};
2323
///

‎src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#![deny(missing_debug_implementations)]
33
#![cfg_attr(test, deny(rust_2018_idioms))]
44
#![cfg_attr(all(test, feature = "full"), deny(unreachable_pub))]
5-
#![cfg_attr(test, deny(warnings))]
5+
#![cfg_attr(all(test, feature = "full"), deny(warnings))]
66
#![cfg_attr(all(test, feature = "nightly"), feature(test))]
77
#![cfg_attr(docsrs, feature(doc_cfg))]
88

‎src/proto/h1/io.rs

+3
Original file line numberDiff line numberDiff line change
@@ -727,8 +727,11 @@ mod tests {
727727
cached_headers: &mut None,
728728
req_method: &mut None,
729729
h1_parser_config: Default::default(),
730+
#[cfg(feature = "runtime")]
730731
h1_header_read_timeout: None,
732+
#[cfg(feature = "runtime")]
731733
h1_header_read_timeout_fut: &mut None,
734+
#[cfg(feature = "runtime")]
732735
h1_header_read_timeout_running: &mut false,
733736
preserve_header_case: false,
734737
h09_responses: false,

‎src/proto/h1/role.rs

+48
Original file line numberDiff line numberDiff line change
@@ -1474,8 +1474,11 @@ mod tests {
14741474
cached_headers: &mut None,
14751475
req_method: &mut method,
14761476
h1_parser_config: Default::default(),
1477+
#[cfg(feature = "runtime")]
14771478
h1_header_read_timeout: None,
1479+
#[cfg(feature = "runtime")]
14781480
h1_header_read_timeout_fut: &mut None,
1481+
#[cfg(feature = "runtime")]
14791482
h1_header_read_timeout_running: &mut false,
14801483
preserve_header_case: false,
14811484
h09_responses: false,
@@ -1504,8 +1507,11 @@ mod tests {
15041507
cached_headers: &mut None,
15051508
req_method: &mut Some(crate::Method::GET),
15061509
h1_parser_config: Default::default(),
1510+
#[cfg(feature = "runtime")]
15071511
h1_header_read_timeout: None,
1512+
#[cfg(feature = "runtime")]
15081513
h1_header_read_timeout_fut: &mut None,
1514+
#[cfg(feature = "runtime")]
15091515
h1_header_read_timeout_running: &mut false,
15101516
preserve_header_case: false,
15111517
h09_responses: false,
@@ -1529,8 +1535,11 @@ mod tests {
15291535
cached_headers: &mut None,
15301536
req_method: &mut None,
15311537
h1_parser_config: Default::default(),
1538+
#[cfg(feature = "runtime")]
15321539
h1_header_read_timeout: None,
1540+
#[cfg(feature = "runtime")]
15331541
h1_header_read_timeout_fut: &mut None,
1542+
#[cfg(feature = "runtime")]
15341543
h1_header_read_timeout_running: &mut false,
15351544
preserve_header_case: false,
15361545
h09_responses: false,
@@ -1552,8 +1561,11 @@ mod tests {
15521561
cached_headers: &mut None,
15531562
req_method: &mut Some(crate::Method::GET),
15541563
h1_parser_config: Default::default(),
1564+
#[cfg(feature = "runtime")]
15551565
h1_header_read_timeout: None,
1566+
#[cfg(feature = "runtime")]
15561567
h1_header_read_timeout_fut: &mut None,
1568+
#[cfg(feature = "runtime")]
15571569
h1_header_read_timeout_running: &mut false,
15581570
preserve_header_case: false,
15591571
h09_responses: true,
@@ -1577,8 +1589,11 @@ mod tests {
15771589
cached_headers: &mut None,
15781590
req_method: &mut Some(crate::Method::GET),
15791591
h1_parser_config: Default::default(),
1592+
#[cfg(feature = "runtime")]
15801593
h1_header_read_timeout: None,
1594+
#[cfg(feature = "runtime")]
15811595
h1_header_read_timeout_fut: &mut None,
1596+
#[cfg(feature = "runtime")]
15821597
h1_header_read_timeout_running: &mut false,
15831598
preserve_header_case: false,
15841599
h09_responses: false,
@@ -1606,8 +1621,11 @@ mod tests {
16061621
cached_headers: &mut None,
16071622
req_method: &mut Some(crate::Method::GET),
16081623
h1_parser_config,
1624+
#[cfg(feature = "runtime")]
16091625
h1_header_read_timeout: None,
1626+
#[cfg(feature = "runtime")]
16101627
h1_header_read_timeout_fut: &mut None,
1628+
#[cfg(feature = "runtime")]
16111629
h1_header_read_timeout_running: &mut false,
16121630
preserve_header_case: false,
16131631
h09_responses: false,
@@ -1632,8 +1650,11 @@ mod tests {
16321650
cached_headers: &mut None,
16331651
req_method: &mut Some(crate::Method::GET),
16341652
h1_parser_config: Default::default(),
1653+
#[cfg(feature = "runtime")]
16351654
h1_header_read_timeout: None,
1655+
#[cfg(feature = "runtime")]
16361656
h1_header_read_timeout_fut: &mut None,
1657+
#[cfg(feature = "runtime")]
16371658
h1_header_read_timeout_running: &mut false,
16381659
preserve_header_case: false,
16391660
h09_responses: false,
@@ -1653,8 +1674,11 @@ mod tests {
16531674
cached_headers: &mut None,
16541675
req_method: &mut None,
16551676
h1_parser_config: Default::default(),
1677+
#[cfg(feature = "runtime")]
16561678
h1_header_read_timeout: None,
1679+
#[cfg(feature = "runtime")]
16571680
h1_header_read_timeout_fut: &mut None,
1681+
#[cfg(feature = "runtime")]
16581682
h1_header_read_timeout_running: &mut false,
16591683
preserve_header_case: true,
16601684
h09_responses: false,
@@ -1695,8 +1719,11 @@ mod tests {
16951719
cached_headers: &mut None,
16961720
req_method: &mut None,
16971721
h1_parser_config: Default::default(),
1722+
#[cfg(feature = "runtime")]
16981723
h1_header_read_timeout: None,
1724+
#[cfg(feature = "runtime")]
16991725
h1_header_read_timeout_fut: &mut None,
1726+
#[cfg(feature = "runtime")]
17001727
h1_header_read_timeout_running: &mut false,
17011728
preserve_header_case: false,
17021729
h09_responses: false,
@@ -1718,8 +1745,11 @@ mod tests {
17181745
cached_headers: &mut None,
17191746
req_method: &mut None,
17201747
h1_parser_config: Default::default(),
1748+
#[cfg(feature = "runtime")]
17211749
h1_header_read_timeout: None,
1750+
#[cfg(feature = "runtime")]
17221751
h1_header_read_timeout_fut: &mut None,
1752+
#[cfg(feature = "runtime")]
17231753
h1_header_read_timeout_running: &mut false,
17241754
preserve_header_case: false,
17251755
h09_responses: false,
@@ -1950,8 +1980,11 @@ mod tests {
19501980
cached_headers: &mut None,
19511981
req_method: &mut Some(Method::GET),
19521982
h1_parser_config: Default::default(),
1983+
#[cfg(feature = "runtime")]
19531984
h1_header_read_timeout: None,
1985+
#[cfg(feature = "runtime")]
19541986
h1_header_read_timeout_fut: &mut None,
1987+
#[cfg(feature = "runtime")]
19551988
h1_header_read_timeout_running: &mut false,
19561989
preserve_header_case: false,
19571990
h09_responses: false,
@@ -1973,8 +2006,11 @@ mod tests {
19732006
cached_headers: &mut None,
19742007
req_method: &mut Some(m),
19752008
h1_parser_config: Default::default(),
2009+
#[cfg(feature = "runtime")]
19762010
h1_header_read_timeout: None,
2011+
#[cfg(feature = "runtime")]
19772012
h1_header_read_timeout_fut: &mut None,
2013+
#[cfg(feature = "runtime")]
19782014
h1_header_read_timeout_running: &mut false,
19792015
preserve_header_case: false,
19802016
h09_responses: false,
@@ -1996,8 +2032,11 @@ mod tests {
19962032
cached_headers: &mut None,
19972033
req_method: &mut Some(Method::GET),
19982034
h1_parser_config: Default::default(),
2035+
#[cfg(feature = "runtime")]
19992036
h1_header_read_timeout: None,
2037+
#[cfg(feature = "runtime")]
20002038
h1_header_read_timeout_fut: &mut None,
2039+
#[cfg(feature = "runtime")]
20012040
h1_header_read_timeout_running: &mut false,
20022041
preserve_header_case: false,
20032042
h09_responses: false,
@@ -2496,8 +2535,11 @@ mod tests {
24962535
cached_headers: &mut None,
24972536
req_method: &mut Some(Method::GET),
24982537
h1_parser_config: Default::default(),
2538+
#[cfg(feature = "runtime")]
24992539
h1_header_read_timeout: None,
2540+
#[cfg(feature = "runtime")]
25002541
h1_header_read_timeout_fut: &mut None,
2542+
#[cfg(feature = "runtime")]
25012543
h1_header_read_timeout_running: &mut false,
25022544
preserve_header_case: false,
25032545
h09_responses: false,
@@ -2583,8 +2625,11 @@ mod tests {
25832625
cached_headers: &mut headers,
25842626
req_method: &mut None,
25852627
h1_parser_config: Default::default(),
2628+
#[cfg(feature = "runtime")]
25862629
h1_header_read_timeout: None,
2630+
#[cfg(feature = "runtime")]
25872631
h1_header_read_timeout_fut: &mut None,
2632+
#[cfg(feature = "runtime")]
25882633
h1_header_read_timeout_running: &mut false,
25892634
preserve_header_case: false,
25902635
h09_responses: false,
@@ -2626,8 +2671,11 @@ mod tests {
26262671
cached_headers: &mut headers,
26272672
req_method: &mut None,
26282673
h1_parser_config: Default::default(),
2674+
#[cfg(feature = "runtime")]
26292675
h1_header_read_timeout: None,
2676+
#[cfg(feature = "runtime")]
26302677
h1_header_read_timeout_fut: &mut None,
2678+
#[cfg(feature = "runtime")]
26312679
h1_header_read_timeout_running: &mut false,
26322680
preserve_header_case: false,
26332681
h09_responses: false,

‎src/server/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@
9191
//! use std::net::SocketAddr;
9292
//! use hyper::{Body, Request, Response, Server};
9393
//! use hyper::service::{make_service_fn, service_fn};
94+
//! # #[cfg(feature = "runtime")]
9495
//! use hyper::server::conn::AddrStream;
9596
//!
9697
//! #[derive(Clone)]

0 commit comments

Comments
 (0)