try to fix doc test failures (#2284)

.cargo/config.toml

@@ -3,6 +3,7 @@ chk = "check --workspace --all-features --tests --examples --bins"
 lint = "clippy --workspace --tests --examples"
 ci-min = "hack check --workspace --no-default-features"
 ci-min-test = "hack check --workspace --no-default-features --tests --examples"
-ci-default = "hack check --workspace"
+ci-default = "check --workspace --bins --tests --examples"
-ci-full = "check --workspace --bins --examples --tests"
+ci-full = "check --workspace --all-features --bins --tests --examples"
-ci-test = "test --workspace --all-features --no-fail-fast"
+ci-test = "test --workspace --all-features --lib --tests --no-fail-fast -- --nocapture"
+ci-doctest = "hack test --workspace --all-features --doc --no-fail-fast -- --nocapture"

.github/workflows/ci.yml

@@ -66,43 +66,33 @@ jobs:
 
       - name: check minimal
         uses: actions-rs/cargo@v1
-        with:
+        with: { command: ci-min }
-          command: hack
-          args: check --workspace --no-default-features
 
       - name: check minimal + tests
         uses: actions-rs/cargo@v1
-        with:
+        with: { command: ci-min-test }
-          command: hack
+
-          args: check --workspace --no-default-features --tests --examples
+      - name: check default
+        uses: actions-rs/cargo@v1
+        with: { command: ci-default }
       
       - name: check full
         uses: actions-rs/cargo@v1
-        with:
+        with: { command: ci-full }
-          command: check
-          args: --workspace --bins --examples --tests
 
       - name: tests
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --workspace --all-features --no-fail-fast -- --nocapture
-            --skip=test_h2_content_length
-            --skip=test_reading_deflate_encoding_large_random_rustls
-
-      - name: tests (actix-http)
         uses: actions-rs/cargo@v1
         timeout-minutes: 40
         with:
-          command: test
+          command: ci-test
-          args: --package=actix-http --no-default-features --features=rustls -- --nocapture
+          args: --skip=test_reading_deflate_encoding_large_random_rustls
 
-      - name: tests (awc)
+      - name: doc tests
+        # due to unknown issue with running doc tests on macOS
+        if: matrix.target.os == 'ubuntu-latest'
         uses: actions-rs/cargo@v1
         timeout-minutes: 40
-        with:
+        with: { command: ci-doctest }
-          command: test
-          args: --package=awc --no-default-features --features=rustls -- --nocapture
 
       - name: Generate coverage file
         if: >

.github/workflows/clippy-fmt.yml

@@ -36,4 +36,4 @@ jobs:
         uses: actions-rs/clippy-check@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          args: --workspace --tests --all-features
+          args: --workspace --all-features --tests

tests/test_server.rs

@@ -879,7 +879,7 @@ async fn test_brotli_encoding_large_openssl() {
     assert_eq!(bytes, Bytes::from(data));
 }
 
-#[cfg(all(feature = "rustls", feature = "openssl"))]
+#[cfg(feature = "rustls")]
 mod plus_rustls {
     use std::io::BufReader;