Merge branch 'master' into feat/776-workspace-dependencies

Author: tobz

Diff for: .github/workflows/CI.yml

@@ -14,26 +14,16 @@ jobs:
     # Run `cargo check` first to ensure that the pushed code at least compiles.
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@master
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          override: true
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
       - name: Check
-        uses: actions-rs/cargo@v1
-        with:
-          command: check
-          args: --workspace --all-features --all-targets
+        run: cargo check --workspace --all-features --all-targets
 
   check-docs:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@master
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
       - name: cargo doc
         working-directory: ${{ matrix.subcrate }}
         env:
@@ -43,38 +33,25 @@ jobs:
   check-msrv:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v4
       - name: "install Rust ${{ env.MSRV }}"
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ env.MSRV }}
-          profile: minimal
       - name: "install Rust nightly"
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: nightly
-          profile: minimal
+        uses: dtolnay/rust-toolchain@nightly
       - name: Select minimal versions
-        uses: actions-rs/cargo@v1
-        with:
-          command: update
-          args: -Z minimal-versions
-          toolchain: nightly
+        run: cargo update -Z minimal-versions
       - name: Check
-        uses: actions-rs/cargo@v1
-        with:
-          command: check
-          args: --all --all-targets --all-features --locked
-          toolchain: ${{ env.MSRV }}
+        run: |
+          rustup default ${{ env.MSRV }}
+          cargo check --all --all-targets --all-features --locked
 
   cargo-hack:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@master
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
       - name: install cargo-hack
         uses: taiki-e/install-action@cargo-hack
       - name: cargo hack check
@@ -93,68 +70,48 @@ jobs:
       matrix:
         rust: [stable, beta, nightly]
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v4
       - name: "install Rust ${{ matrix.rust }}"
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.rust }}
-          profile: minimal
-          override: true
       - name: Run tests
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --workspace --all-features
+        run: cargo test --workspace --all-features
 
   test-msrv:
     needs: check-msrv
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v4
       - name: "install Rust ${{ env.MSRV }}"
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ env.MSRV }}
-          profile: minimal
       - name: "install Rust nightly"
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: nightly
-          profile: minimal
+        uses: dtolnay/rust-toolchain@nightly
       - name: Select minimal versions
-        uses: actions-rs/cargo@v1
-        with:
-          command: update
-          args: -Z minimal-versions
-          toolchain: nightly
+        run: cargo update -Z minimal-versions
       - name: test
-        uses: actions-rs/cargo@v1
-        with:
-          command: check
-          args: --workspace --all-features --locked
-          toolchain: ${{ env.MSRV }}
+        run: |
+          rustup default ${{ env.MSRV }}
+          cargo check --workspace --all-features --locked
 
   style:
     needs: check-stable
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@master
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: stable
           components: rustfmt
-          profile: minimal
       - name: rustfmt
-        uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
+        run: cargo fmt --all -- --check
 
   deny-check:
     name: cargo-deny check
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
       - uses: EmbarkStudios/cargo-deny-action@v1
         with:
           command: check

Diff for: .github/workflows/publish.yml

@@ -12,19 +12,13 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
       - name: Install nightly Rust
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@master
         with:
           toolchain: nightly
-          profile: minimal
       - name: Generate documentation
-        uses: actions-rs/cargo@v1
-        with:
-          command: doc
-          args: --workspace --no-deps --all-features
-          # Tower uses nightly-only RustDoc features
-          toolchain: nightly
+        run: cargo doc --workspace --no-deps --all-features
         env:
           # Enable the RustDoc `#[doc(cfg(...))]` attribute.
           RUSTDOCFLAGS: --cfg docsrs
@@ -36,4 +30,3 @@ jobs:
           build_dir: target/doc
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-

Diff for: .github/workflows/release.yml

@@ -13,7 +13,7 @@ jobs:
     if: github.repository_owner == 'tower-rs'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: taiki-e/[email protected]
         with:
           prefix: "(tower)|(tower-[a-z]+)"

Diff for: examples/Cargo.toml

@@ -8,11 +8,11 @@ edition = "2018"
 # [dependencies] instead.
 [dev-dependencies]
 tower = { version = "0.4", path = "../tower", features = ["full"] }
-tower-service = "0.3" 
+tower-service = "0.3"
 tokio = { version = "1.0", features = ["full"] }
 rand = "0.8"
 pin-project = "1.0"
-futures = "0.3"
+futures = "0.3.22"
 tracing = "0.1"
 tracing-subscriber = "0.2"
 hdrhistogram = "7"

Diff for: tower/src/lib.rs

@@ -22,7 +22,7 @@
 //! response or an error. This abstraction can be used to model both clients and
 //! servers.
 //!
-//! Generic components, like [timeouts], [rate limiting], and [load balancing],
+//! Generic components, like [`timeout`], [rate limiting], and [load balancing],
 //! can be modeled as [`Service`]s that wrap some inner service and apply
 //! additional behavior before or after the inner service is called. This allows
 //! implementing these components in a protocol-agnostic, composable way. Typically,
@@ -130,7 +130,7 @@
 //! ```
 //!
 //! Alternatively, you can only enable some features. For example, to enable
-//! only the [`retry`] and [`timeout`][timeouts] middleware, write:
+//! only the [`retry`] and [`timeout`] middleware, write:
 //!
 //! ```toml
 //! tower = { version = "0.4", features = ["retry", "timeout"] }
@@ -148,7 +148,6 @@
 //!
 //! [`Service`]: crate::Service
 //! [`Layer`]: crate::Layer
-//! [timeouts]: crate::timeout
 //! [rate limiting]: crate::limit::rate
 //! [load balancing]: crate::balance
 //! [`ServiceBuilder`]: crate::ServiceBuilder

Diff for: tower/src/load/pending_requests.rs

@@ -45,6 +45,7 @@ pub struct Count(usize);
 
 /// Tracks an in-flight request by reference count.
 #[derive(Debug)]
+#[allow(dead_code)]
 pub struct Handle(RefCount);
 
 // ===== impl PendingRequests =====

Diff for: tower/src/util/call_all/ordered.rs

@@ -168,7 +168,7 @@ impl<F: Future> common::Drive<F> for FuturesOrdered<F> {
     }
 
     fn push(&mut self, future: F) {
-        FuturesOrdered::push(self, future)
+        FuturesOrdered::push_back(self, future)
     }
 
     fn poll(&mut self, cx: &mut Context<'_>) -> Poll<Option<F::Output>> {

Diff for: tower/src/util/rng.rs

@@ -174,7 +174,7 @@ mod tests {
         let mut r = HasherRng::default();
         match super::sample_floyd2(&mut r, 2) {
             [0, 1] | [1, 0] => (),
-            err => panic!("{err:?}"),
+            array => panic!("unexpected inplace boundaries: {:?}", array),
         }
     }
 }