Re-order test module items

Author: djc

src/connector.rs

@@ -219,22 +219,35 @@ mod tests {
     use super::HttpsConnector;
     use crate::{ConfigBuilderExt, HttpsConnectorBuilder};
 
-    fn tls_config() -> rustls::ClientConfig {
-        #[cfg(feature = "rustls-platform-verifier")]
-        return rustls::ClientConfig::builder()
-            .with_platform_verifier()
-            .with_no_client_auth();
+    #[tokio::test]
+    async fn connects_https() {
+        oneshot(https_or_http_connector(), https_uri())
+            .await
+            .unwrap();
+    }
 
-        #[cfg(feature = "rustls-native-certs")]
-        return rustls::ClientConfig::builder()
-            .with_native_roots()
-            .unwrap()
-            .with_no_client_auth();
+    #[tokio::test]
+    async fn connects_http() {
+        oneshot(https_or_http_connector(), http_uri())
+            .await
+            .unwrap();
+    }
 
-        #[cfg(feature = "webpki-roots")]
-        return rustls::ClientConfig::builder()
-            .with_webpki_roots()
-            .with_no_client_auth();
+    #[tokio::test]
+    async fn connects_https_only() {
+        oneshot(https_only_connector(), https_uri())
+            .await
+            .unwrap();
+    }
+
+    #[tokio::test]
+    async fn enforces_https_only() {
+        let message = oneshot(https_only_connector(), http_uri())
+            .await
+            .unwrap_err()
+            .to_string();
+
+        assert_eq!(message, "unsupported scheme http");
     }
 
     fn https_or_http_connector() -> HttpsConnector<HttpConnector> {
@@ -253,6 +266,24 @@ mod tests {
             .build()
     }
 
+    fn tls_config() -> rustls::ClientConfig {
+        #[cfg(feature = "rustls-platform-verifier")]
+        return rustls::ClientConfig::builder()
+            .with_platform_verifier()
+            .with_no_client_auth();
+
+        #[cfg(feature = "rustls-native-certs")]
+        return rustls::ClientConfig::builder()
+            .with_native_roots()
+            .unwrap()
+            .with_no_client_auth();
+
+        #[cfg(feature = "webpki-roots")]
+        return rustls::ClientConfig::builder()
+            .with_webpki_roots()
+            .with_no_client_auth();
+    }
+
     async fn oneshot<S, Req>(mut service: S, req: Req) -> Result<S::Response, S::Error>
     where
         S: Service<Req>,
@@ -268,35 +299,4 @@ mod tests {
     fn http_uri() -> Uri {
         Uri::from_static("http://google.com")
     }
-
-    #[tokio::test]
-    async fn connects_https() {
-        oneshot(https_or_http_connector(), https_uri())
-            .await
-            .unwrap();
-    }
-
-    #[tokio::test]
-    async fn connects_http() {
-        oneshot(https_or_http_connector(), http_uri())
-            .await
-            .unwrap();
-    }
-
-    #[tokio::test]
-    async fn connects_https_only() {
-        oneshot(https_only_connector(), https_uri())
-            .await
-            .unwrap();
-    }
-
-    #[tokio::test]
-    async fn enforces_https_only() {
-        let message = oneshot(https_only_connector(), http_uri())
-            .await
-            .unwrap_err()
-            .to_string();
-
-        assert_eq!(message, "unsupported scheme http");
-    }
 }