.cargo/config.toml

@@ -2,6 +2,8 @@
 lint = "clippy --workspace --tests --examples --bins -- -Dclippy::todo"
 lint-all = "clippy --workspace --all-features --tests --examples --bins -- -Dclippy::todo"
 
+ci-doctest = "test --workspace --all-features --doc --no-fail-fast -- --nocapture"
+
 # just check the library (without dev deps)
 ci-check-min = "hack --workspace check --no-default-features"
 ci-check-lib = "hack --workspace --feature-powerset --depth=2 --exclude-features=io-uring check"
@@ -13,3 +15,11 @@ ci-check-linux = "hack --workspace --feature-powerset --depth=2 check --tests --
 
 # tests avoiding io-uring feature
 ci-test = "hack --feature-powerset --depth=2 --exclude-features=io-uring test --lib --tests --no-fail-fast -- --nocapture"
+ci-test-rustls-020 = "hack --feature-powerset --depth=2 --exclude-features=io-uring,rustls-0_21 test --lib --tests --no-fail-fast -- --nocapture"
+ci-test-rustls-021 = "hack --feature-powerset --depth=2 --exclude-features=io-uring,rustls-0_20 test --lib --tests --no-fail-fast -- --nocapture"
+
+# tests avoiding io-uring feature on Windows
+ci-test-win = "hack --feature-powerset --depth=2 --exclude-features=io-uring test --lib --tests --no-fail-fast -- --nocapture"
+
+# test with io-uring feature
+ci-test-linux = "hack --feature-powerset --depth=2 --exclude-features=rustls-0_20 test --lib --tests --no-fail-fast -- --nocapture"

.envrc

@@ -1 +0,0 @@
-use flake

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,12 +1,10 @@
 ## PR Type
-
 <!-- What kind of change does this PR make? -->
 <!-- Bug Fix / Feature / Refactor / Code Style / Other -->
-
 INSERT_PR_TYPE
 
-## PR Checklist
 
+## PR Checklist
 Check your PR fulfills the following:
 
 <!-- For draft PRs check the boxes as you complete them. -->
@@ -16,10 +14,11 @@ Check your PR fulfills the following:
 - [ ] A changelog entry has been made for the appropriate packages.
 - [ ] Format code with the latest stable rustfmt
 
-## Overview
 
+## Overview
 <!-- Describe the current and new behavior. -->
 <!-- Emphasize any breaking changes. -->
 
+
 <!-- If this PR fixes or closes an issue, reference it here. -->
 <!-- Closes #000 -->

.github/workflows/ci-post-merge.yml

@@ -1,4 +1,4 @@
-name: CI (post-merge)
+name: CI (master only)
 
 on:
   push:
@@ -22,6 +22,7 @@ jobs:
           - { name: macOS, os: macos-latest, triple: x86_64-apple-darwin }
           - { name: Windows, os: windows-latest, triple: x86_64-pc-windows-msvc }
           - { name: Windows (MinGW), os: windows-latest, triple: x86_64-pc-windows-gnu }
+          - { name: Windows (32-bit), os: windows-latest, triple: i686-pc-windows-msvc }
         version:
           - nightly
 
@@ -41,32 +42,24 @@ jobs:
         if: matrix.target.os == 'ubuntu-latest'
         run: ./scripts/free-disk-space.sh
 
-      - name: Setup mold linker
-        if: matrix.target.os == 'ubuntu-latest'
-        uses: rui314/setup-mold@v1
-
-      - name: Install nasm
-        if: matrix.target.os == 'windows-latest'
-        uses: ilammy/setup-nasm@v1.5.2
-
       - name: Install OpenSSL
         if: matrix.target.os == 'windows-latest'
-        shell: bash
+        run: choco install openssl -y --forcex64 --no-progress
+      - name: Set OpenSSL dir in env
+        if: matrix.target.os == 'windows-latest'
         run: |
-          set -e
-          choco install openssl --version=1.1.1.2100 -y --no-progress
-          echo 'OPENSSL_DIR=C:\Program Files\OpenSSL' >> $GITHUB_ENV
-          echo "RUSTFLAGS=-C target-feature=+crt-static" >> $GITHUB_ENV
+          echo 'OPENSSL_DIR=C:\Program Files\OpenSSL-Win64' | Out-File -FilePath $env:GITHUB_ENV -Append
+          echo 'OPENSSL_DIR=C:\Program Files\OpenSSL' | Out-File -FilePath $env:GITHUB_ENV -Append
 
       - name: Install Rust (${{ matrix.version }})
-        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
         with:
           toolchain: ${{ matrix.version }}
 
-      - name: Install just, cargo-hack, cargo-nextest, cargo-ci-cache-clean
-        uses: taiki-e/install-action@v2.49.34
+      - name: Install cargo-hack and cargo-ci-cache-clean
+        uses: taiki-e/install-action@v2.25.2
         with:
-          tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean
+          tool: cargo-hack,cargo-ci-cache-clean
 
       - name: check lib
         if: >
@@ -91,20 +84,21 @@ jobs:
         run: cargo ci-check-linux
 
       - name: tests
-        run: just test
-
-      # TODO: re-instate some io-uring tests PRs
-      # - name: tests
-      #   if: matrix.target.os == 'ubuntu-latest'
-      #   run: >-
-      #     sudo bash -c "
-      #     ulimit -Sl 512
-      #     && ulimit -Hl 512
-      #     && PATH=$PATH:/usr/share/rust/.cargo/bin
-      #     && RUSTUP_TOOLCHAIN=${{ matrix.version }} cargo ci-test-rustls-020
-      #     && RUSTUP_TOOLCHAIN=${{ matrix.version }} cargo ci-test-rustls-021
-      #     && RUSTUP_TOOLCHAIN=${{ matrix.version }} cargo ci-test-linux
-      #     "
+        if: >
+          matrix.target.os != 'ubuntu-latest'
+          && matrix.target.triple != 'x86_64-pc-windows-gnu'
+        run: cargo ci-test
+      - name: tests
+        if: matrix.target.os == 'ubuntu-latest'
+        run: >-
+          sudo bash -c "
+          ulimit -Sl 512
+          && ulimit -Hl 512
+          && PATH=$PATH:/usr/share/rust/.cargo/bin
+          && RUSTUP_TOOLCHAIN=${{ matrix.version }} cargo ci-test-rustls-020
+          && RUSTUP_TOOLCHAIN=${{ matrix.version }} cargo ci-test-rustls-021
+          && RUSTUP_TOOLCHAIN=${{ matrix.version }} cargo ci-test-linux
+          "
 
       - name: CI cache clean
         run: cargo-ci-cache-clean
@@ -116,14 +110,31 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install Rust (nightly)
-        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
         with:
           toolchain: nightly
 
       - name: Install cargo-hack & cargo-minimal-versions
-        uses: taiki-e/install-action@v2.49.34
+        uses: taiki-e/install-action@v2.25.2
         with:
           tool: cargo-hack,cargo-minimal-versions
 
       - name: Check With Minimal Versions
         run: cargo minimal-versions check
+
+  nextest:
+    name: nextest
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install Rust
+        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+
+      - name: Install cargo-nextest
+        uses: taiki-e/install-action@v2.25.2
+        with:
+          tool: cargo-nextest
+
+      - name: Test with cargo-nextest
+        run: cargo nextest run

.github/workflows/ci.yml

@@ -13,14 +13,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  read_msrv:
-    name: Read MSRV
-    uses: actions-rust-lang/msrv/.github/workflows/msrv.yml@v0.1.0
-
   build_and_test:
-    needs:
-      - read_msrv
-
     strategy:
       fail-fast: false
       matrix:
@@ -30,8 +23,9 @@ jobs:
           - { name: macOS, os: macos-latest, triple: x86_64-apple-darwin }
           - { name: Windows, os: windows-latest, triple: x86_64-pc-windows-msvc }
           - { name: Windows (MinGW), os: windows-latest, triple: x86_64-pc-windows-gnu }
+          - { name: Windows (32-bit), os: windows-latest, triple: i686-pc-windows-msvc }
         version:
-          - { name: msrv, version: "${{ needs.read_msrv.outputs.msrv }}" }
+          - { name: msrv, version: 1.65.0 }
           - { name: stable, version: stable }
 
     name: ${{ matrix.target.name }} / ${{ matrix.version.name }}
@@ -50,39 +44,35 @@ jobs:
         if: matrix.target.os == 'ubuntu-latest'
         run: ./scripts/free-disk-space.sh
 
-      - name: Setup mold linker
-        if: matrix.target.os == 'ubuntu-latest'
-        uses: rui314/setup-mold@v1
-
-      - name: Install nasm
-        if: matrix.target.os == 'windows-latest'
-        uses: ilammy/setup-nasm@v1.5.2
-
       - name: Install OpenSSL
         if: matrix.target.os == 'windows-latest'
-        shell: bash
+        run: choco install openssl -y --forcex64 --no-progress
+      - name: Set OpenSSL dir in env
+        if: matrix.target.os == 'windows-latest'
         run: |
-          set -e
-          choco install openssl --version=1.1.1.2100 -y --no-progress
-          echo 'OPENSSL_DIR=C:\Program Files\OpenSSL' >> $GITHUB_ENV
-          echo "RUSTFLAGS=-C target-feature=+crt-static" >> $GITHUB_ENV
+          echo 'OPENSSL_DIR=C:\Program Files\OpenSSL-Win64' | Out-File -FilePath $env:GITHUB_ENV -Append
+          echo 'OPENSSL_DIR=C:\Program Files\OpenSSL' | Out-File -FilePath $env:GITHUB_ENV -Append
 
       - name: Install Rust (${{ matrix.version.name }})
-        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
         with:
           toolchain: ${{ matrix.version.version }}
 
-      - name: Install just, cargo-hack, cargo-nextest, cargo-ci-cache-clean
-        uses: taiki-e/install-action@v2.49.34
+      - name: Install cargo-hack and cargo-ci-cache-clean
+        uses: taiki-e/install-action@v2.25.2
         with:
-          tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean
+          tool: cargo-hack,cargo-ci-cache-clean
 
       - name: Generate Cargo.lock
         run: cargo generate-lockfile
 
       - name: workaround MSRV issues
         if: matrix.version.name == 'msrv'
-        run: just downgrade-for-msrv
+        run: |
+          cargo update -p=time --precise=0.3.16
+          cargo update -p=clap --precise=4.3.24
+          cargo update -p=clap_lex --precise=0.5.0
+          cargo update -p=anstyle --precise=1.0.2
 
       - name: check lib
         if: >
@@ -93,7 +83,7 @@ jobs:
         if: matrix.target.os == 'ubuntu-latest'
         run: cargo ci-check-lib-linux
       - name: check lib
-        if: matrix.target.triple != 'x86_64-pc-windows-gnu'
+        if: matrix.target.triple == 'x86_64-pc-windows-gnu'
         run: cargo ci-check-min
 
       - name: check full
@@ -107,27 +97,40 @@ jobs:
         run: cargo ci-check-linux
 
       - name: tests
-        run: just test
+        if: matrix.target.os == 'macos-latest'
+        run: cargo ci-test
+      - name: tests
+        if: >
+          matrix.target.os == 'windows-latest'
+          && matrix.target.triple != 'x86_64-pc-windows-gnu'
+        run: cargo ci-test-win
+      - name: tests
+        if: matrix.target.os == 'ubuntu-latest'
+        run: >-
+          sudo bash -c "
+          ulimit -Sl 512
+          && ulimit -Hl 512
+          && PATH=$PATH:/usr/share/rust/.cargo/bin
+          && RUSTUP_TOOLCHAIN=${{ matrix.version.version }} cargo ci-test-rustls-020
+          && RUSTUP_TOOLCHAIN=${{ matrix.version.version }} cargo ci-test-rustls-021
+          && RUSTUP_TOOLCHAIN=${{ matrix.version.version }} cargo ci-test-linux
+          "
 
       - name: CI cache clean
         run: cargo-ci-cache-clean
 
-  docs:
-    name: Documentation
+  rustdoc:
+    name: rustdoc
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v4
 
       - name: Install Rust (nightly)
-        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
         with:
           toolchain: nightly
 
-      - name: Install just
-        uses: taiki-e/install-action@v2.49.34
-        with:
-          tool: just
-
-      - name: doc tests
-        run: just test-docs
+      - name: doc tests io-uring
+        run: |
+          sudo bash -c "ulimit -Sl 512 && ulimit -Hl 512 && PATH=$PATH:/usr/share/rust/.cargo/bin && RUSTUP_TOOLCHAIN=nightly cargo ci-doctest"

.github/workflows/coverage.yml

@@ -18,12 +18,12 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
         with:
           components: llvm-tools-preview
 
       - name: Install cargo-llvm-cov
-        uses: taiki-e/install-action@v2.49.34
+        uses: taiki-e/install-action@v2.25.2
         with:
           tool: cargo-llvm-cov
 
@@ -31,9 +31,7 @@ jobs:
         run: cargo llvm-cov --workspace --all-features --codecov --output-path codecov.json
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v5.4.0
+        uses: codecov/codecov-action@v3.1.4
         with:
           files: codecov.json
           fail_ci_if_error: true
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/lint.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
+      - uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
         with:
           toolchain: nightly
           components: rustfmt
@@ -35,35 +35,34 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
+      - uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
         with: { components: clippy }
 
       - uses: giraffate/clippy-action@v1.0.1
         with:
-          reporter: "github-pr-check"
+          reporter: 'github-pr-check'
           github_token: ${{ secrets.GITHUB_TOKEN }}
           clippy_flags: --workspace --all-features --tests --examples --bins -- -Dclippy::todo -Aunknown_lints
 
   check-external-types:
-    if: false # rustdoc mismatch currently
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install Rust (${{ vars.RUST_VERSION_EXTERNAL_TYPES }})
-        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
+      - name: Install Rust (nightly-2023-10-10)
+        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
         with:
-          toolchain: ${{ vars.RUST_VERSION_EXTERNAL_TYPES }}
+          toolchain: nightly-2023-10-10
 
       - name: Install just
-        uses: taiki-e/install-action@v2.49.34
+        uses: taiki-e/install-action@v2.25.2
         with:
           tool: just
 
       - name: Install cargo-check-external-types
-        uses: taiki-e/cache-cargo-install-action@v2.1.1
+        uses: taiki-e/cache-cargo-install-action@v1.3.0
         with:
-          tool: cargo-check-external-types
+          tool: cargo-check-external-types@0.1.10
 
       - name: check external types
-        run: just check-external-types-all +${{ vars.RUST_VERSION_EXTERNAL_TYPES }}
+        run: just check-external-types-all +nightly-2023-10-10

.github/workflows/upload-doc.yml

@@ -0,0 +1,36 @@
+name: Upload documentation
+
+on:
+  push: { branches: [master] }
+
+permissions:
+  contents: write
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    permissions:
+      contents: write
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+        with: { toolchain: nightly }
+
+      - name: Build Docs
+        run: cargo doc --workspace --all-features --no-deps
+
+      - name: Tweak HTML
+        run: echo '<meta http-equiv="refresh" content="0;url=actix_server/index.html">' > target/doc/index.html
+
+      - name: Deploy to GitHub Pages
+        uses: JamesIves/github-pages-deploy-action@v4.5.0
+        with:
+          folder: target/doc
+          single-commit: true

.gitignore

@@ -1,3 +1,4 @@
+Cargo.lock
 target/
 guide/build/
 /gh-pages
