File: fix-tests.patch

package info (click to toggle)
rust-dockworker 0.7.0-2
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 920 kB
  • sloc: makefile: 2
file content (44 lines) | stat: -rw-r--r-- 1,795 bytes parent folder | download | duplicates (2)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
--- a/src/hyper_client.rs
+++ b/src/hyper_client.rs
@@ -9,9 +9,9 @@
 #[derive(Clone, Debug)]
 enum Client {
     HttpClient(hyper::Client<hyper::client::HttpConnector>),
-    #[cfg(feature = "openssl")]
+    #[cfg(all(feature = "openssl", feature = "hyper-tls"))]
     HttpsClient(hyper::Client<hyper_tls::HttpsConnector<hyper::client::HttpConnector>>),
-    #[cfg(feature = "rustls")]
+    #[cfg(all(feature = "rustls", feature = "hyper-rustls"))]
     HttpsClient(hyper::Client<hyper_rustls::HttpsConnector<hyper::client::HttpConnector>>),
     #[cfg(unix)]
     UnixClient(hyper::Client<hyperlocal::UnixConnector>),
@@ -21,9 +21,9 @@
     fn request(&self, req: Request<hyper::Body>) -> hyper::client::ResponseFuture {
         match self {
             Client::HttpClient(http_client) => http_client.request(req),
-            #[cfg(feature = "openssl")]
+            #[cfg(all(feature = "openssl", feature = "hyper-tls"))]
             Client::HttpsClient(https_client) => https_client.request(req),
-            #[cfg(feature = "rustls")]
+            #[cfg(all(feature = "rustls", feature = "hyper-rustls"))]
             Client::HttpsClient(https_client) => https_client.request(req),
             #[cfg(unix)]
             Client::UnixClient(unix_client) => unix_client.request(req),
@@ -144,7 +144,7 @@
         Self::new(Client::UnixClient(client), url)
     }
 
-    #[cfg(feature = "openssl")]
+    #[cfg(all(feature = "openssl", feature = "hyper-tls"))]
     pub fn connect_with_ssl(
         addr: &str,
         key: &Path,
@@ -178,7 +178,7 @@
         Ok(Self::new(Client::HttpsClient(client), url))
     }
 
-    #[cfg(feature = "rustls")]
+    #[cfg(all(feature = "rustls", feature = "rustls-pemfile"))]
     pub fn connect_with_ssl(
         addr: &str,
         key: &Path,