Merge branch 'jbp-improve-ci-2' into main

Author: ctz

.azure-pipelines.yml

@@ -1,17 +1,23 @@
+name: rustls
+
+permissions:
+  contents: read
+
 on: [push, pull_request]
-name: hyper-rustls
 
 jobs:
   build:
-    name: "Build and test"
+    name: Build+test
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         # test a bunch of toolchains on ubuntu
         rust:
           - stable
           - beta
           - nightly
+          - 1.50.0
         os: [ubuntu-18.04]
         # but only stable on macos/windows (slower platforms)
         include:
@@ -22,13 +28,18 @@ jobs:
     steps:
       - name: Checkout sources
         uses: actions/checkout@v2
+        with:
+          persist-credentials: false
 
       - name: Install ${{ matrix.rust }} toolchain
         uses: actions-rs/toolchain@v1
         with:
           toolchain: ${{ matrix.rust }}
           override: true
 
+      - name: cargo check (default features)
+        run: cargo check --all-targets
+
       - name: cargo test (debug; default features)
         run: cargo test
         env:
@@ -41,10 +52,81 @@ jobs:
 
       - name: cargo test (debug; webpki-tokio only)
         run: cargo test --no-default-features --features webpki-tokio
+        env:
+          RUST_BACKTRACE: 1
+
+      - name: cargo test (debug; all features)
+        run: cargo test --all-features
+        env:
+          RUST_BACKTRACE: 1
+
+      - name: cargo build (debug; no default features)
+        run: cargo build --no-default-features
+
+      - name: cargo test (debug; no default features; no run)
+        run: cargo test --no-default-features --no-run
+
+      - name: cargo test (release; no run)
+        run: cargo test --release --no-run
+
+  docs:
+    name: Check for documentation errors
+    runs-on: ubuntu-18.04
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v2
+        with:
+          persist-credentials: false
+
+      - name: Install rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: nightly
+          override: true
+          default: true
 
-      - name: cargo test (debug; no default features)
-        run: cargo test --no-default-features
+      - name: cargo doc (all features)
+        run: cargo doc --all-features --no-deps
+        env:
+          RUSTDOCFLAGS: -Dwarnings
 
-      - name: cargo test (release)
-        run: cargo test --release
+  format:
+    name: Format
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v2
+        with:
+          persist-credentials: false
+      - name: Install rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
+          default: true
+          components: rustfmt
+      - name: Check formatting
+        uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --all -- --check
 
+  clippy:
+    name: Clippy
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v2
+        with:
+          persist-credentials: false
+      - name: Install rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
+          default: true
+          components: clippy
+      - uses: actions-rs/cargo@v1
+        with:
+          command: clippy
+          args: --all-features -- -D warnings

.github/workflows/build.yml

@@ -0,0 +1 @@
+chain_width=40

.rustfmt.toml

@@ -3,7 +3,6 @@ This is an integration between the [rustls TLS stack](https://github.com/ctz/rus
 and the [hyper HTTP library](https://github.com/hyperium/hyper).
 
 [![Build Status](https://github.com/ctz/hyper-rustls/workflows/hyper-rustls/badge.svg)](https://github.com/ctz/hyper-rustls/actions)
-[![Build Status](https://dev.azure.com/ctz99/ctz/_apis/build/status/ctz.hyper-rustls?branchName=master)](https://dev.azure.com/ctz99/ctz/_build/latest?definitionId=4&branchName=master)
 [![Crate](https://img.shields.io/crates/v/hyper-rustls.svg)](https://crates.io/crates/hyper-rustls)
 [![Documentation](https://docs.rs/hyper-rustls/badge.svg)](https://docs.rs/hyper-rustls/)
 

README.md

@@ -109,7 +109,10 @@ fn load_certs(filename: &str) -> io::Result<Vec<rustls::Certificate>> {
     // Load and return certificate.
     let certs = rustls_pemfile::certs(&mut reader)
         .map_err(|_| error("failed to load certificate".into()))?;
-    Ok(certs.into_iter().map(rustls::Certificate).collect())
+    Ok(certs
+        .into_iter()
+        .map(rustls::Certificate)
+        .collect())
 }
 
 // Load private key from file.

examples/server.rs

@@ -54,13 +54,18 @@ impl ConfigBuilderExt for ConfigBuilder<ClientConfig, WantsVerifier> {
     #[cfg_attr(docsrs, doc(cfg(feature = "webpki-roots")))]
     fn with_webpki_roots(self) -> ConfigBuilder<ClientConfig, WantsTransparencyPolicyOrClientCert> {
         let mut roots = rustls::RootCertStore::empty();
-        roots.add_server_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.0.iter().map(|ta| {
-            rustls::OwnedTrustAnchor::from_subject_spki_name_constraints(
-                ta.subject,
-                ta.spki,
-                ta.name_constraints,
-            )
-        }));
+        roots.add_server_trust_anchors(
+            webpki_roots::TLS_SERVER_ROOTS
+                .0
+                .iter()
+                .map(|ta| {
+                    rustls::OwnedTrustAnchor::from_subject_spki_name_constraints(
+                        ta.subject,
+                        ta.spki,
+                        ta.name_constraints,
+                    )
+                }),
+        );
         self.with_root_certificates(roots)
     }
 }

src/config.rs

@@ -74,18 +74,25 @@ where
                 let connecting_future = self.http.call(dst);
 
                 let f = async move {
-                    let tcp = connecting_future.await.map_err(Into::into)?;
+                    let tcp = connecting_future
+                        .await
+                        .map_err(Into::into)?;
 
                     Ok(MaybeHttpsStream::Http(tcp))
                 };
                 Box::pin(f)
             } else if sch == &http::uri::Scheme::HTTPS {
                 let cfg = self.tls_config.clone();
-                let hostname = dst.host().unwrap_or_default().to_string();
+                let hostname = dst
+                    .host()
+                    .unwrap_or_default()
+                    .to_string();
                 let connecting_future = self.http.call(dst);
 
                 let f = async move {
-                    let tcp = connecting_future.await.map_err(Into::into)?;
+                    let tcp = connecting_future
+                        .await
+                        .map_err(Into::into)?;
                     let connector = TlsConnector::from(cfg);
                     let dnsname = rustls::ServerName::try_from(hostname.as_str())
                         .map_err(|_| io::Error::new(io::ErrorKind::Other, "invalid dnsname"))?;

src/connector.rs

@@ -284,7 +284,10 @@ mod tests {
             .https_only()
             .enable_http1()
             .build();
-        assert!(connector.tls_config.alpn_protocols.is_empty());
+        assert!(connector
+            .tls_config
+            .alpn_protocols
+            .is_empty());
         let connector = HttpsConnectorBuilder::new()
             .with_tls_config(tls_config.clone())
             .https_only()