@@ -12,8 +13,4 @@ guide/build/
 # These are backup files generated by rustfmt
 **/*.rs.bk
 
-# IDEs
 .idea
-
-# direnv
-/.direnv

.taplo.toml

@@ -1,29 +0,0 @@
-exclude = ["target/*"]
-include = ["**/*.toml"]
-
-[formatting]
-column_width = 110
-
-[[rule]]
-include = ["**/Cargo.toml"]
-keys = [
-  "dependencies",
-  "*-dependencies",
-  "workspace.dependencies",
-  "workspace.*-dependencies",
-  "target.*.dependencies",
-  "target.*.*-dependencies",
-]
-formatting.reorder_keys = true
-
-[[rule]]
-include = ["**/Cargo.toml"]
-keys = [
-  "dependencies.*",
-  "*-dependencies.*",
-  "workspace.dependencies.*",
-  "workspace.*-dependencies.*",
-  "target.*.dependencies",
-  "target.*.*-dependencies",
-]
-formatting.reorder_keys = false

Cargo.toml

@@ -1,5 +1,4 @@
 [workspace]
-resolver = "2"
 members = [
   "actix-codec",
   "actix-macros",
@@ -13,11 +12,12 @@ members = [
   "local-channel",
   "local-waker",
 ]
+resolver = "2"
 
 [workspace.package]
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.71.1"
+rust-version = "1.65"
 
 [patch.crates-io]
 actix-codec = { path = "actix-codec" }
@@ -36,9 +36,3 @@ local-waker = { path = "local-waker" }
 lto = true
 opt-level = 3
 codegen-units = 1
-
-[workspace.lints.rust]
-rust_2018_idioms = "deny"
-nonstandard-style = "deny"
-future_incompatible = "deny"
-missing_docs = { level = "warn", priority = -1 }

README.md

@@ -3,7 +3,7 @@
 > A collection of lower-level libraries for composable network services.
 
 [![CI](https://github.com/actix/actix-net/actions/workflows/ci.yml/badge.svg?event=push&style=flat-square)](https://github.com/actix/actix-net/actions/workflows/ci.yml)
-[![codecov](https://codecov.io/gh/actix/actix-net/graph/badge.svg?token=8rKIZKtLLm)](https://codecov.io/gh/actix/actix-net)
+[![codecov](https://codecov.io/gh/actix/actix-net/branch/master/graph/badge.svg)](https://codecov.io/gh/actix/actix-net)
 [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)
 [![Dependency Status](https://deps.rs/repo/github/actix/actix-net/status.svg)](https://deps.rs/repo/github/actix/actix-net)
 

actix-codec/CHANGES.md

@@ -2,20 +2,20 @@
 
 ## Unreleased
 
-- Minimum supported Rust version (MSRV) is now 1.71.
-
-## 0.5.2
-
 - Minimum supported Rust version (MSRV) is now 1.65.
 
 ## 0.5.1
 
-- Logs emitted now use the `tracing` crate with `log` compatibility.
+- Logs emitted now use the `tracing` crate with `log` compatibility. [#451]
 - Minimum supported Rust version (MSRV) is now 1.49.
 
+[#451]: https://github.com/actix/actix-net/pull/451
+
 ## 0.5.0
 
-- Updated `tokio-util` dependency to `0.7.0`.
+- Updated `tokio-util` dependency to `0.7.0`. [#446]
+
+[#446]: https://github.com/actix/actix-net/pull/446
 
 ## 0.4.2
 
@@ -23,8 +23,11 @@
 
 ## 0.4.1
 
-- Added `LinesCodec`.
-- `Framed::poll_ready` flushes when the buffer is full.
+- Added `LinesCodec.` [#338]
+- `Framed::poll_ready` flushes when the buffer is full. [#409]
+
+[#338]: https://github.com/actix/actix-net/pull/338
+[#409]: https://github.com/actix/actix-net/pull/409
 
 ## 0.4.0
 
@@ -32,10 +35,12 @@
 
 ## 0.4.0-beta.1
 
-- Replace `pin-project` with `pin-project-lite`.
-- Upgrade `tokio` dependency to `1`.
-- Upgrade `tokio-util` dependency to `0.6`.
-- Upgrade `bytes` dependency to `1`.
+- Replace `pin-project` with `pin-project-lite`. [#237]
+- Upgrade `tokio` dependency to `1`. [#237]
+- Upgrade `tokio-util` dependency to `0.6`. [#237]
+- Upgrade `bytes` dependency to `1`. [#237]
+
+[#237]: https://github.com/actix/actix-net/pull/237
 
 ## 0.3.0
 

actix-codec/Cargo.toml

@@ -1,7 +1,10 @@
 [package]
 name = "actix-codec"
-version = "0.5.2"
-authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Rob Ede <robjtede@icloud.com>"]
+version = "0.5.1"
+authors = [
+    "Nikolay Kim <fafhrd91@gmail.com>",
+    "Rob Ede <robjtede@icloud.com>",
+]
 description = "Codec utilities for working with framed protocols"
 keywords = ["network", "framework", "async", "futures"]
 repository = "https://github.com/actix/actix-net"
@@ -11,7 +14,13 @@ edition.workspace = true
 rust-version.workspace = true
 
 [package.metadata.cargo_check_external_types]
-allowed_external_types = ["bytes::*", "futures_core::*", "futures_sink::*", "tokio::*", "tokio_util::*"]
+allowed_external_types = [
+    "bytes::*",
+    "futures_core::*",
+    "futures_sink::*",
+    "tokio::*",
+    "tokio_util::*",
+]
 
 [dependencies]
 bitflags = "2"
@@ -31,6 +40,3 @@ tokio-test = "0.4.2"
 [[bench]]
 name = "lines"
 harness = false
-
-[lints]
-workspace = true

actix-codec/benches/lines.rs

@@ -1,5 +1,3 @@
-#![allow(missing_docs)]
-
 use bytes::BytesMut;
 use criterion::{criterion_group, criterion_main, Criterion};
 

actix-codec/src/lib.rs

@@ -6,6 +6,8 @@
 //! [`Sink`]: futures_sink::Sink
 //! [`Stream`]: futures_core::Stream
 
+#![deny(rust_2018_idioms, nonstandard_style)]
+#![warn(future_incompatible, missing_docs)]
 #![doc(html_logo_url = "https://actix.rs/img/logo.png")]
 #![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
 

actix-codec/tests/test_framed_sink.rs

@@ -1,5 +1,3 @@
-#![allow(missing_docs)]
-
 use std::{
     collections::VecDeque,
     io::{self, Write},

actix-macros/CHANGES.md

@@ -2,8 +2,6 @@
 
 ## Unreleased
 
-- Minimum supported Rust version (MSRV) is now 1.71.
-
 ## 0.2.4
 
 - Update `syn` dependency to `2`.

actix-macros/Cargo.toml

@@ -2,9 +2,9 @@
 name = "actix-macros"
 version = "0.2.4"
 authors = [
-  "Nikolay Kim <fafhrd91@gmail.com>",
-  "Ibraheem Ahmed <ibrah1440@gmail.com>",
-  "Rob Ede <robjtede@icloud.com>",
+    "Nikolay Kim <fafhrd91@gmail.com>",
+    "Ibraheem Ahmed <ibrah1440@gmail.com>",
+    "Rob Ede <robjtede@icloud.com>",
 ]
 description = "Macros for Actix system and runtime"
 repository = "https://github.com/actix/actix-net"
@@ -15,7 +15,7 @@ rust-version.workspace = true
 
 [package.metadata.cargo-machete]
 ignored = [
-  "proc_macro2", # specified for minimal versions compat
+    "proc_macro2", # specified for minimal versions compat
 ]
 
 [lib]
@@ -31,9 +31,7 @@ proc-macro2 = "1.0.60"
 
 [dev-dependencies]
 actix-rt = "2"
-futures-util = { version = "0.3.17", default-features = false }
-rustversion-msrv = "0.100"
-trybuild = "1"
 
-[lints]
-workspace = true
+futures-util = { version = "0.3.17", default-features = false }
+rustversion = "1"
+trybuild = "1"

actix-macros/src/lib.rs

@@ -8,6 +8,8 @@
 //! # Tests
 //! See docs for the [`#[test]`](macro@test) macro.
 
+#![deny(rust_2018_idioms, nonstandard_style)]
+#![warn(future_incompatible)]
 #![doc(html_logo_url = "https://actix.rs/img/logo.png")]
 #![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
 

actix-macros/tests/trybuild.rs

@@ -1,6 +1,4 @@
-#![allow(missing_docs)]
-
-#[rustversion_msrv::msrv]
+#[rustversion::stable(1.65)] // MSRV
 #[test]
 fn compile_macros() {
     let t = trybuild::TestCases::new();

actix-rt/CHANGES.md

@@ -2,14 +2,6 @@
 
 ## Unreleased
 
-- Minimum supported Rust version (MSRV) is now 1.71.
-
-## 2.10.0
-
-- Relax `F`'s bound (`Fn => FnOnce`) on `{Arbiter, System}::with_tokio_rt()` functions.
-- Update `tokio-uring` dependency to `0.5`.
-- Minimum supported Rust version (MSRV) is now 1.70.
-
 ## 2.9.0
 
 - Add `actix_rt::System::runtime()` method to retrieve the underlying `actix_rt::Runtime` runtime.
@@ -18,105 +10,150 @@
 
 ## 2.8.0
 
-- Add `#[track_caller]` attribute to `spawn` functions and methods.
-- Update `tokio-uring` dependency to `0.4`.
+- Add `#[track_caller]` attribute to `spawn` functions and methods. [#454]
+- Update `tokio-uring` dependency to `0.4`. [#473]
 - Minimum supported Rust version (MSRV) is now 1.59.
 
+[#454]: https://github.com/actix/actix-net/pull/454
+[#473]: https://github.com/actix/actix-net/pull/473
+
 ## 2.7.0
 
-- Update `tokio-uring` dependency to `0.3`.
+- Update `tokio-uring` dependency to `0.3`. [#448]
 - Minimum supported Rust version (MSRV) is now 1.49.
 
+[#448]: https://github.com/actix/actix-net/pull/448
+
 ## 2.6.0
 
-- Update `tokio-uring` dependency to `0.2`.
+- Update `tokio-uring` dependency to `0.2`. [#436]
+
+[#436]: https://github.com/actix/actix-net/pull/436
 
 ## 2.5.1
 
-- Expose `System::with_tokio_rt` and `Arbiter::with_tokio_rt`.
+- Expose `System::with_tokio_rt` and `Arbiter::with_tokio_rt`. [#430]
+
+[#430]: https://github.com/actix/actix-net/pull/430
 
 ## 2.5.0
 
-- Add `System::run_with_code` to allow retrieving the exit code on stop.
+- Add `System::run_with_code` to allow retrieving the exit code on stop. [#411]
+
+[#411]: https://github.com/actix/actix-net/pull/411
 
 ## 2.4.0
 
-- Add `Arbiter::try_current` for situations where thread may or may not have Arbiter context.
-- Start io-uring with `System::new` when feature is enabled.
+- Add `Arbiter::try_current` for situations where thread may or may not have Arbiter context. [#408]
+- Start io-uring with `System::new` when feature is enabled. [#395]
+
+[#395]: https://github.com/actix/actix-net/pull/395
+[#408]: https://github.com/actix/actix-net/pull/408
 
 ## 2.3.0
 
-- The `spawn` method can now resolve with non-unit outputs.
-- Add experimental (semver-exempt) `io-uring` feature for enabling async file I/O on linux.
+- The `spawn` method can now resolve with non-unit outputs. [#369]
+- Add experimental (semver-exempt) `io-uring` feature for enabling async file I/O on linux. [#374]
+
+[#369]: https://github.com/actix/actix-net/pull/369
+[#374]: https://github.com/actix/actix-net/pull/374
 
 ## 2.2.0
 
-- **BREAKING** `ActixStream::{poll_read_ready, poll_write_ready}` methods now return `Ready` object in ok variant.
+- **BREAKING** `ActixStream::{poll_read_ready, poll_write_ready}` methods now return `Ready` object in ok variant. [#293]
   - Breakage is acceptable since `ActixStream` was not intended to be public.
 
+[#293]: https://github.com/actix/actix-net/pull/293
+
 ## 2.1.0
 
-- Add `ActixStream` extension trait to include readiness methods.
-- Re-export `tokio::net::TcpSocket` in `net` module
+- Add `ActixStream` extension trait to include readiness methods. [#276]
+- Re-export `tokio::net::TcpSocket` in `net` module [#282]
+
+[#276]: https://github.com/actix/actix-net/pull/276
+[#282]: https://github.com/actix/actix-net/pull/282
 
 ## 2.0.2
 
-- Add `Arbiter::handle` to get a handle of an owned Arbiter.
-- Add `System::try_current` for situations where actix may or may not be running a System.
+- Add `Arbiter::handle` to get a handle of an owned Arbiter. [#274]
+- Add `System::try_current` for situations where actix may or may not be running a System. [#275]
+
+[#274]: https://github.com/actix/actix-net/pull/274
+[#275]: https://github.com/actix/actix-net/pull/275
 
 ## 2.0.1
 
-- Expose `JoinError` from Tokio.
+- Expose `JoinError` from Tokio. [#271]
+
+[#271]: https://github.com/actix/actix-net/pull/271
 
 ## 2.0.0
 
-- Remove all Arbiter-local storage methods.
-- Re-export `tokio::pin`.
+- Remove all Arbiter-local storage methods. [#262]
+- Re-export `tokio::pin`. [#262]
+
+[#262]: https://github.com/actix/actix-net/pull/262
 
 ## 2.0.0-beta.3
 
-- Remove `run_in_tokio`, `attach_to_tokio` and `AsyncSystemRunner`.
-- Return `JoinHandle` from `actix_rt::spawn`.
-- Remove old `Arbiter::spawn`. Implementation is now inlined into `actix_rt::spawn`.
-- Rename `Arbiter::{send => spawn}` and `Arbiter::{exec_fn => spawn_fn}`.
-- Remove `Arbiter::exec`.
-- Remove deprecated `Arbiter::local_join` and `Arbiter::is_running`.
-- `Arbiter::spawn` now accepts !Unpin futures.
-- `System::new` no longer takes arguments.
-- Remove `System::with_current`.
-- Remove `Builder`.
-- Add `System::with_init` as replacement for `Builder::run`.
-- Rename `System::{is_set => is_registered}`.
-- Add `ArbiterHandle` for sending messages to non-current-thread arbiters.
-- `System::arbiter` now returns an `&ArbiterHandle`.
-- `Arbiter::current` now returns an `ArbiterHandle` instead.
-- `Arbiter::join` now takes self by value.
+- Remove `run_in_tokio`, `attach_to_tokio` and `AsyncSystemRunner`. [#253]
+- Return `JoinHandle` from `actix_rt::spawn`. [#253]
+- Remove old `Arbiter::spawn`. Implementation is now inlined into `actix_rt::spawn`. [#253]
+- Rename `Arbiter::{send => spawn}` and `Arbiter::{exec_fn => spawn_fn}`. [#253]
+- Remove `Arbiter::exec`. [#253]
+- Remove deprecated `Arbiter::local_join` and `Arbiter::is_running`. [#253]
+- `Arbiter::spawn` now accepts !Unpin futures. [#256]
+- `System::new` no longer takes arguments. [#257]
+- Remove `System::with_current`. [#257]
+- Remove `Builder`. [#257]
+- Add `System::with_init` as replacement for `Builder::run`. [#257]
+- Rename `System::{is_set => is_registered}`. [#257]
+- Add `ArbiterHandle` for sending messages to non-current-thread arbiters. [#257].
+- `System::arbiter` now returns an `&ArbiterHandle`. [#257]
+- `Arbiter::current` now returns an `ArbiterHandle` instead. [#257]
+- `Arbiter::join` now takes self by value. [#257]
+
+[#253]: https://github.com/actix/actix-net/pull/253
+[#254]: https://github.com/actix/actix-net/pull/254
+[#256]: https://github.com/actix/actix-net/pull/256
+[#257]: https://github.com/actix/actix-net/pull/257
 
 ## 2.0.0-beta.2
 
-- Add `task` mod with re-export of `tokio::task::{spawn_blocking, yield_now, JoinHandle}`
+- Add `task` mod with re-export of `tokio::task::{spawn_blocking, yield_now, JoinHandle}` [#245]
 - Add default "macros" feature to allow faster compile times when using `default-features=false`.
 
+[#245]: https://github.com/actix/actix-net/pull/245
+
 ## 2.0.0-beta.1
 
-- Add `System::attach_to_tokio` method.
-- Update `tokio` dependency to `1.0`.
-- Rename `time` module `delay_for` to `sleep`, `delay_until` to `sleep_until`, `Delay` to `Sleep` to stay aligned with Tokio's naming.
+- Add `System::attach_to_tokio` method. [#173]
+- Update `tokio` dependency to `1.0`. [#236]
+- Rename `time` module `delay_for` to `sleep`, `delay_until` to `sleep_until`, `Delay` to `Sleep` to stay aligned with Tokio's naming. [#236]
 - Remove `'static` lifetime requirement for `Runtime::block_on` and `SystemRunner::block_on`.
-  - These methods now accept `&self` when calling.
-- Remove `'static` lifetime requirement for `System::run` and `Builder::run`.
-- `Arbiter::spawn` now panics when `System` is not in scope.
-- Fix work load issue by removing `PENDING` thread local.
+  - These methods now accept `&self` when calling. [#236]
+- Remove `'static` lifetime requirement for `System::run` and `Builder::run`. [#236]
+- `Arbiter::spawn` now panics when `System` is not in scope. [#207]
+- Fix work load issue by removing `PENDING` thread local. [#207]
+
+[#207]: https://github.com/actix/actix-net/pull/207
+[#236]: https://github.com/actix/actix-net/pull/236
 
 ## 1.1.1
 
-- Fix memory leak due to
+- Fix memory leak due to [#94] (see [#129] for more detail)
+
+[#129]: https://github.com/actix/actix-net/issues/129
 
 ## 1.1.0 _(YANKED)_
 
-- Expose `System::is_set` to check if current system has ben started
-- Add `Arbiter::is_running` to check if event loop is running
-- Add `Arbiter::local_join` associated function to get be able to `await` for spawned futures
+- Expose `System::is_set` to check if current system has ben started [#99]
+- Add `Arbiter::is_running` to check if event loop is running [#124]
+- Add `Arbiter::local_join` associated function to get be able to `await` for spawned futures [#94]
+
+[#94]: https://github.com/actix/actix-net/pull/94
+[#99]: https://github.com/actix/actix-net/pull/99
+[#124]: https://github.com/actix/actix-net/pull/124
 
 ## 1.0.0
 

actix-rt/Cargo.toml

@@ -1,7 +1,10 @@
 [package]
 name = "actix-rt"
-version = "2.10.0"
-authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Rob Ede <robjtede@icloud.com>"]
+version = "2.9.0"
+authors = [
+    "Nikolay Kim <fafhrd91@gmail.com>",
+    "Rob Ede <robjtede@icloud.com>",
+]
 description = "Tokio-based single-threaded async runtime for the Actix ecosystem"
 keywords = ["async", "futures", "io", "runtime"]
 homepage = "https://actix.rs"
@@ -12,7 +15,10 @@ edition.workspace = true
 rust-version.workspace = true
 
 [package.metadata.cargo_check_external_types]
-allowed_external_types = ["actix_macros::*", "tokio::*"]
+allowed_external_types = [
+    "actix_macros::*",
+    "tokio::*",
+]
 
 [features]
 default = ["macros"]
@@ -27,10 +33,7 @@ tokio = { version = "1.23.1", features = ["rt", "net", "parking_lot", "signal",
 
 # runtime for `io-uring` feature
 [target.'cfg(target_os = "linux")'.dependencies]
-tokio-uring = { version = "0.5", optional = true }
+tokio-uring = { version = "0.4", optional = true }
 
 [dev-dependencies]
 tokio = { version = "1.23.1", features = ["full"] }
-
-[lints]
-workspace = true

actix-rt/README.md

@@ -3,11 +3,11 @@
 > Tokio-based single-threaded async runtime for the Actix ecosystem.
 
 [![crates.io](https://img.shields.io/crates/v/actix-rt?label=latest)](https://crates.io/crates/actix-rt)
-[![Documentation](https://docs.rs/actix-rt/badge.svg?version=2.10.0)](https://docs.rs/actix-rt/2.10.0)
+[![Documentation](https://docs.rs/actix-rt/badge.svg?version=2.9.0)](https://docs.rs/actix-rt/2.9.0)
 [![Version](https://img.shields.io/badge/rustc-1.46+-ab6000.svg)](https://blog.rust-lang.org/2020/03/12/Rust-1.46.html)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-rt.svg)
 <br />
-[![dependency status](https://deps.rs/crate/actix-rt/2.10.0/status.svg)](https://deps.rs/crate/actix-rt/2.10.0)
+[![dependency status](https://deps.rs/crate/actix-rt/2.9.0/status.svg)](https://deps.rs/crate/actix-rt/2.9.0)
 ![Download](https://img.shields.io/crates/d/actix-rt.svg)
 [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/WghFtEH6Hb)
 

actix-rt/src/arbiter.rs

@@ -16,7 +16,7 @@ use crate::system::{System, SystemCommand};
 pub(crate) static COUNT: AtomicUsize = AtomicUsize::new(0);
 
 thread_local!(
-    static HANDLE: RefCell<Option<ArbiterHandle>> = const { RefCell::new(None) };
+    static HANDLE: RefCell<Option<ArbiterHandle>> = RefCell::new(None);
 );
 
 pub(crate) enum ArbiterCommand {
@@ -109,7 +109,7 @@ impl Arbiter {
     #[cfg(not(all(target_os = "linux", feature = "io-uring")))]
     pub fn with_tokio_rt<F>(runtime_factory: F) -> Arbiter
     where
-        F: FnOnce() -> tokio::runtime::Runtime + Send + 'static,
+        F: Fn() -> tokio::runtime::Runtime + Send + 'static,
     {
         let sys = System::current();
         let system_id = sys.id();

actix-rt/src/lib.rs

@@ -34,13 +34,14 @@
 //! ```
 //!
 //! # `io-uring` Support
-//!
 //! There is experimental support for using io-uring with this crate by enabling the
 //! `io-uring` feature. For now, it is semver exempt.
 //!
 //! Note that there are currently some unimplemented parts of using `actix-rt` with `io-uring`.
 //! In particular, when running a `System`, only `System::block_on` is supported.
 
+#![deny(rust_2018_idioms, nonstandard_style)]
+#![warn(future_incompatible, missing_docs)]
 #![allow(clippy::type_complexity)]
 #![doc(html_logo_url = "https://actix.rs/img/logo.png")]
 #![doc(html_favicon_url = "https://actix.rs/favicon.ico")]

actix-rt/src/system.rs

@@ -16,7 +16,7 @@ use crate::{arbiter::ArbiterHandle, Arbiter};
 static SYSTEM_COUNT: AtomicUsize = AtomicUsize::new(0);
 
 thread_local!(
-    static CURRENT: RefCell<Option<System>> = const { RefCell::new(None) };
+    static CURRENT: RefCell<Option<System>> = RefCell::new(None);
 );
 
 /// A manager for a per-thread distributed async runtime.
@@ -48,7 +48,7 @@ impl System {
     /// [tokio-runtime]: tokio::runtime::Runtime
     pub fn with_tokio_rt<F>(runtime_factory: F) -> SystemRunner
     where
-        F: FnOnce() -> tokio::runtime::Runtime,
+        F: Fn() -> tokio::runtime::Runtime,
     {
         let (stop_tx, stop_rx) = oneshot::channel();
         let (sys_tx, sys_rx) = mpsc::unbounded_channel();
@@ -87,7 +87,7 @@ impl System {
     #[doc(hidden)]
     pub fn with_tokio_rt<F>(_: F) -> SystemRunner
     where
-        F: FnOnce() -> tokio::runtime::Runtime,
+        F: Fn() -> tokio::runtime::Runtime,
     {
         unimplemented!("System::with_tokio_rt is not implemented for io-uring feature yet")
     }

actix-rt/tests/tests.rs

@@ -1,5 +1,3 @@
-#![allow(missing_docs)]
-
 use std::{
     future::Future,
     time::{Duration, Instant},
@@ -360,7 +358,7 @@ fn tokio_uring_arbiter() {
                 let f = tokio_uring::fs::File::create("test.txt").await.unwrap();
                 let buf = b"Hello World!";
 
-                let (res, _) = f.write_all_at(&buf[..], 0).await;
+                let (res, _) = f.write_at(&buf[..], 0).await;
                 assert!(res.is_ok());
 
                 f.sync_all().await.unwrap();

actix-server/CHANGES.md

@@ -2,20 +2,6 @@
 
 ## Unreleased
 
-## 2.5.1
-
-- Fix panic in test server.
-- Minimum supported Rust version (MSRV) is now 1.71.
-
-## 2.5.0
-
-- Update `mio` dependency to `1`.
-
-## 2.4.0
-
-- Update `tokio-uring` dependency to `0.5`.
-- Minimum supported Rust version (MSRV) is now 1.70.
-
 ## 2.3.0
 
 - Add support for MultiPath TCP (MPTCP) with `MpTcp` enum and `ServerBuilder::mptcp()` method.
@@ -24,7 +10,9 @@
 ## 2.2.0
 
 - Minimum supported Rust version (MSRV) is now 1.59.
-- Update `tokio-uring` dependency to `0.4`.
+- Update `tokio-uring` dependency to `0.4`. [#473]
+
+[#473]: https://github.com/actix/actix-net/pull/473
 
 ## 2.1.1
 
@@ -32,9 +20,12 @@
 
 ## 2.1.0
 
-- Update `tokio-uring` dependency to `0.3`.
-- Logs emitted now use the `tracing` crate with `log` compatibility.
-- Wait for accept thread to stop before sending completion signal.
+- Update `tokio-uring` dependency to `0.3`. [#448]
+- Logs emitted now use the `tracing` crate with `log` compatibility. [#448]
+- Wait for accept thread to stop before sending completion signal. [#443]
+
+[#443]: https://github.com/actix/actix-net/pull/443
+[#448]: https://github.com/actix/actix-net/pull/448
 
 ## 2.0.0
 
@@ -42,7 +33,9 @@
 
 ## 2.0.0-rc.4
 
-- Update `tokio-uring` dependency to `0.2`.
+- Update `tokio-uring` dependency to `0.2`. [#436]
+
+[#436]: https://github.com/actix/actix-net/pull/436
 
 ## 2.0.0-rc.3
 
@@ -50,80 +43,117 @@
 
 ## 2.0.0-rc.2
 
-- Simplify `TestServer`.
+- Simplify `TestServer`. [#431]
+
+[#431]: https://github.com/actix/actix-net/pull/431
 
 ## 2.0.0-rc.1
 
-- Hide implementation details of `Server`.
-- `Server` now runs only after awaiting it.
+- Hide implementation details of `Server`. [#424]
+- `Server` now runs only after awaiting it. [#425]
+
+[#424]: https://github.com/actix/actix-net/pull/424
+[#425]: https://github.com/actix/actix-net/pull/425
 
 ## 2.0.0-beta.9
 
-- Restore `Arbiter` support lost in `beta.8`.
+- Restore `Arbiter` support lost in `beta.8`. [#417]
+
+[#417]: https://github.com/actix/actix-net/pull/417
 
 ## 2.0.0-beta.8
 
-- Fix non-unix signal handler.
+- Fix non-unix signal handler. [#410]
+
+[#410]: https://github.com/actix/actix-net/pull/410
 
 ## 2.0.0-beta.7
 
-- Server can be started in regular Tokio runtime.
-- Expose new `Server` type whose `Future` impl resolves when server stops.
-- Rename `Server` to `ServerHandle`.
-- Add `Server::handle` to obtain handle to server.
-- Rename `ServerBuilder::{maxconn => max_concurrent_connections}`.
-- Deprecate crate-level `new` shortcut for server builder.
+- Server can be started in regular Tokio runtime. [#408]
+- Expose new `Server` type whose `Future` impl resolves when server stops. [#408]
+- Rename `Server` to `ServerHandle`. [#407]
+- Add `Server::handle` to obtain handle to server. [#408]
+- Rename `ServerBuilder::{maxconn => max_concurrent_connections}`. [#407]
+- Deprecate crate-level `new` shortcut for server builder. [#408]
 - Minimum supported Rust version (MSRV) is now 1.52.
 
+[#407]: https://github.com/actix/actix-net/pull/407
+[#408]: https://github.com/actix/actix-net/pull/408
+
 ## 2.0.0-beta.6
 
-- Add experimental (semver-exempt) `io-uring` feature for enabling async file I/O on linux.
-- Server no long listens to `SIGHUP` signal. Previously, the received was not used but did block subsequent exit signals from working.
-- Remove `config` module. `ServiceConfig`, `ServiceRuntime` public types are removed due to this change.
-- Remove `ServerBuilder::configure`.
+- Add experimental (semver-exempt) `io-uring` feature for enabling async file I/O on linux. [#374]
+- Server no long listens to `SIGHUP` signal. Previously, the received was not used but did block subsequent exit signals from working. [#389]
+- Remove `config` module. `ServiceConfig`, `ServiceRuntime` public types are removed due to this change. [#349]
+- Remove `ServerBuilder::configure` [#349]
+
+[#374]: https://github.com/actix/actix-net/pull/374
+[#349]: https://github.com/actix/actix-net/pull/349
+[#389]: https://github.com/actix/actix-net/pull/389
 
 ## 2.0.0-beta.5
 
-- Server shutdown notifies all workers to exit regardless if shutdown is graceful. This causes all workers to shutdown immediately in force shutdown case.
+- Server shutdown notifies all workers to exit regardless if shutdown is graceful. This causes all workers to shutdown immediately in force shutdown case. [#333]
+
+[#333]: https://github.com/actix/actix-net/pull/333
 
 ## 2.0.0-beta.4
 
 - Prevent panic when `shutdown_timeout` is very large. [f9262db]
 
+[f9262db]: https://github.com/actix/actix-net/commit/f9262db
+
 ## 2.0.0-beta.3
 
-- Hidden `ServerBuilder::start` method has been removed. Use `ServerBuilder::run`.
-- Add retry for EINTR signal (`io::Interrupted`) in `Accept`'s poll loop.
-- Add `ServerBuilder::worker_max_blocking_threads` to customize blocking thread pool size.
-- Update `actix-rt` to `2.0.0`.
+- Hidden `ServerBuilder::start` method has been removed. Use `ServerBuilder::run`. [#246]
+- Add retry for EINTR signal (`io::Interrupted`) in `Accept`'s poll loop. [#264]
+- Add `ServerBuilder::worker_max_blocking_threads` to customize blocking thread pool size. [#265]
+- Update `actix-rt` to `2.0.0`. [#273]
+
+[#246]: https://github.com/actix/actix-net/pull/246
+[#264]: https://github.com/actix/actix-net/pull/264
+[#265]: https://github.com/actix/actix-net/pull/265
+[#273]: https://github.com/actix/actix-net/pull/273
 
 ## 2.0.0-beta.2
 
-- Merge `actix-testing` to `actix-server` as `test_server` mod.
+- Merge `actix-testing` to `actix-server` as `test_server` mod. [#242]
+
+[#242]: https://github.com/actix/actix-net/pull/242
 
 ## 2.0.0-beta.1
 
-- Added explicit info log message on accept queue pause.
-- Prevent double registration of sockets when back-pressure is resolved.
-- Update `mio` dependency to `0.7.3`.
-- Remove `socket2` dependency.
-- `ServerBuilder::backlog` now accepts `u32` instead of `i32`.
-- Remove `AcceptNotify` type and pass `WakerQueue` to `Worker` to wake up `Accept`'s `Poll`.
-- Convert `mio::net::TcpStream` to `actix_rt::net::TcpStream`(`UnixStream` for uds) using `FromRawFd` and `IntoRawFd`(`FromRawSocket` and `IntoRawSocket` on windows).
-- Remove `AsyncRead` and `AsyncWrite` trait bound for `socket::FromStream` trait.
+- Added explicit info log message on accept queue pause. [#215]
+- Prevent double registration of sockets when back-pressure is resolved. [#223]
+- Update `mio` dependency to `0.7.3`. [#239]
+- Remove `socket2` dependency. [#239]
+- `ServerBuilder::backlog` now accepts `u32` instead of `i32`. [#239]
+- Remove `AcceptNotify` type and pass `WakerQueue` to `Worker` to wake up `Accept`'s `Poll`. [#239]
+- Convert `mio::net::TcpStream` to `actix_rt::net::TcpStream`(`UnixStream` for uds) using `FromRawFd` and `IntoRawFd`(`FromRawSocket` and `IntoRawSocket` on windows). [#239]
+- Remove `AsyncRead` and `AsyncWrite` trait bound for `socket::FromStream` trait. [#239]
+
+[#215]: https://github.com/actix/actix-net/pull/215
+[#223]: https://github.com/actix/actix-net/pull/223
+[#239]: https://github.com/actix/actix-net/pull/239
 
 ## 1.0.4
 
 - Update actix-codec to 0.3.0.
-- Workers must be greater than 0.
+- Workers must be greater than 0. [#167]
+
+[#167]: https://github.com/actix/actix-net/pull/167
 
 ## 1.0.3
 
-- Replace deprecated `net2` crate with `socket2`.
+- Replace deprecated `net2` crate with `socket2` [#140]
+
+[#140]: https://github.com/actix/actix-net/pull/140
 
 ## 1.0.2
 
-- Avoid error by calling `reregister()` on Windows.
+- Avoid error by calling `reregister()` on Windows [#103]
+
+[#103]: https://github.com/actix/actix-net/pull/103
 
 ## 1.0.1
 

actix-server/Cargo.toml

@@ -1,50 +1,50 @@
 [package]
 name = "actix-server"
-version = "2.5.1"
+version = "2.3.0"
 authors = [
-  "Nikolay Kim <fafhrd91@gmail.com>",
-  "Rob Ede <robjtede@icloud.com>",
-  "Ali MJ Al-Nasrawy <alimjalnasrawy@gmail.com>",
+    "Nikolay Kim <fafhrd91@gmail.com>",
+    "Rob Ede <robjtede@icloud.com>",
+    "Ali MJ Al-Nasrawy <alimjalnasrawy@gmail.com>",
 ]
 description = "General purpose TCP server built for the Actix ecosystem"
 keywords = ["network", "tcp", "server", "framework", "async"]
 categories = ["network-programming", "asynchronous"]
 homepage = "https://actix.rs"
-repository = "https://github.com/actix/actix-net/tree/master/actix-server"
+repository = "https://github.com/actix/actix-net.git"
 license = "MIT OR Apache-2.0"
 edition.workspace = true
 rust-version.workspace = true
 
 [package.metadata.cargo_check_external_types]
-allowed_external_types = ["tokio::*"]
+allowed_external_types = [
+    "tokio::*",
+]
 
 [features]
 default = []
 io-uring = ["tokio-uring", "actix-rt/io-uring"]
 
 [dependencies]
-actix-rt = { version = "2.10", default-features = false }
+actix-rt = { version = "2.8", default-features = false }
 actix-service = "2"
 actix-utils = "3"
+
 futures-core = { version = "0.3.17", default-features = false, features = ["alloc"] }
 futures-util = { version = "0.3.17", default-features = false, features = ["alloc"] }
-mio = { version = "1", features = ["os-poll", "net"] }
+mio = { version = "0.8", features = ["os-poll", "net"] }
 socket2 = "0.5"
 tokio = { version = "1.23.1", features = ["sync"] }
 tracing = { version = "0.1.30", default-features = false, features = ["log"] }
 
 # runtime for `io-uring` feature
 [target.'cfg(target_os = "linux")'.dependencies]
-tokio-uring = { version = "0.5", optional = true }
+tokio-uring = { version = "0.4", optional = true }
 
 [dev-dependencies]
 actix-codec = "0.5"
 actix-rt = "2.8"
 
 bytes = "1"
+env_logger = "0.10"
 futures-util = { version = "0.3.17", default-features = false, features = ["sink", "async-await-macro"] }
-pretty_env_logger = "0.5"
 tokio = { version = "1.23.1", features = ["io-util", "rt-multi-thread", "macros", "fs"] }
-
-[lints]
-workspace = true

actix-server/README.md

@@ -5,11 +5,11 @@
 <!-- prettier-ignore-start -->
 
 [![crates.io](https://img.shields.io/crates/v/actix-server?label=latest)](https://crates.io/crates/actix-server)
-[![Documentation](https://docs.rs/actix-server/badge.svg?version=2.5.1)](https://docs.rs/actix-server/2.5.1)
+[![Documentation](https://docs.rs/actix-server/badge.svg?version=2.3.0)](https://docs.rs/actix-server/2.3.0)
 [![Version](https://img.shields.io/badge/rustc-1.52+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.52.0.html)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-server.svg)
 <br />
-[![Dependency Status](https://deps.rs/crate/actix-server/2.5.1/status.svg)](https://deps.rs/crate/actix-server/2.5.1)
+[![Dependency Status](https://deps.rs/crate/actix-server/2.3.0/status.svg)](https://deps.rs/crate/actix-server/2.3.0)
 ![Download](https://img.shields.io/crates/d/actix-server.svg)
 [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)
 

actix-server/examples/file-reader.rs

@@ -8,8 +8,6 @@
 //!
 //! Follow the prompt and enter a file path, relative or absolute.
 
-#![allow(missing_docs)]
-
 use std::io;
 
 use actix_codec::{Framed, LinesCodec};
@@ -20,8 +18,7 @@ use futures_util::{SinkExt as _, StreamExt as _};
 use tokio::{fs::File, io::AsyncReadExt as _};
 
 async fn run() -> io::Result<()> {
-    pretty_env_logger::formatted_timed_builder()
-        .parse_env(pretty_env_logger::env_logger::Env::default().default_filter_or("info"));
+    env_logger::init_from_env(env_logger::Env::default().default_filter_or("info"));
 
     let addr = ("127.0.0.1", 8080);
     tracing::info!("starting server on port: {}", &addr.0);

actix-server/examples/tcp-echo.rs

@@ -25,8 +25,7 @@ use futures_util::future::ok;
 use tokio::io::{AsyncReadExt as _, AsyncWriteExt as _};
 
 async fn run() -> io::Result<()> {
-    pretty_env_logger::formatted_timed_builder()
-        .parse_env(pretty_env_logger::env_logger::Env::default().default_filter_or("info"));
+    env_logger::init_from_env(env_logger::Env::default().default_filter_or("info"));
 
     let count = Arc::new(AtomicUsize::new(0));
 

actix-server/src/lib.rs

@@ -1,5 +1,7 @@
 //! General purpose TCP server.
 
+#![deny(rust_2018_idioms, nonstandard_style)]
+#![warn(future_incompatible)]
 #![doc(html_logo_url = "https://actix.rs/img/logo.png")]
 #![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
 

actix-server/src/server.rs

@@ -183,6 +183,11 @@ impl ServerInner {
     }
 
     fn run_sync(mut builder: ServerBuilder) -> io::Result<(Self, ServerEventMultiplexer)> {
+        let sockets = mem::take(&mut builder.sockets)
+            .into_iter()
+            .map(|t| (t.0, t.2))
+            .collect();
+
         // Give log information on what runtime will be used.
         let is_actix = actix_rt::System::try_current().is_some();
         let is_tokio = tokio::runtime::Handle::try_current().is_ok();
@@ -202,11 +207,6 @@ impl ServerInner {
             );
         }
 
-        let sockets = mem::take(&mut builder.sockets)
-            .into_iter()
-            .map(|t| (t.0, t.2))
-            .collect();
-
         let (waker_queue, worker_handles, accept_handle) = Accept::start(sockets, &builder)?;
 
         let mux = ServerEventMultiplexer {

actix-server/src/socket.rs

@@ -126,7 +126,7 @@ pub(crate) enum SocketAddr {
     Unknown,
     Tcp(StdSocketAddr),
     #[cfg(unix)]
-    Uds(std::os::unix::net::SocketAddr),
+    Uds(mio::net::SocketAddr),
 }
 
 impl fmt::Display for SocketAddr {
@@ -160,7 +160,6 @@ pub enum MioStream {
 
 /// Helper trait for converting a Mio stream into a Tokio stream.
 pub trait FromStream: Sized {
-    /// Creates stream from a `mio` stream.
     fn from_mio(sock: MioStream) -> io::Result<Self>;
 }
 

actix-server/src/test_server.rs

@@ -123,9 +123,7 @@ impl TestServerHandle {
 
     /// Connect to server, returning a Tokio `TcpStream`.
     pub fn connect(&self) -> io::Result<TcpStream> {
-        let stream = net::TcpStream::connect(self.addr)?;
-        stream.set_nonblocking(true)?;
-        TcpStream::from_std(stream)
+        TcpStream::from_std(net::TcpStream::connect(self.addr)?)
     }
 }
 

actix-server/tests/server.rs

@@ -1,4 +1,4 @@
-#![allow(clippy::let_underscore_future, missing_docs)]
+#![allow(clippy::let_underscore_future)]
 
 use std::{
     net,

actix-server/tests/testing_server.rs

@@ -1,5 +1,3 @@
-#![allow(missing_docs)]
-
 use std::net;
 
 use actix_rt::net::TcpStream;
@@ -71,7 +69,5 @@ async fn new_with_builder() {
     srv.connect().unwrap();
 
     // connect to alt service defined in custom ServerBuilder
-    let stream = net::TcpStream::connect(alt_addr).unwrap();
-    stream.set_nonblocking(true).unwrap();
-    TcpStream::from_std(stream).unwrap();
+    TcpStream::from_std(net::TcpStream::connect(alt_addr).unwrap()).unwrap();
 }

actix-service/CHANGES.md

@@ -2,9 +2,7 @@
 
 ## Unreleased
 
-## 2.0.3
-
-- Minimum supported Rust version (MSRV) is now 1.71.
+- Minimum supported Rust version (MSRV) is now 1.65.
 
 ## 2.0.2
 

actix-service/Cargo.toml

@@ -1,7 +1,10 @@
 [package]
 name = "actix-service"
-version = "2.0.3"
-authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Rob Ede <robjtede@icloud.com>"]
+version = "2.0.2"
+authors = [
+    "Nikolay Kim <fafhrd91@gmail.com>",
+    "Rob Ede <robjtede@icloud.com>",
+]
 description = "Service trait and combinators for representing asynchronous request/response operations."
 keywords = ["network", "framework", "async", "futures", "service"]
 categories = ["network-programming", "asynchronous", "no-std"]
@@ -12,12 +15,10 @@ rust-version.workspace = true
 
 [dependencies]
 futures-core = { version = "0.3.17", default-features = false }
+paste = "1"
 pin-project-lite = "0.2"
 
 [dev-dependencies]
 actix-rt = "2"
 actix-utils = "3"
 futures-util = { version = "0.3.17", default-features = false }
-
-[lints]
-workspace = true

actix-service/README.md

@@ -3,10 +3,10 @@
 > Service trait and combinators for representing asynchronous request/response operations.
 
 [![crates.io](https://img.shields.io/crates/v/actix-service?label=latest)](https://crates.io/crates/actix-service)
-[![Documentation](https://docs.rs/actix-service/badge.svg?version=2.0.3)](https://docs.rs/actix-service/2.0.3)
+[![Documentation](https://docs.rs/actix-service/badge.svg?version=2.0.2)](https://docs.rs/actix-service/2.0.2)
 [![Version](https://img.shields.io/badge/rustc-1.46+-ab6000.svg)](https://blog.rust-lang.org/2020/03/12/Rust-1.46.html)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-service.svg)
-[![Dependency Status](https://deps.rs/crate/actix-service/2.0.3/status.svg)](https://deps.rs/crate/actix-service/2.0.3)
+[![Dependency Status](https://deps.rs/crate/actix-service/2.0.2/status.svg)](https://deps.rs/crate/actix-service/2.0.2)
 ![Download](https://img.shields.io/crates/d/actix-service.svg)
 [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)
 

actix-service/examples/clone.rs

@@ -1,5 +1,3 @@
-#![allow(missing_docs)]
-
 use std::{future::Future, sync::mpsc, time::Duration};
 
 async fn oracle<F, Fut>(f: F) -> (u32, u32)

actix-service/src/apply.rs

@@ -208,13 +208,15 @@ where
 
 #[cfg(test)]
 mod tests {
+    use core::task::Poll;
+
     use futures_util::future::lazy;
 
     use super::*;
     use crate::{
         ok,
         pipeline::{pipeline, pipeline_factory},
-        Ready,
+        Ready, Service, ServiceFactory,
     };
 
     #[derive(Clone)]

actix-service/src/boxed.rs

@@ -3,38 +3,36 @@
 use alloc::{boxed::Box, rc::Rc};
 use core::{future::Future, pin::Pin};
 
+use paste::paste;
+
 use crate::{Service, ServiceFactory};
 
 /// A boxed future with no send bound or lifetime parameters.
 pub type BoxFuture<T> = Pin<Box<dyn Future<Output = T>>>;
 
-/// Type alias for service trait object using [`Box`].
-pub type BoxService<Req, Res, Err> =
-    Box<dyn Service<Req, Response = Res, Error = Err, Future = BoxFuture<Result<Res, Err>>>>;
+macro_rules! service_object {
+    ($name: ident, $type: tt, $fn_name: ident) => {
+        paste! {
+            #[doc = "Type alias for service trait object using `" $type "`."]
+            pub type $name<Req, Res, Err> = $type<
+                dyn Service<Req, Response = Res, Error = Err, Future = BoxFuture<Result<Res, Err>>>,
+            >;
 
-/// Wraps service as a trait object using [`BoxService`].
-pub fn service<S, Req>(service: S) -> BoxService<Req, S::Response, S::Error>
-where
-    S: Service<Req> + 'static,
-    Req: 'static,
-    S::Future: 'static,
-{
-    Box::new(ServiceWrapper::new(service))
+            #[doc = "Wraps service as a trait object using [`" $name "`]."]
+            pub fn $fn_name<S, Req>(service: S) -> $name<Req, S::Response, S::Error>
+            where
+                S: Service<Req> + 'static,
+                Req: 'static,
+                S::Future: 'static,
+            {
+                $type::new(ServiceWrapper::new(service))
+            }
+        }
+    };
 }
 
-/// Type alias for service trait object using [`Rc`].
-pub type RcService<Req, Res, Err> =
-    Rc<dyn Service<Req, Response = Res, Error = Err, Future = BoxFuture<Result<Res, Err>>>>;
-
-/// Wraps service as a trait object using [`RcService`].
-pub fn rc_service<S, Req>(service: S) -> RcService<Req, S::Response, S::Error>
-where
-    S: Service<Req> + 'static,
-    Req: 'static,
-    S::Future: 'static,
-{
-    Rc::new(ServiceWrapper::new(service))
-}
+service_object!(BoxService, Box, service);
+service_object!(RcService, Rc, rc_service);
 
 struct ServiceWrapper<S> {
     inner: S,

actix-service/src/ext.rs

@@ -44,7 +44,7 @@ pub trait ServiceExt<Req>: Service<Req> {
     /// Call another service after call to this one has resolved successfully.
     ///
     /// This function can be used to chain two services together and ensure that the second service
-    /// isn't called until call to the first service have finished. Result of the call to the first
+    /// isn't called until call to the fist service have finished. Result of the call to the first
     /// service is used as an input parameter for the second service's call.
     ///
     /// Note that this function consumes the receiving service and returns a wrapped version of it.

actix-service/src/fn_service.rs

@@ -351,6 +351,7 @@ mod tests {
     use futures_util::future::lazy;
 
     use super::*;
+    use crate::{ok, Service, ServiceFactory};
 
     #[actix_rt::test]
     async fn test_fn_service() {

actix-service/src/lib.rs

@@ -1,6 +1,8 @@
 //! See [`Service`] docs for information on this crate's foundational trait.
 
 #![no_std]
+#![deny(rust_2018_idioms, nonstandard_style)]
+#![warn(future_incompatible, missing_docs)]
 #![allow(clippy::type_complexity)]
 #![doc(html_logo_url = "https://actix.rs/img/logo.png")]
 #![doc(html_favicon_url = "https://actix.rs/favicon.ico")]

actix-service/src/map.rs

@@ -202,7 +202,9 @@ mod tests {
     use futures_util::future::lazy;
 
     use super::*;
-    use crate::{ok, IntoServiceFactory, Ready, ServiceExt, ServiceFactoryExt};
+    use crate::{
+        ok, IntoServiceFactory, Ready, Service, ServiceExt, ServiceFactory, ServiceFactoryExt,
+    };
 
     struct Srv;
 

actix-service/src/map_err.rs

@@ -205,7 +205,9 @@ mod tests {
     use futures_util::future::lazy;
 
     use super::*;
-    use crate::{err, ok, IntoServiceFactory, Ready, ServiceExt, ServiceFactoryExt};
+    use crate::{
+        err, ok, IntoServiceFactory, Ready, Service, ServiceExt, ServiceFactory, ServiceFactoryExt,
+    };
 
     struct Srv;
 

actix-service/src/pipeline.rs

@@ -52,7 +52,7 @@ where
     /// Call another service after call to this one has resolved successfully.
     ///
     /// This function can be used to chain two services together and ensure that
-    /// the second service isn't called until call to the first service have
+    /// the second service isn't called until call to the fist service have
     /// finished. Result of the call to the first service is used as an
     /// input parameter for the second service's call.
     ///

actix-service/src/transform.rs

@@ -226,9 +226,9 @@ mod tests {
     use actix_utils::future::{ready, Ready};
 
     use super::*;
+    use crate::Service;
 
     // pseudo-doctest for Transform trait
-    #[allow(unused)]
     pub struct TimeoutTransform {
         timeout: Duration,
     }
@@ -250,7 +250,6 @@ mod tests {
     }
 
     // pseudo-doctest for Transform trait
-    #[allow(unused)]
     pub struct Timeout<S> {
         service: S,
         _timeout: Duration,

actix-tls/CHANGES.md

@@ -2,17 +2,6 @@
 
 ## Unreleased
 
-- Minimum supported Rust version (MSRV) is now 1.71.
-
-## 3.4.0
-
-- Add `rustls-0_23`, `rustls-0_23-webpki-roots`, and `rustls-0_23-native-roots` crate features.
-- Minimum supported Rust version (MSRV) is now 1.70.
-
-## 3.3.0
-
-- Add `rustls-0_22` crate feature which excludes any root certificate methods or re-exports.
-
 ## 3.2.0
 
 - Support Rustls v0.22.

actix-tls/Cargo.toml

@@ -1,7 +1,10 @@
 [package]
 name = "actix-tls"
-version = "3.4.0"
-authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Rob Ede <robjtede@icloud.com>"]
+version = "3.2.0"
+authors = [
+    "Nikolay Kim <fafhrd91@gmail.com>",
+    "Rob Ede <robjtede@icloud.com>",
+]
 description = "TLS acceptor and connector services for Actix ecosystem"
 keywords = ["network", "tls", "ssl", "async", "transport"]
 repository = "https://github.com/actix/actix-net.git"
@@ -15,12 +18,17 @@ all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
 [package.metadata.cargo_check_external_types]
-allowed_external_types = ["actix_service::*", "actix_utils::*", "futures_core::*", "tokio::*"]
+allowed_external_types = [
+    "actix_service::*",
+    "actix_utils::*",
+    "futures_core::*",
+    "tokio::*",
+]
 
 [package.metadata.cargo-machete]
 ignored = [
-  "rustls_021",         # specified to force version with add_trust_anchors method
-  "rustls_webpki_0101", # specified to force secure version
+    "rustls_021", # specified to force version with add_trust_anchors method
+    "rustls_webpki_0101", # specified to force secure version
 ]
 
 [features]
@@ -49,14 +57,8 @@ rustls-0_21-webpki-roots = ["tokio-rustls-024", "webpki-roots-025"]
 rustls-0_21-native-roots = ["tokio-rustls-024", "dep:rustls-native-certs-06"]
 
 # use rustls v0.22 impls
-rustls-0_22 = ["dep:tokio-rustls-025", "dep:rustls-pki-types-1"]
-rustls-0_22-webpki-roots = ["rustls-0_22", "dep:webpki-roots-026"]
-rustls-0_22-native-roots = ["rustls-0_22", "dep:rustls-native-certs-07"]
-
-# use rustls v0.23 impls
-rustls-0_23 = ["dep:tokio-rustls-026", "dep:rustls-pki-types-1"]
-rustls-0_23-webpki-roots = ["rustls-0_23", "dep:webpki-roots-026"]
-rustls-0_23-native-roots = ["rustls-0_23", "dep:rustls-native-certs-07"]
+rustls-0_22-webpki-roots = ["dep:tokio-rustls-025", "dep:rustls-pki-types-1", "dep:webpki-roots-026"]
+rustls-0_22-native-roots = ["dep:tokio-rustls-025", "dep:rustls-pki-types-1", "dep:rustls-native-certs-07"]
 
 # use native-tls impls
 native-tls = ["dep:tokio-native-tls"]
@@ -68,6 +70,7 @@ uri = ["dep:http-0_2", "dep:http-1"]
 actix-rt = { version = "2.2", default-features = false }
 actix-service = "2"
 actix-utils = "3"
+
 futures-core = { version = "0.3.7", default-features = false, features = ["alloc"] }
 impl-more = "0.1"
 pin-project-lite = "0.2.7"
@@ -83,24 +86,19 @@ http-1 = { package = "http", version = "1", optional = true }
 tls-openssl = { package = "openssl", version = "0.10.55", optional = true }
 tokio-openssl = { version = "0.6", optional = true }
 
-# rustls PKI types
-rustls-pki-types-1 = { package = "rustls-pki-types", version = "1", optional = true }
-
 # rustls v0.20
 tokio-rustls-023 = { package = "tokio-rustls", version = "0.23", optional = true }
+webpki-roots-022 = { package = "webpki-roots", version = "0.22", optional = true }
 
 # rustls v0.21
+rustls-021 = { package = "rustls", version = "0.21.6", optional = true }
+rustls-webpki-0101 = { package = "rustls-webpki", version = "0.101.4", optional = true }
 tokio-rustls-024 = { package = "tokio-rustls", version = "0.24", optional = true }
+webpki-roots-025 = { package = "webpki-roots", version = "0.25", optional = true }
 
 # rustls v0.22
+rustls-pki-types-1 = { package = "rustls-pki-types", version = "1", optional = true }
 tokio-rustls-025 = { package = "tokio-rustls", version = "0.25", optional = true }
-
-# rustls v0.23
-tokio-rustls-026 = { package = "tokio-rustls", version = "0.26", default-features = false, optional = true }
-
-# webpki-roots used with rustls features
-webpki-roots-022 = { package = "webpki-roots", version = "0.22", optional = true }
-webpki-roots-025 = { package = "webpki-roots", version = "0.25", optional = true }
 webpki-roots-026 = { package = "webpki-roots", version = "0.26", optional = true }
 
 # native root certificates for rustls impls
@@ -110,26 +108,19 @@ rustls-native-certs-07 = { package = "rustls-native-certs", version = "0.7", opt
 # native-tls
 tokio-native-tls = { version = "0.3", optional = true }
 
-[target.'cfg(any())'.dependencies]
-rustls-021 = { package = "rustls", version = "0.21.6", optional = true }                 # force version with add_trust_anchors method
-rustls-webpki-0101 = { package = "rustls-webpki", version = "0.101.4", optional = true } # force secure version
-
 [dev-dependencies]
 actix-codec = "0.5"
 actix-rt = "2.2"
 actix-server = "2"
 bytes = "1"
+env_logger = "0.10"
 futures-util = { version = "0.3.17", default-features = false, features = ["sink"] }
-itertools = "0.14"
-pretty_env_logger = "0.5"
-rcgen = "0.13"
+itertools = "0.12"
+rcgen = "0.11"
 rustls-pemfile = "2"
-tokio-rustls-026 = { package = "tokio-rustls", version = "0.26" }
+tokio-rustls-025 = { package = "tokio-rustls", version = "0.25" }
 trust-dns-resolver = "0.23"
 
 [[example]]
 name = "accept-rustls"
-required-features = ["accept", "rustls-0_23"]
-
-[lints]
-workspace = true
+required-features = ["accept", "rustls-0_22-webpki-roots"]

actix-tls/README.md

@@ -1,21 +0,0 @@
-# `actix-tls`
-
-> TLS acceptor and connector services for the Actix ecosystem.
-
-<!-- prettier-ignore-start -->
-
-[![crates.io](https://img.shields.io/crates/v/actix-tls?label=latest)](https://crates.io/crates/actix-tls)
-[![Documentation](https://docs.rs/actix-tls/badge.svg?version=3.4.0)](https://docs.rs/actix-tls/3.4.0)
-[![Version](https://img.shields.io/badge/rustc-1.52+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.52.0.html)
-![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-tls.svg)
-<br />
-[![Dependency Status](https://deps.rs/crate/actix-tls/3.4.0/status.svg)](https://deps.rs/crate/actix-tls/3.4.0)
-![Download](https://img.shields.io/crates/d/actix-tls.svg)
-[![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)
-
-<!-- prettier-ignore-end -->
-
-## Resources
-
-- [Library Documentation](https://docs.rs/actix-tls)
-- [Examples](/actix-tls/examples)

actix-tls/examples/accept-rustls.rs

@@ -30,19 +30,18 @@ use std::{
 use actix_rt::net::TcpStream;
 use actix_server::Server;
 use actix_service::ServiceFactoryExt as _;
-use actix_tls::accept::rustls_0_23::{Acceptor as RustlsAcceptor, TlsStream};
+use actix_tls::accept::rustls_0_22::{Acceptor as RustlsAcceptor, TlsStream};
 use futures_util::future::ok;
 use itertools::Itertools as _;
 use rustls::server::ServerConfig;
 use rustls_pemfile::{certs, rsa_private_keys};
 use rustls_pki_types_1::PrivateKeyDer;
-use tokio_rustls_026::rustls;
+use tokio_rustls_025::rustls;
 use tracing::info;
 
 #[actix_rt::main]
 async fn main() -> io::Result<()> {
-    pretty_env_logger::formatted_timed_builder()
-        .parse_env(pretty_env_logger::env_logger::Env::default().default_filter_or("info"));
+    env_logger::init_from_env(env_logger::Env::default().default_filter_or("info"));
 
     let root_path = env!("CARGO_MANIFEST_DIR")
         .parse::<PathBuf>()

actix-tls/src/accept/mod.rs

@@ -22,12 +22,12 @@ pub use rustls_0_20 as rustls;
 #[cfg(feature = "rustls-0_21")]
 pub mod rustls_0_21;
 
-#[cfg(feature = "rustls-0_22")]
+#[cfg(any(
+    feature = "rustls-0_22-webpki-roots",
+    feature = "rustls-0_22-native-roots",
+))]
 pub mod rustls_0_22;
 
-#[cfg(feature = "rustls-0_23")]
-pub mod rustls_0_23;
-
 #[cfg(feature = "native-tls")]
 pub mod native_tls;
 
@@ -37,8 +37,8 @@ pub(crate) static MAX_CONN: AtomicUsize = AtomicUsize::new(256);
     feature = "openssl",
     feature = "rustls-0_20",
     feature = "rustls-0_21",
-    feature = "rustls-0_22",
-    feature = "rustls-0_23",
+    feature = "rustls-0_22-webpki-roots",
+    feature = "rustls-0_22-native-roots",
     feature = "native-tls",
 ))]
 pub(crate) const DEFAULT_TLS_HANDSHAKE_TIMEOUT: std::time::Duration =

actix-tls/src/accept/rustls_0_23.rs

@@ -1,198 +0,0 @@
-//! `rustls` v0.23 based TLS connection acceptor service.
-//!
-//! See [`Acceptor`] for main service factory docs.
-
-use std::{
-    convert::Infallible,
-    future::Future,
-    io::{self, IoSlice},
-    pin::Pin,
-    sync::Arc,
-    task::{Context, Poll},
-    time::Duration,
-};
-
-use actix_rt::{
-    net::{ActixStream, Ready},
-    time::{sleep, Sleep},
-};
-use actix_service::{Service, ServiceFactory};
-use actix_utils::{
-    counter::{Counter, CounterGuard},
-    future::{ready, Ready as FutReady},
-};
-use pin_project_lite::pin_project;
-use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
-use tokio_rustls::{Accept, TlsAcceptor};
-use tokio_rustls_026 as tokio_rustls;
-
-use super::{TlsError, DEFAULT_TLS_HANDSHAKE_TIMEOUT, MAX_CONN_COUNTER};
-
-pub mod reexports {
-    //! Re-exports from `rustls` that are useful for acceptors.
-
-    pub use tokio_rustls_026::rustls::ServerConfig;
-}
-
-/// Wraps a `rustls` based async TLS stream in order to implement [`ActixStream`].
-pub struct TlsStream<IO>(tokio_rustls::server::TlsStream<IO>);
-
-impl_more::impl_from!(<IO> in tokio_rustls::server::TlsStream<IO> => TlsStream<IO>);
-impl_more::impl_deref_and_mut!(<IO> in TlsStream<IO> => tokio_rustls::server::TlsStream<IO>);
-
-impl<IO: ActixStream> AsyncRead for TlsStream<IO> {
-    fn poll_read(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-        buf: &mut ReadBuf<'_>,
-    ) -> Poll<io::Result<()>> {
-        Pin::new(&mut **self.get_mut()).poll_read(cx, buf)
-    }
-}
-
-impl<IO: ActixStream> AsyncWrite for TlsStream<IO> {
-    fn poll_write(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-        buf: &[u8],
-    ) -> Poll<io::Result<usize>> {
-        Pin::new(&mut **self.get_mut()).poll_write(cx, buf)
-    }
-
-    fn poll_flush(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
-        Pin::new(&mut **self.get_mut()).poll_flush(cx)
-    }
-
-    fn poll_shutdown(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
-        Pin::new(&mut **self.get_mut()).poll_shutdown(cx)
-    }
-
-    fn poll_write_vectored(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-        bufs: &[IoSlice<'_>],
-    ) -> Poll<io::Result<usize>> {
-        Pin::new(&mut **self.get_mut()).poll_write_vectored(cx, bufs)
-    }
-
-    fn is_write_vectored(&self) -> bool {
-        (**self).is_write_vectored()
-    }
-}
-
-impl<IO: ActixStream> ActixStream for TlsStream<IO> {
-    fn poll_read_ready(&self, cx: &mut Context<'_>) -> Poll<io::Result<Ready>> {
-        IO::poll_read_ready((**self).get_ref().0, cx)
-    }
-
-    fn poll_write_ready(&self, cx: &mut Context<'_>) -> Poll<io::Result<Ready>> {
-        IO::poll_write_ready((**self).get_ref().0, cx)
-    }
-}
-
-/// Accept TLS connections via the `rustls` crate.
-pub struct Acceptor {
-    config: Arc<reexports::ServerConfig>,
-    handshake_timeout: Duration,
-}
-
-impl Acceptor {
-    /// Constructs `rustls` based acceptor service factory.
-    pub fn new(config: reexports::ServerConfig) -> Self {
-        Acceptor {
-            config: Arc::new(config),
-            handshake_timeout: DEFAULT_TLS_HANDSHAKE_TIMEOUT,
-        }
-    }
-
-    /// Limit the amount of time that the acceptor will wait for a TLS handshake to complete.
-    ///
-    /// Default timeout is 3 seconds.
-    pub fn set_handshake_timeout(&mut self, handshake_timeout: Duration) -> &mut Self {
-        self.handshake_timeout = handshake_timeout;
-        self
-    }
-}
-
-impl Clone for Acceptor {
-    fn clone(&self) -> Self {
-        Self {
-            config: self.config.clone(),
-            handshake_timeout: self.handshake_timeout,
-        }
-    }
-}
-
-impl<IO: ActixStream> ServiceFactory<IO> for Acceptor {
-    type Response = TlsStream<IO>;
-    type Error = TlsError<io::Error, Infallible>;
-    type Config = ();
-    type Service = AcceptorService;
-    type InitError = ();
-    type Future = FutReady<Result<Self::Service, Self::InitError>>;
-
-    fn new_service(&self, _: ()) -> Self::Future {
-        let res = MAX_CONN_COUNTER.with(|conns| {
-            Ok(AcceptorService {
-                acceptor: self.config.clone().into(),
-                conns: conns.clone(),
-                handshake_timeout: self.handshake_timeout,
-            })
-        });
-
-        ready(res)
-    }
-}
-
-/// Rustls based acceptor service.
-pub struct AcceptorService {
-    acceptor: TlsAcceptor,
-    conns: Counter,
-    handshake_timeout: Duration,
-}
-
-impl<IO: ActixStream> Service<IO> for AcceptorService {
-    type Response = TlsStream<IO>;
-    type Error = TlsError<io::Error, Infallible>;
-    type Future = AcceptFut<IO>;
-
-    fn poll_ready(&self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
-        if self.conns.available(cx) {
-            Poll::Ready(Ok(()))
-        } else {
-            Poll::Pending
-        }
-    }
-
-    fn call(&self, req: IO) -> Self::Future {
-        AcceptFut {
-            fut: self.acceptor.accept(req),
-            timeout: sleep(self.handshake_timeout),
-            _guard: self.conns.get(),
-        }
-    }
-}
-
-pin_project! {
-    /// Accept future for Rustls service.
-    #[doc(hidden)]
-    pub struct AcceptFut<IO: ActixStream> {
-        fut: Accept<IO>,
-        #[pin]
-        timeout: Sleep,
-        _guard: CounterGuard,
-    }
-}
-
-impl<IO: ActixStream> Future for AcceptFut<IO> {
-    type Output = Result<TlsStream<IO>, TlsError<io::Error, Infallible>>;
-
-    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        let mut this = self.project();
-        match Pin::new(&mut this.fut).poll(cx) {
-            Poll::Ready(Ok(stream)) => Poll::Ready(Ok(TlsStream(stream))),
-            Poll::Ready(Err(err)) => Poll::Ready(Err(TlsError::Tls(err))),
-            Poll::Pending => this.timeout.poll(cx).map(|_| Err(TlsError::Timeout)),
-        }
-    }
-}

actix-tls/src/connect/mod.rs

@@ -46,12 +46,12 @@ pub use rustls_0_20 as rustls;
 ))]
 pub mod rustls_0_21;
 
-#[cfg(feature = "rustls-0_22")]
+#[cfg(any(
+    feature = "rustls-0_22-webpki-roots",
+    feature = "rustls-0_22-native-roots",
+))]
 pub mod rustls_0_22;
 
-#[cfg(feature = "rustls-0_23")]
-pub mod rustls_0_23;
-
 #[cfg(feature = "native-tls")]
 pub mod native_tls;
 

actix-tls/src/connect/rustls_0_20.rs

@@ -3,6 +3,7 @@
 //! See [`TlsConnector`] for main connector service factory docs.
 
 use std::{
+    convert::TryFrom,
     future::Future,
     io,
     pin::Pin,
@@ -34,8 +35,6 @@ pub mod reexports {
 /// Returns root certificates via `rustls-native-certs` crate as a rustls certificate store.
 ///
 /// See [`rustls_native_certs::load_native_certs()`] for more info on behavior and errors.
-///
-/// [`rustls_native_certs::load_native_certs()`]: rustls_native_certs_06::load_native_certs()
 #[cfg(feature = "rustls-0_20-native-roots")]
 pub fn native_roots_cert_store() -> io::Result<RootCertStore> {
     let mut root_certs = RootCertStore::empty();

actix-tls/src/connect/rustls_0_21.rs

@@ -3,6 +3,7 @@
 //! See [`TlsConnector`] for main connector service factory docs.
 
 use std::{
+    convert::TryFrom,
     future::Future,
     io,
     pin::Pin,
@@ -34,8 +35,6 @@ pub mod reexports {
 /// Returns root certificates via `rustls-native-certs` crate as a rustls certificate store.
 ///
 /// See [`rustls_native_certs::load_native_certs()`] for more info on behavior and errors.
-///
-/// [`rustls_native_certs::load_native_certs()`]: rustls_native_certs_06::load_native_certs()
 #[cfg(feature = "rustls-0_21-native-roots")]
 pub fn native_roots_cert_store() -> io::Result<RootCertStore> {
     let mut root_certs = RootCertStore::empty();

actix-tls/src/connect/rustls_0_22.rs

@@ -16,8 +16,9 @@ use actix_utils::future::{ok, Ready};
 use futures_core::ready;
 use rustls_pki_types_1::ServerName;
 use tokio_rustls::{
-    client::TlsStream as AsyncTlsStream, rustls::ClientConfig, Connect as RustlsConnect,
-    TlsConnector as RustlsTlsConnector,
+    client::TlsStream as AsyncTlsStream,
+    rustls::{ClientConfig, RootCertStore},
+    Connect as RustlsConnect, TlsConnector as RustlsTlsConnector,
 };
 use tokio_rustls_025 as tokio_rustls;
 
@@ -34,11 +35,9 @@ pub mod reexports {
 /// Returns root certificates via `rustls-native-certs` crate as a rustls certificate store.
 ///
 /// See [`rustls_native_certs::load_native_certs()`] for more info on behavior and errors.
-///
-/// [`rustls_native_certs::load_native_certs()`]: rustls_native_certs_07::load_native_certs()
 #[cfg(feature = "rustls-0_22-native-roots")]
-pub fn native_roots_cert_store() -> io::Result<tokio_rustls::rustls::RootCertStore> {
-    let mut root_certs = tokio_rustls::rustls::RootCertStore::empty();
+pub fn native_roots_cert_store() -> io::Result<RootCertStore> {
+    let mut root_certs = RootCertStore::empty();
 
     for cert in rustls_native_certs_07::load_native_certs()? {
         root_certs.add(cert).unwrap();
@@ -49,8 +48,8 @@ pub fn native_roots_cert_store() -> io::Result<tokio_rustls::rustls::RootCertSto
 
 /// Returns standard root certificates from `webpki-roots` crate as a rustls certificate store.
 #[cfg(feature = "rustls-0_22-webpki-roots")]
-pub fn webpki_roots_cert_store() -> tokio_rustls::rustls::RootCertStore {
-    let mut root_certs = tokio_rustls::rustls::RootCertStore::empty();
+pub fn webpki_roots_cert_store() -> RootCertStore {
+    let mut root_certs = RootCertStore::empty();
     root_certs.extend(webpki_roots_026::TLS_SERVER_ROOTS.to_owned());
     root_certs
 }

actix-tls/src/connect/rustls_0_23.rs

@@ -1,163 +0,0 @@
-//! Rustls based connector service.
-//!
-//! See [`TlsConnector`] for main connector service factory docs.
-
-use std::{
-    future::Future,
-    io,
-    pin::Pin,
-    sync::Arc,
-    task::{Context, Poll},
-};
-
-use actix_rt::net::ActixStream;
-use actix_service::{Service, ServiceFactory};
-use actix_utils::future::{ok, Ready};
-use futures_core::ready;
-use rustls_pki_types_1::ServerName;
-use tokio_rustls::{
-    client::TlsStream as AsyncTlsStream, rustls::ClientConfig, Connect as RustlsConnect,
-    TlsConnector as RustlsTlsConnector,
-};
-use tokio_rustls_026 as tokio_rustls;
-
-use crate::connect::{Connection, Host};
-
-pub mod reexports {
-    //! Re-exports from the `rustls` v0.23 ecosystem that are useful for connectors.
-
-    pub use tokio_rustls_026::{client::TlsStream as AsyncTlsStream, rustls::ClientConfig};
-    #[cfg(feature = "rustls-0_23-webpki-roots")]
-    pub use webpki_roots_026::TLS_SERVER_ROOTS;
-}
-
-/// Returns root certificates via `rustls-native-certs` crate as a rustls certificate store.
-///
-/// See [`rustls_native_certs::load_native_certs()`] for more info on behavior and errors.
-///
-/// [`rustls_native_certs::load_native_certs()`]: rustls_native_certs_07::load_native_certs()
-#[cfg(feature = "rustls-0_23-native-roots")]
-pub fn native_roots_cert_store() -> io::Result<tokio_rustls::rustls::RootCertStore> {
-    let mut root_certs = tokio_rustls::rustls::RootCertStore::empty();
-
-    for cert in rustls_native_certs_07::load_native_certs()? {
-        root_certs.add(cert).unwrap();
-    }
-
-    Ok(root_certs)
-}
-
-/// Returns standard root certificates from `webpki-roots` crate as a rustls certificate store.
-#[cfg(feature = "rustls-0_23-webpki-roots")]
-pub fn webpki_roots_cert_store() -> tokio_rustls::rustls::RootCertStore {
-    let mut root_certs = tokio_rustls::rustls::RootCertStore::empty();
-    root_certs.extend(webpki_roots_026::TLS_SERVER_ROOTS.to_owned());
-    root_certs
-}
-
-/// Connector service factory using `rustls`.
-#[derive(Clone)]
-pub struct TlsConnector {
-    connector: Arc<ClientConfig>,
-}
-
-impl TlsConnector {
-    /// Constructs new connector service factory from a `rustls` client configuration.
-    pub fn new(connector: Arc<ClientConfig>) -> Self {
-        TlsConnector { connector }
-    }
-
-    /// Constructs new connector service from a `rustls` client configuration.
-    pub fn service(connector: Arc<ClientConfig>) -> TlsConnectorService {
-        TlsConnectorService { connector }
-    }
-}
-
-impl<R, IO> ServiceFactory<Connection<R, IO>> for TlsConnector
-where
-    R: Host,
-    IO: ActixStream + 'static,
-{
-    type Response = Connection<R, AsyncTlsStream<IO>>;
-    type Error = io::Error;
-    type Config = ();
-    type Service = TlsConnectorService;
-    type InitError = ();
-    type Future = Ready<Result<Self::Service, Self::InitError>>;
-
-    fn new_service(&self, _: ()) -> Self::Future {
-        ok(TlsConnectorService {
-            connector: self.connector.clone(),
-        })
-    }
-}
-
-/// Connector service using `rustls`.
-#[derive(Clone)]
-pub struct TlsConnectorService {
-    connector: Arc<ClientConfig>,
-}
-
-impl<R, IO> Service<Connection<R, IO>> for TlsConnectorService
-where
-    R: Host,
-    IO: ActixStream,
-{
-    type Response = Connection<R, AsyncTlsStream<IO>>;
-    type Error = io::Error;
-    type Future = ConnectFut<R, IO>;
-
-    actix_service::always_ready!();
-
-    fn call(&self, connection: Connection<R, IO>) -> Self::Future {
-        tracing::trace!("TLS handshake start for: {:?}", connection.hostname());
-        let (stream, conn) = connection.replace_io(());
-
-        match ServerName::try_from(conn.hostname()) {
-            Ok(host) => ConnectFut::Future {
-                connect: RustlsTlsConnector::from(Arc::clone(&self.connector))
-                    .connect(host.to_owned(), stream),
-                connection: Some(conn),
-            },
-            Err(_) => ConnectFut::InvalidServerName,
-        }
-    }
-}
-
-/// Connect future for Rustls service.
-#[doc(hidden)]
-#[allow(clippy::large_enum_variant)]
-pub enum ConnectFut<R, IO> {
-    InvalidServerName,
-    Future {
-        connect: RustlsConnect<IO>,
-        connection: Option<Connection<R, ()>>,
-    },
-}
-
-impl<R, IO> Future for ConnectFut<R, IO>
-where
-    R: Host,
-    IO: ActixStream,
-{
-    type Output = io::Result<Connection<R, AsyncTlsStream<IO>>>;
-
-    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        match self.get_mut() {
-            Self::InvalidServerName => Poll::Ready(Err(io::Error::new(
-                io::ErrorKind::InvalidInput,
-                "connection parameters specified invalid server name",
-            ))),
-
-            Self::Future {
-                connect,
-                connection,
-            } => {
-                let stream = ready!(Pin::new(connect).poll(cx))?;
-                let connection = connection.take().unwrap();
-                tracing::trace!("TLS handshake success: {:?}", connection.hostname());
-                Poll::Ready(Ok(connection.replace_io(stream).1))
-            }
-        }
-    }
-}

actix-tls/src/lib.rs

@@ -1,5 +1,7 @@
 //! TLS acceptor and connector services for the Actix ecosystem.
 
+#![deny(rust_2018_idioms, nonstandard_style)]
+#![warn(future_incompatible, missing_docs)]
 #![doc(html_logo_url = "https://actix.rs/img/logo.png")]
 #![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]

actix-tls/tests/accept-openssl.rs

@@ -3,7 +3,7 @@
 #![cfg(all(
     feature = "accept",
     feature = "connect",
-    feature = "rustls-0_23",
+    feature = "rustls-0_22",
     feature = "openssl"
 ))]
 
@@ -12,21 +12,19 @@ use std::{io::Write as _, sync::Arc};
 use actix_rt::net::TcpStream;
 use actix_server::TestServer;
 use actix_service::ServiceFactoryExt as _;
-use actix_tls::{
-    accept::openssl::{Acceptor, TlsStream},
-    connect::rustls_0_23::reexports::ClientConfig,
-};
+use actix_tls::accept::openssl::{Acceptor, TlsStream};
 use actix_utils::future::ok;
 use rustls_pki_types_1::ServerName;
-use tokio_rustls_026::rustls::RootCertStore;
+use tokio_rustls::rustls::{ClientConfig, RootCertStore};
+use tokio_rustls_025 as tokio_rustls;
 
 fn new_cert_and_key() -> (String, String) {
-    let rcgen::CertifiedKey { cert, key_pair } =
+    let cert =
         rcgen::generate_simple_self_signed(vec!["127.0.0.1".to_owned(), "localhost".to_owned()])
             .unwrap();
 
-    let key = key_pair.serialize_pem();
-    let cert = cert.pem();
+    let key = cert.serialize_private_key_pem();
+    let cert = cert.serialize_pem().unwrap();
 
     (cert, key)
 }
@@ -49,46 +47,45 @@ fn openssl_acceptor(cert: String, key: String) -> tls_openssl::ssl::SslAcceptor
     builder.build()
 }
 
+#[allow(dead_code)]
 mod danger {
-    use rustls_pki_types_1::{CertificateDer, ServerName, UnixTime};
-    use tokio_rustls_026::rustls;
+    use tokio_rustls_025::rustls;
 
-    /// Disables certificate verification to allow self-signed certs from rcgen.
     #[derive(Debug)]
     pub struct NoCertificateVerification;
 
     impl rustls::client::danger::ServerCertVerifier for NoCertificateVerification {
         fn verify_server_cert(
             &self,
-            _end_entity: &CertificateDer<'_>,
-            _intermediates: &[CertificateDer<'_>],
-            _server_name: &ServerName<'_>,
-            _ocsp: &[u8],
-            _now: UnixTime,
+            end_entity: &rustls_pki_types_1::CertificateDer::CertificateDer<'_>,
+            intermediates: &[rustls_pki_types_1::CertificateDer::CertificateDer<'_>],
+            server_name: &rustls_pki_types_1::CertificateDer::ServerName<'_>,
+            ocsp_response: &[u8],
+            now: rustls_pki_types_1::CertificateDer::UnixTime,
         ) -> Result<rustls::client::danger::ServerCertVerified, rustls::Error> {
             Ok(rustls::client::danger::ServerCertVerified::assertion())
         }
 
         fn verify_tls12_signature(
             &self,
-            _message: &[u8],
-            _cert: &rustls_pki_types_1::CertificateDer<'_>,
-            _dss: &rustls::DigitallySignedStruct,
+            message: &[u8],
+            cert: &rustls_pki_types_1::CertificateDer<'_>,
+            dss: &rustls::DigitallySignedStruct,
         ) -> Result<rustls::client::danger::HandshakeSignatureValid, rustls::Error> {
             Ok(rustls::client::danger::HandshakeSignatureValid::assertion())
         }
 
         fn verify_tls13_signature(
             &self,
-            _message: &[u8],
-            _cert: &rustls_pki_types_1::CertificateDer<'_>,
-            _dss: &rustls::DigitallySignedStruct,
+            message: &[u8],
+            cert: &rustls_pki_types_1::CertificateDer<'_>,
+            dss: &rustls::DigitallySignedStruct,
         ) -> Result<rustls::client::danger::HandshakeSignatureValid, rustls::Error> {
             Ok(rustls::client::danger::HandshakeSignatureValid::assertion())
         }
 
         fn supported_verify_schemes(&self) -> Vec<rustls::SignatureScheme> {
-            rustls::crypto::aws_lc_rs::default_provider()
+            rustls::crypto::ring::default_provider()
                 .signature_verification_algorithms
                 .supported_schemes()
         }
@@ -111,10 +108,6 @@ fn rustls_connector(_cert: String, _key: String) -> ClientConfig {
 
 #[actix_rt::test]
 async fn accepts_connections() {
-    tokio_rustls_026::rustls::crypto::aws_lc_rs::default_provider()
-        .install_default()
-        .unwrap();
-
     let (cert, key) = new_cert_and_key();
 
     let srv = TestServer::start({
@@ -141,13 +134,13 @@ async fn accepts_connections() {
     let config = rustls_connector(cert, key);
     let config = Arc::new(config);
 
-    let mut conn = tokio_rustls_026::rustls::ClientConnection::new(
+    let mut conn = tokio_rustls::rustls::ClientConnection::new(
         config,
         ServerName::try_from("localhost").unwrap(),
     )
     .unwrap();
 
-    let mut stream = tokio_rustls_026::rustls::Stream::new(&mut conn, &mut sock);
+    let mut stream = tokio_rustls::rustls::Stream::new(&mut conn, &mut sock);
 
     stream.flush().expect("TLS handshake failed");
 }

actix-tls/tests/accept-rustls.rs

@@ -3,7 +3,7 @@
 #![cfg(all(
     feature = "accept",
     feature = "connect",
-    feature = "rustls-0_23",
+    feature = "rustls-0_22",
     feature = "openssl"
 ))]
 
@@ -15,26 +15,27 @@ use actix_rt::net::TcpStream;
 use actix_server::TestServer;
 use actix_service::ServiceFactoryExt as _;
 use actix_tls::{
-    accept::rustls_0_23::{reexports::ServerConfig, Acceptor, TlsStream},
+    accept::rustls_0_21::{Acceptor, TlsStream},
     connect::openssl::reexports::SslConnector,
 };
 use actix_utils::future::ok;
 use rustls_pemfile::{certs, pkcs8_private_keys};
-use rustls_pki_types_1::PrivateKeyDer;
 use tls_openssl::ssl::SslVerifyMode;
+use tokio_rustls::rustls::{self, Certificate, PrivateKey, ServerConfig};
+use tokio_rustls_024 as tokio_rustls;
 
 fn new_cert_and_key() -> (String, String) {
-    let rcgen::CertifiedKey { cert, key_pair } =
+    let cert =
         rcgen::generate_simple_self_signed(vec!["127.0.0.1".to_owned(), "localhost".to_owned()])
             .unwrap();
 
-    let key = key_pair.serialize_pem();
-    let cert = cert.pem();
+    let key = cert.serialize_private_key_pem();
+    let cert = cert.serialize_pem().unwrap();
 
     (cert, key)
 }
 
-fn rustls_server_config(cert: String, key: String) -> ServerConfig {
+fn rustls_server_config(cert: String, key: String) -> rustls::ServerConfig {
     // Load TLS key and cert files
 
     let cert = &mut BufReader::new(cert.as_bytes());
@@ -46,8 +47,9 @@ fn rustls_server_config(cert: String, key: String) -> ServerConfig {
         .unwrap();
 
     let mut config = ServerConfig::builder()
+        .with_safe_defaults()
         .with_no_client_auth()
-        .with_single_cert(cert_chain, PrivateKeyDer::Pkcs8(keys.remove(0)))
+        .with_single_cert(cert_chain, PrivateKey(keys.remove(0)))
         .unwrap();
 
     config.alpn_protocols = vec![b"http/1.1".to_vec()];
@@ -73,10 +75,6 @@ fn openssl_connector(cert: String, key: String) -> SslConnector {
 
 #[actix_rt::test]
 async fn accepts_connections() {
-    tokio_rustls_026::rustls::crypto::aws_lc_rs::default_provider()
-        .install_default()
-        .unwrap();
-
     let (cert, key) = new_cert_and_key();
 
     let srv = TestServer::start({

actix-tls/tests/test_connect.rs

@@ -1,4 +1,3 @@
-#![allow(missing_docs)]
 #![cfg(feature = "connect")]
 
 use std::{
@@ -31,7 +30,7 @@ async fn test_string() {
     assert_eq!(con.peer_addr().unwrap(), srv.addr());
 }
 
-#[cfg(feature = "rustls-0_23")]
+#[cfg(feature = "rustls-0_22")]
 #[actix_rt::test]
 async fn test_rustls_string() {
     let srv = TestServer::start(|| {
@@ -99,6 +98,8 @@ async fn service_factory() {
 #[cfg(all(feature = "openssl", feature = "uri"))]
 #[actix_rt::test]
 async fn test_openssl_uri() {
+    use std::convert::TryFrom;
+
     let srv = TestServer::start(|| {
         fn_service(|io: TcpStream| async {
             let mut framed = Framed::new(io, BytesCodec);
@@ -113,7 +114,7 @@ async fn test_openssl_uri() {
     assert_eq!(con.peer_addr().unwrap(), srv.addr());
 }
 
-#[cfg(all(feature = "rustls-0_23", feature = "uri"))]
+#[cfg(all(feature = "rustls-0_22", feature = "uri"))]
 #[actix_rt::test]
 async fn test_rustls_uri_http1() {
     let srv = TestServer::start(|| {
@@ -130,9 +131,11 @@ async fn test_rustls_uri_http1() {
     assert_eq!(con.peer_addr().unwrap(), srv.addr());
 }
 
-#[cfg(all(feature = "rustls-0_23", feature = "uri"))]
+#[cfg(all(feature = "rustls-0_22", feature = "uri"))]
 #[actix_rt::test]
 async fn test_rustls_uri() {
+    use std::convert::TryFrom;
+
     let srv = TestServer::start(|| {
         fn_service(|io: TcpStream| async {
             let mut framed = Framed::new(io, BytesCodec);

actix-tls/tests/test_resolvers.rs

@@ -1,4 +1,3 @@
-#![allow(missing_docs)]
 #![cfg(feature = "connect")]
 
 use std::{

actix-tracing/CHANGES.md

@@ -2,7 +2,7 @@
 
 ## Unreleased
 
-- Minimum supported Rust version (MSRV) is now 1.71.
+- Minimum supported Rust version (MSRV) is now 1.65.
 
 ## 0.1.0
 

actix-tracing/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Rajasekharan Vengalil <avranju@gmail.com>"]
 description = "Support for tokio tracing with Actix services"
 keywords = ["network", "framework", "tracing"]
 homepage = "https://actix.rs"
-repository = "https://github.com/actix/actix-net/tree/master/actix-tracing"
+repository = "https://github.com/actix/actix-net.git"
 documentation = "https://docs.rs/actix-tracing"
 categories = ["network-programming", "asynchronous"]
 license = "MIT OR Apache-2.0"
@@ -13,17 +13,20 @@ edition.workspace = true
 rust-version.workspace = true
 
 [package.metadata.cargo_check_external_types]
-allowed_external_types = ["actix_service::*", "actix_utils::*", "tracing::*", "tracing_futures::*"]
+allowed_external_types = [
+    "actix_service::*",
+    "actix_utils::*",
+    "tracing::*",
+    "tracing_futures::*",
+]
 
 [dependencies]
 actix-service = "2"
 actix-utils = "3"
+
 tracing = "0.1.35"
 tracing-futures = "0.2"
 
-[dev-dependencies]
+[dev_dependencies]
 actix-rt = "2"
 slab = "0.4"
-
-[lints]
-workspace = true

actix-tracing/src/lib.rs

@@ -1,5 +1,7 @@
 //! Actix tracing - support for tokio tracing with Actix services.
 
+#![deny(rust_2018_idioms, nonstandard_style)]
+#![warn(future_incompatible)]
 #![doc(html_logo_url = "https://actix.rs/img/logo.png")]
 #![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
 
@@ -20,7 +22,6 @@ pub struct TracingService<S, F> {
 }
 
 impl<S, F> TracingService<S, F> {
-    /// Constructs new tracing middleware.
     pub fn new(inner: S, make_span: F) -> Self {
         TracingService { inner, make_span }
     }
@@ -62,7 +63,6 @@ pub struct TracingTransform<S, U, F> {
 }
 
 impl<S, U, F> TracingTransform<S, U, F> {
-    /// Constructs new tracing middleware.
     pub fn new(make_span: F) -> Self {
         TracingTransform {
             make_span,
@@ -131,7 +131,7 @@ mod test {
     use super::*;
 
     thread_local! {
-        static SPAN: RefCell<Vec<span::Id>> = const { RefCell::new(Vec::new()) };
+        static SPAN: RefCell<Vec<span::Id>> = RefCell::new(Vec::new());
     }
 
     #[derive(Default)]

actix-utils/CHANGES.md

@@ -2,7 +2,7 @@
 
 ## Unreleased
 
-- Minimum supported Rust version (MSRV) is now 1.71.
+- Minimum supported Rust version (MSRV) is now 1.65.
 
 ## 3.0.1
 

actix-utils/Cargo.toml

@@ -1,7 +1,10 @@
 [package]
 name = "actix-utils"
 version = "3.0.1"
-authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Rob Ede <robjtede@icloud.com>"]
+authors = [
+    "Nikolay Kim <fafhrd91@gmail.com>",
+    "Rob Ede <robjtede@icloud.com>",
+]
 description = "Various utilities used in the Actix ecosystem"
 keywords = ["network", "framework", "async", "futures"]
 categories = ["network-programming", "asynchronous"]
@@ -11,13 +14,10 @@ edition.workspace = true
 rust-version.workspace = true
 
 [dependencies]
-local-waker = "0.1"
 pin-project-lite = "0.2"
+local-waker = "0.1"
 
 [dev-dependencies]
 actix-rt = "2"
 futures-util = { version = "0.3.17", default-features = false }
 static_assertions = "1.1"
-
-[lints]
-workspace = true

actix-utils/src/future/poll_fn.rs

@@ -103,7 +103,6 @@ mod tests {
     #[allow(dead_code)]
     fn require_sync<T: Sync>(_t: &T) {}
 
-    #[allow(unused)]
     trait AmbiguousIfUnpin<A> {
         fn some_item(&self) {}
     }

actix-utils/src/lib.rs

@@ -1,5 +1,7 @@
 //! Various utilities used in the Actix ecosystem.
 
+#![deny(rust_2018_idioms, nonstandard_style)]
+#![warn(future_incompatible, missing_docs)]
 #![doc(html_logo_url = "https://actix.rs/img/logo.png")]
 #![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
 

bytestring/CHANGES.md

@@ -2,11 +2,6 @@
 
 ## Unreleased
 
-## 1.4.0
-
-- Add `ByteString::split_at()` method.
-- Minimum supported Rust version (MSRV) is now 1.71.
-
 ## 1.3.1
 
 - No significant changes since `1.3.0`.

bytestring/Cargo.toml

@@ -1,9 +1,12 @@
 [package]
 name = "bytestring"
-version = "1.4.0"
+version = "1.3.1"
 description = "A UTF-8 encoded read-only string using `Bytes` as storage"
-authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Rob Ede <robjtede@icloud.com>"]
-keywords = ["string", "bytes", "utf8", "web", "bytestring"]
+authors = [
+    "Nikolay Kim <fafhrd91@gmail.com>",
+    "Rob Ede <robjtede@icloud.com>",
+]
+keywords = ["string", "bytes", "utf8", "web", "actix"]
 categories = ["no-std", "web-programming"]
 homepage = "https://actix.rs"
 repository = "https://github.com/actix/actix-net"
@@ -12,16 +15,16 @@ edition.workspace = true
 rust-version.workspace = true
 
 [package.metadata.cargo_check_external_types]
-allowed_external_types = ["bytes::*", "serde::*"]
+allowed_external_types = [
+    "bytes::*",
+    "serde::*",
+]
 
 [dependencies]
 bytes = { version = "1.2", default-features = false }
-serde = { version = "1", optional = true }
+serde = { version = "1.0", optional = true }
 
 [dev-dependencies]
 ahash = { version = "0.8", default-features = false }
-serde_json = "1"
+serde_json = "1.0"
 static_assertions = "1.1"
-
-[lints]
-workspace = true

bytestring/README.md

@@ -5,11 +5,11 @@
 <!-- prettier-ignore-start -->
 
 [![crates.io](https://img.shields.io/crates/v/bytestring?label=latest)](https://crates.io/crates/bytestring)
-[![Documentation](https://docs.rs/bytestring/badge.svg?version=1.4.0)](https://docs.rs/bytestring/1.4.0)
+[![Documentation](https://docs.rs/bytestring/badge.svg?version=1.3.1)](https://docs.rs/bytestring/1.3.1)
 [![Version](https://img.shields.io/badge/rustc-1.52+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.52.0.html)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/bytestring.svg)
 <br />
-[![Dependency Status](https://deps.rs/crate/bytestring/1.4.0/status.svg)](https://deps.rs/crate/bytestring/1.4.0)
+[![Dependency Status](https://deps.rs/crate/bytestring/1.3.1/status.svg)](https://deps.rs/crate/bytestring/1.3.1)
 ![Download](https://img.shields.io/crates/d/bytestring.svg)
 [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)
 

bytestring/src/lib.rs

@@ -3,6 +3,8 @@
 //! See docs for [`ByteString`].
 
 #![no_std]
+#![deny(rust_2018_idioms, nonstandard_style)]
+#![warn(future_incompatible, missing_docs)]
 
 extern crate alloc;
 
@@ -11,11 +13,11 @@ use alloc::{
     string::{String, ToString},
     vec::Vec,
 };
-use core::{borrow::Borrow, fmt, hash, ops, str};
+use core::{borrow::Borrow, convert::TryFrom, fmt, hash, ops, str};
 
 use bytes::Bytes;
 
-/// An immutable UTF-8 encoded string using [`Bytes`] as the storage.
+/// An immutable UTF-8 encoded string with [`Bytes`] as a storage.
 #[derive(Clone, Default, Eq, PartialOrd, Ord)]
 pub struct ByteString(Bytes);
 
@@ -51,29 +53,7 @@ impl ByteString {
         Self(src)
     }
 
-    /// Divides one bytestring into two at an index, returning both parts.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `mid` is not on a UTF-8 code point boundary, or if it is past the end of the last
-    /// code point of the bytestring.
-    pub fn split_at(&self, mid: usize) -> (ByteString, ByteString) {
-        let this: &str = self.as_ref();
-        let _valid_midpoint_check = this.split_at(mid);
-
-        let mut bytes = self.0.clone();
-        let first = bytes.split_to(mid);
-        let last = bytes;
-
-        unsafe {
-            (
-                ByteString::from_bytes_unchecked(first),
-                ByteString::from_bytes_unchecked(last),
-            )
-        }
-    }
-
-    /// Returns a new `ByteString` that is equivalent to the given `subset`.
+    /// Returns a new byte string that is equivalent to the given `subset`.
     ///
     /// When processing a `ByteString` buffer with other tools, one often gets a `&str` which is in
     /// fact a slice of the original `ByteString`; i.e., a subset of it. This function turns that
@@ -485,33 +465,4 @@ mod test {
         // being a logical subset of the string
         ByteString::from_static("foo bar").slice_ref("foo");
     }
-
-    #[test]
-    fn split_at() {
-        let buf = ByteString::from_static("foo bar");
-
-        let (first, last) = buf.split_at(0);
-        assert_eq!(ByteString::from_static(""), first);
-        assert_eq!(ByteString::from_static("foo bar"), last);
-
-        let (first, last) = buf.split_at(4);
-        assert_eq!(ByteString::from_static("foo "), first);
-        assert_eq!(ByteString::from_static("bar"), last);
-
-        let (first, last) = buf.split_at(7);
-        assert_eq!(ByteString::from_static("foo bar"), first);
-        assert_eq!(ByteString::from_static(""), last);
-    }
-
-    #[test]
-    #[should_panic = "byte index 1 is not a char boundary;"]
-    fn split_at_invalid_code_point() {
-        ByteString::from_static("µ").split_at(1);
-    }
-
-    #[test]
-    #[should_panic = "byte index 9 is out of bounds"]
-    fn split_at_outside_string() {
-        ByteString::from_static("foo").split_at(9);
-    }
 }

codecov.yml

@@ -9,7 +9,7 @@ coverage:
       default:
         threshold: 10% # make CI green
 
-ignore: # ignore code coverage on following paths
+ignore: # ignore codecoverage on following paths
   - "examples"
   - ".github"
   - "**/*.md"

flake.lock

@@ -1,58 +0,0 @@
-{
-  "nodes": {
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
-      },
-      "locked": {
-        "lastModified": 1715865404,
-        "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1722651103,
-        "narHash": "sha256-IRiJA0NVAoyaZeKZluwfb2DoTpBAj+FLI0KfybBeDU0=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a633d89c6dc9a2a8aae11813a62d7c58b2c0cc51",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-lib": {
-      "locked": {
-        "lastModified": 1714640452,
-        "narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=",
-        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz"
-      }
-    },
-    "root": {
-      "inputs": {
-        "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

flake.nix

@@ -1,30 +0,0 @@
-{
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
-    flake-parts.url = "github:hercules-ci/flake-parts";
-  };
-
-  outputs = inputs@{ flake-parts, ... }:
-    flake-parts.lib.mkFlake { inherit inputs; } {
-      systems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
-      perSystem = { pkgs, config, inputs', system, lib, ... }: {
-        formatter = pkgs.nixpkgs-fmt;
-
-        devShells.default = pkgs.mkShell {
-          packages = [
-            config.formatter
-            pkgs.fd
-            pkgs.just
-            pkgs.nodePackages.prettier
-            pkgs.taplo
-            pkgs.watchexec
-          ] ++ lib.optional pkgs.stdenv.isDarwin [
-            pkgs.pkgsBuildHost.darwin.apple_sdk.frameworks.Security
-            pkgs.pkgsBuildHost.darwin.apple_sdk.frameworks.CoreFoundation
-            pkgs.pkgsBuildHost.darwin.apple_sdk.frameworks.SystemConfiguration
-            pkgs.pkgsBuildHost.libiconv
-          ];
-        };
-      };
-    };
-}

justfile

@@ -1,99 +1,14 @@
 _list:
     @just --list
 
-# Check project.
-check: && clippy
-    just --unstable --fmt --check
-    # nixpkgs-fmt --check .
-    fd --hidden --type=file -e=md -e=yml --exec-batch prettier --check
-    fd --hidden -e=toml --exec-batch taplo format --check
-    fd --hidden -e=toml --exec-batch taplo lint
-    cargo +nightly fmt -- --check
-
-# Format project.
-fmt:
-    just --unstable --fmt
-    # nixpkgs-fmt .
-    fd --hidden --type=file -e=md -e=yml --exec-batch prettier --write
-    fd --type=file --hidden -e=toml --exec-batch taplo format
-    cargo +nightly fmt
-
-# Downgrade dependencies necessary to run MSRV checks/tests.
-[private]
-downgrade-for-msrv:
-    cargo update -p=clap --precise=4.4.18 # next ver: 1.74.0
-    cargo update -p=native-tls --precise=0.2.13 # next ver: 1.80.0
-    cargo update -p=litemap --precise=0.7.4 # next ver: 1.81.0
-    cargo update -p=zerofrom --precise=0.1.5 # next ver: 1.81.0
-    cargo update -p=half --precise=2.4.1 # next ver: 1.81.0
-
-msrv := ```
-    cargo metadata --format-version=1 \
-    | jq -r 'first(.packages[] | select(.source == null and .rust_version)) | .rust_version' \
-    | sed -E 's/^1\.([0-9]{2})$/1\.\1\.0/'
-```
-msrv_rustup := "+" + msrv
-non_linux_all_features_list := ```
-    cargo metadata --format-version=1 \
-    | jq '.packages[] | select(.source == null) | .features | keys' \
-    | jq -r --slurp \
-        --arg exclusions "tokio-uring,io-uring" \
-        'add | unique | . - ($exclusions | split(",")) | join(",")'
-```
-all_crate_features := if os() == "linux" { "--all-features" } else { "--features='" + non_linux_all_features_list + "'" }
-
-# Run Clippy over workspace.
-clippy toolchain="":
-    cargo {{ toolchain }} clippy --workspace --all-targets {{ all_crate_features }}
-
-# Run Clippy using MSRV.
-clippy-msrv: downgrade-for-msrv (clippy msrv_rustup)
-
-# Test workspace code.
-[macos]
-[windows]
-test toolchain="":
-    cargo {{ toolchain }} test --lib --tests --package=actix-macros
-    cargo {{ toolchain }} nextest run --no-tests=warn --workspace --exclude=actix-macros --no-default-features
-    cargo {{ toolchain }} nextest run --no-tests=warn --workspace --exclude=actix-macros {{ all_crate_features }}
-
-# Test workspace code.
-[linux]
-test toolchain="":
-    cargo {{ toolchain }} test --lib --tests --package=actix-macros
-    cargo {{ toolchain }} nextest run --no-tests=warn --workspace --exclude=actix-macros --no-default-features
-    cargo {{ toolchain }} nextest run --no-tests=warn --workspace --exclude=actix-macros {{ non_linux_all_features_list }}
-    cargo {{ toolchain }} nextest run --no-tests=warn --workspace --exclude=actix-macros {{ all_crate_features }}
-
-# Test workspace using MSRV.
-test-msrv: downgrade-for-msrv (test msrv_rustup)
-
-# Test workspace docs.
-test-docs toolchain="": && doc
-    cargo {{ toolchain }} test --doc --workspace {{ all_crate_features }} --no-fail-fast -- --nocapture
-
-# Test workspace.
-test-all toolchain="": (test toolchain) (test-docs toolchain)
-
 # Document crates in workspace.
-doc *args: && doc-set-workspace-crates
-    rm -f "$(cargo metadata --format-version=1 | jq -r '.target_directory')/doc/crates.js"
-    RUSTDOCFLAGS="--cfg=docsrs -Dwarnings" cargo +nightly doc --no-deps --workspace {{ all_crate_features }} {{ args }}
-
-[private]
-doc-set-workspace-crates:
-    #!/usr/bin/env bash
-    (
-        echo "window.ALL_CRATES ="
-        cargo metadata --format-version=1 \
-        | jq '[.packages[] | select(.source == null) | .targets | map(select(.doc) | .name)] | flatten'
-        echo ";"
-    ) > "$(cargo metadata --format-version=1 | jq -r '.target_directory')/doc/crates.js"
+doc:
+    RUSTDOCFLAGS="--cfg=docsrs" cargo +nightly doc --no-deps --workspace --features=rustls,openssl
 
 # Document crates in workspace and watch for changes.
 doc-watch:
-    @just doc --open
-    cargo watch -- just doc
+    RUSTDOCFLAGS="--cfg=docsrs"                cargo +nightly doc --no-deps --workspace --features=rustls-0_20,rustls-0_21,rustls-0_20-native-roots,rustls-0_21-native-roots,openssl --open
+    cargo watch -- RUSTDOCFLAGS="--cfg=docsrs" cargo +nightly doc --no-deps --workspace --features=rustls-0_20,rustls-0_21,rustls-0_20-native-roots,rustls-0_21-native-roots,openssl
 
 # Check for unintentional external type exposure on all crates in workspace.
 check-external-types-all toolchain="+nightly":
@@ -101,7 +16,7 @@ check-external-types-all toolchain="+nightly":
     set -euo pipefail
     exit=0
     for f in $(find . -mindepth 2 -maxdepth 2 -name Cargo.toml | grep -vE "\-codegen/|\-derive/|\-macros/"); do
-        if ! just check-external-types-manifest "$f" {{ toolchain }}; then exit=1; fi
+        if ! just check-external-types-manifest "$f" {{toolchain}}; then exit=1; fi
         echo
         echo
     done
@@ -114,9 +29,9 @@ check-external-types-all-table toolchain="+nightly":
     for f in $(find . -mindepth 2 -maxdepth 2 -name Cargo.toml | grep -vE "\-codegen/|\-derive/|\-macros/"); do
         echo
         echo "Checking for $f"
-        just check-external-types-manifest "$f" {{ toolchain }} --output-format=markdown-table
+        just check-external-types-manifest "$f" {{toolchain}} --output-format=markdown-table
     done
 
 # Check for unintentional external type exposure on a crate.
 check-external-types-manifest manifest_path toolchain="+nightly" *extra_args="":
-    cargo {{ toolchain }} check-external-types --manifest-path "{{ manifest_path }}" {{ extra_args }}
+    cargo {{toolchain}} check-external-types --manifest-path "{{manifest_path}}" {{extra_args}}

local-channel/CHANGES.md

@@ -2,8 +2,6 @@
 
 ## Unreleased
 
-- Minimum supported Rust version (MSRV) is now 1.71.
-
 ## 0.1.5
 
 - No significant changes since `0.1.4`.

local-channel/Cargo.toml

@@ -2,7 +2,10 @@
 name = "local-channel"
 version = "0.1.5"
 description = "A non-threadsafe multi-producer, single-consumer, futures-aware, FIFO queue"
-authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Rob Ede <robjtede@icloud.com>"]
+authors = [
+    "Nikolay Kim <fafhrd91@gmail.com>",
+    "Rob Ede <robjtede@icloud.com>",
+]
 repository = "https://github.com/actix/actix-net"
 keywords = ["channel", "local", "futures"]
 license.workspace = true
@@ -10,7 +13,10 @@ edition.workspace = true
 rust-version.workspace = true
 
 [package.metadata.cargo_check_external_types]
-allowed_external_types = ["futures_core::*", "futures_sink::*"]
+allowed_external_types = [
+    "futures_core::*",
+    "futures_sink::*",
+]
 
 [dependencies]
 futures-core = "0.3.17"

local-waker/CHANGES.md

@@ -2,8 +2,6 @@
 
 ## Unreleased
 
-- Minimum supported Rust version (MSRV) is now 1.71.
-
 ## 0.1.4
 
 - Minimum supported Rust version (MSRV) is now 1.65.

local-waker/Cargo.toml

@@ -2,7 +2,10 @@
 name = "local-waker"
 version = "0.1.4"
 description = "A synchronization primitive for thread-local task wakeup"
-authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Rob Ede <robjtede@icloud.com>"]
+authors = [
+    "Nikolay Kim <fafhrd91@gmail.com>",
+    "Rob Ede <robjtede@icloud.com>",
+]
 repository = "https://github.com/actix/actix-net"
 keywords = ["waker", "local", "futures", "no-std"]
 categories = ["asynchronous", "no-std"]