diff --git a/.cargo/config.toml b/.cargo/config.toml
index 4024bc0e..a114083f 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -15,9 +15,11 @@ ci-check-linux = "hack --workspace --feature-powerset check --tests --examples"
# tests avoiding io-uring feature
ci-test = "hack --feature-powerset --exclude-features=io-uring test --lib --tests --no-fail-fast -- --nocapture"
+ci-test-rustls-020 = "hack --feature-powerset --exclude-features=io-uring,rustls-0_21 test --lib --tests --no-fail-fast -- --nocapture"
+ci-test-rustls-021 = "hack --feature-powerset --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"
+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 test --lib --tests --no-fail-fast -- --nocapture"
+ci-test-linux = "hack --feature-powerset --exclude-features=rustls-0_20 test --lib --tests --no-fail-fast -- --nocapture"
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000..b3eb7c8b
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,10 @@
+version: 2
+updates:
+ - package-ecosystem: github-actions
+ directory: /
+ schedule:
+ interval: weekly
+ - package-ecosystem: cargo
+ directory: /
+ schedule:
+ interval: weekly
diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
deleted file mode 100644
index 29c5d8c7..00000000
--- a/.github/workflows/ci-master.yml
+++ /dev/null
@@ -1,210 +0,0 @@
-name: CI (master only)
-
-on:
- push:
- branches: [master]
-
-jobs:
- build_and_test_nightly:
- strategy:
- fail-fast: false
- matrix:
- target:
- - { name: Linux, os: ubuntu-latest, triple: x86_64-unknown-linux-gnu }
- - { 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
-
- name: ${{ matrix.target.name }} / ${{ matrix.version }}
- runs-on: ${{ matrix.target.os }}
-
- env:
- VCPKGRS_DYNAMIC: 1
-
- steps:
- - name: Setup Routing
- if: matrix.target.os == 'macos-latest'
- run: sudo ifconfig lo0 alias 127.0.0.3
-
- - uses: actions/checkout@v2
-
- # install OpenSSL on Windows
- - name: Set vcpkg root
- if: matrix.target.triple == 'x86_64-pc-windows-msvc' || matrix.target.triple == 'i686-pc-windows-msvc'
- run: echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append
- - name: Install OpenSSL
- if: matrix.target.triple == 'x86_64-pc-windows-msvc'
- run: vcpkg install openssl:x64-windows
- - name: Install OpenSSL
- if: matrix.target.triple == 'i686-pc-windows-msvc'
- run: vcpkg install openssl:x86-windows
-
- - name: Install ${{ matrix.version }}
- uses: actions-rs/toolchain@v1
- with:
- toolchain: ${{ matrix.version }}-${{ matrix.target.triple }}
- profile: minimal
- override: true
-
- # - name: Install MSYS2
- # if: matrix.target.triple == 'x86_64-pc-windows-gnu'
- # uses: msys2/setup-msys2@v2
- # - name: Install MinGW Packages
- # if: matrix.target.triple == 'x86_64-pc-windows-gnu'
- # run: |
- # msys2 -c 'pacman -Sy --noconfirm pacman'
- # msys2 -c 'pacman --noconfirm -S base-devel pkg-config'
-
- # - name: Generate Cargo.lock
- # uses: actions-rs/cargo@v1
- # with: { command: generate-lockfile }
- # - name: Cache Dependencies
- # uses: Swatinem/rust-cache@v1.2.0
-
- - name: Install cargo-hack
- uses: actions-rs/cargo@v1
- with:
- command: install
- args: cargo-hack
-
- - name: check lib
- if: >
- matrix.target.os != 'ubuntu-latest'
- && matrix.target.triple != 'x86_64-pc-windows-gnu'
- uses: actions-rs/cargo@v1
- with: { command: ci-check-lib }
- - name: check lib
- if: matrix.target.os == 'ubuntu-latest'
- uses: actions-rs/cargo@v1
- with: { command: ci-check-lib-linux }
- - name: check lib
- if: matrix.target.triple == 'x86_64-pc-windows-gnu'
- uses: actions-rs/cargo@v1
- with: { command: ci-check-min }
-
- - name: check full
- # TODO: compile OpenSSL and run tests on MinGW
- if: >
- matrix.target.os != 'ubuntu-latest'
- && matrix.target.triple != 'x86_64-pc-windows-gnu'
- uses: actions-rs/cargo@v1
- with: { command: ci-check }
- - name: check all
- if: matrix.target.os == 'ubuntu-latest'
- uses: actions-rs/cargo@v1
- with: { command: ci-check-linux }
-
- - name: tests
- 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 && RUSTUP_TOOLCHAIN=${{ matrix.version }} cargo ci-test-linux"
-
- - name: Clear the cargo caches
- run: |
- cargo install cargo-cache --version 0.6.2 --no-default-features --features ci-autoclean
- cargo-cache
-
- coverage:
- name: coverage
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v2
-
- - name: Install Rust (nightly)
- uses: actions-rs/toolchain@v1
- with:
- toolchain: nightly
- profile: minimal
- override: true
-
- - name: Generate Cargo.lock
- uses: actions-rs/cargo@v1
- with: { command: generate-lockfile }
- - name: Cache Dependencies
- uses: Swatinem/rust-cache@v1.3.0
-
- - name: Generate coverage file
- if: github.ref == 'refs/heads/master'
- run: |
- cargo install cargo-tarpaulin
- cargo tarpaulin --out Xml --verbose
- - name: Upload to Codecov
- if: github.ref == 'refs/heads/master'
- uses: codecov/codecov-action@v1
- with: { file: cobertura.xml }
-
- minimal-versions:
- name: minimal versions
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v2
-
- - name: Install Rust (nightly)
- uses: actions-rs/toolchain@v1
- with:
- toolchain: nightly
- profile: minimal
- override: true
-
- - name: Generate Cargo.lock
- uses: actions-rs/cargo@v1
- with: { command: generate-lockfile }
- - name: Cache Dependencies
- uses: Swatinem/rust-cache@v1.3.0
-
- - name: Install cargo-minimal-versions
- uses: actions-rs/cargo@v1
- with:
- command: install
- args: cargo-minimal-versions
-
- - name: Install cargo-hack
- uses: actions-rs/cargo@v1
- with:
- command: install
- args: cargo-hack
-
- - name: Check With Minimal Versions
- uses: actions-rs/cargo@v1
- with:
- command: minimal-versions
- args: check
-
- nextest:
- name: nextest
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v2
-
- - name: Install Rust
- uses: actions-rs/toolchain@v1
- with:
- toolchain: stable
- profile: minimal
- override: true
-
- - name: Generate Cargo.lock
- uses: actions-rs/cargo@v1
- with: { command: generate-lockfile }
- - name: Cache Dependencies
- uses: Swatinem/rust-cache@v1.3.0
-
- - name: Install cargo-nextest
- uses: actions-rs/cargo@v1
- with:
- command: install
- args: cargo-nextest
-
- - name: Test with cargo-nextest
- uses: actions-rs/cargo@v1
- with:
- command: nextest
- args: run
diff --git a/.github/workflows/ci-post-merge.yml b/.github/workflows/ci-post-merge.yml
new file mode 100644
index 00000000..259ae003
--- /dev/null
+++ b/.github/workflows/ci-post-merge.yml
@@ -0,0 +1,141 @@
+name: CI (master only)
+
+on:
+ push:
+ branches: [master]
+
+permissions:
+ contents: read
+
+concurrency:
+ group: ${{ github.workflow }}-${{ github.ref }}
+ cancel-in-progress: true
+
+jobs:
+ build_and_test_nightly:
+ strategy:
+ fail-fast: false
+ matrix:
+ # prettier-ignore
+ target:
+ - { name: Linux, os: ubuntu-latest, triple: x86_64-unknown-linux-gnu }
+ - { 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
+
+ name: ${{ matrix.target.name }} / ${{ matrix.version }}
+ runs-on: ${{ matrix.target.os }}
+
+ env: {}
+
+ steps:
+ - name: Setup Routing
+ if: matrix.target.os == 'macos-latest'
+ run: sudo ifconfig lo0 alias 127.0.0.3
+
+ - uses: actions/checkout@v4
+
+ - name: Free Disk Space
+ if: matrix.target.os == 'ubuntu-latest'
+ run: ./scripts/free-disk-space.sh
+
+ - name: Install OpenSSL
+ if: matrix.target.os == 'windows-latest'
+ run: choco install openssl -y --forcex64 --no-progress
+ - name: Set OpenSSL dir in env
+ if: matrix.target.os == 'windows-latest'
+ run: |
+ 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.5.0
+ with:
+ toolchain: ${{ matrix.version }}
+
+ - uses: taiki-e/install-action@v2.21.7
+ with:
+ tool: cargo-hack
+
+ - name: check lib
+ if: >
+ matrix.target.os != 'ubuntu-latest'
+ && matrix.target.triple != 'x86_64-pc-windows-gnu'
+ run: cargo ci-check-lib
+ - name: check lib
+ if: matrix.target.os == 'ubuntu-latest'
+ run: cargo ci-check-lib-linux
+ - name: check lib
+ if: matrix.target.triple == 'x86_64-pc-windows-gnu'
+ run: cargo ci-check-min
+
+ - name: check full
+ # TODO: compile OpenSSL and run tests on MinGW
+ if: >
+ matrix.target.os != 'ubuntu-latest'
+ && matrix.target.triple != 'x86_64-pc-windows-gnu'
+ run: cargo ci-check
+ - name: check all
+ if: matrix.target.os == 'ubuntu-latest'
+ run: cargo ci-check-linux
+
+ - name: tests
+ 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: Clear the cargo caches
+ run: |
+ cargo install cargo-cache --version 0.6.2 --no-default-features --features ci-autoclean
+ cargo-cache
+
+ minimal-versions:
+ name: minimal versions
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v4
+
+ - name: Install Rust (nightly)
+ uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
+ with:
+ toolchain: nightly
+
+ - name: Install cargo-hack & cargo-minimal-versions
+ uses: taiki-e/install-action@v2.21.7
+ 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.5.0
+
+ - name: Install cargo-nextest
+ uses: taiki-e/install-action@v2.21.7
+ with:
+ tool: cargo-nextest
+
+ - name: Test with cargo-nextest
+ run: cargo nextest run
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fd839fb4..18724a2d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,16 +1,22 @@
name: CI
on:
- pull_request:
- types: [opened, synchronize, reopened]
- push:
- branches: [master]
+ pull_request: {}
+ push: { branches: [master] }
+
+permissions:
+ contents: read
+
+concurrency:
+ group: ${{ github.workflow }}-${{ github.ref }}
+ cancel-in-progress: true
jobs:
build_and_test:
strategy:
fail-fast: false
matrix:
+ # prettier-ignore
target:
- { name: Linux, os: ubuntu-latest, triple: x86_64-unknown-linux-gnu }
- { name: macOS, os: macos-latest, triple: x86_64-apple-darwin }
@@ -18,91 +24,75 @@ jobs:
- { 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:
- - 1.57.0
- - stable
+ - { name: msrv, version: 1.65.0 }
+ - { name: stable, version: stable }
- name: ${{ matrix.target.name }} / ${{ matrix.version }}
+ name: ${{ matrix.target.name }} / ${{ matrix.version.name }}
runs-on: ${{ matrix.target.os }}
- env:
- VCPKGRS_DYNAMIC: 1
+ env: {}
steps:
- name: Setup Routing
if: matrix.target.os == 'macos-latest'
run: sudo ifconfig lo0 alias 127.0.0.3
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
+
+ - name: Free Disk Space
+ if: matrix.target.os == 'ubuntu-latest'
+ run: ./scripts/free-disk-space.sh
- # install OpenSSL on Windows
- - name: Set vcpkg root
- if: matrix.target.triple == 'x86_64-pc-windows-msvc' || matrix.target.triple == 'i686-pc-windows-msvc'
- run: echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append
- name: Install OpenSSL
- if: matrix.target.triple == 'x86_64-pc-windows-msvc'
- run: vcpkg install openssl:x64-windows
- - name: Install OpenSSL
- if: matrix.target.triple == 'i686-pc-windows-msvc'
- run: vcpkg install openssl:x86-windows
+ if: matrix.target.os == 'windows-latest'
+ run: choco install openssl -y --forcex64 --no-progress
+ - name: Set OpenSSL dir in env
+ if: matrix.target.os == 'windows-latest'
+ run: |
+ 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 ${{ matrix.version }}
- uses: actions-rs/toolchain@v1
+ - name: Install Rust (${{ matrix.version.name }})
+ uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
with:
- toolchain: ${{ matrix.version }}-${{ matrix.target.triple }}
- profile: minimal
- override: true
+ toolchain: ${{ matrix.version.version }}
- # - name: Install MSYS2
- # if: matrix.target.triple == 'x86_64-pc-windows-gnu'
- # uses: msys2/setup-msys2@v2
- # - name: Install MinGW Packages
- # if: matrix.target.triple == 'x86_64-pc-windows-gnu'
- # run: |
- # msys2 -c 'pacman -Sy --noconfirm pacman'
- # msys2 -c 'pacman --noconfirm -S base-devel pkg-config'
-
- # - name: Generate Cargo.lock
- # uses: actions-rs/cargo@v1
- # with: { command: generate-lockfile }
- # - name: Cache Dependencies
- # uses: Swatinem/rust-cache@v1.2.0
-
- - name: Install cargo-hack
- uses: actions-rs/cargo@v1
+ - uses: taiki-e/install-action@v2.21.7
with:
- command: install
- args: cargo-hack
+ tool: cargo-hack
- name: Generate Cargo.lock
- uses: actions-rs/cargo@v1
- with: { command: generate-lockfile }
+ run: cargo generate-lockfile
+
+ - name: workaround MSRV issues
+ if: matrix.version.name == '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: >
matrix.target.os != 'ubuntu-latest'
&& matrix.target.triple != 'x86_64-pc-windows-gnu'
- uses: actions-rs/cargo@v1
- with: { command: ci-check-lib }
+ run: cargo ci-check-lib
- name: check lib
if: matrix.target.os == 'ubuntu-latest'
- uses: actions-rs/cargo@v1
- with: { command: ci-check-lib-linux }
+ run: cargo ci-check-lib-linux
- name: check lib
if: matrix.target.triple == 'x86_64-pc-windows-gnu'
- uses: actions-rs/cargo@v1
- with: { command: ci-check-min }
+ run: cargo ci-check-min
- name: check full
# TODO: compile OpenSSL and run tests on MinGW
if: >
matrix.target.os != 'ubuntu-latest'
&& matrix.target.triple != 'x86_64-pc-windows-gnu'
- uses: actions-rs/cargo@v1
- with: { command: ci-check }
+ run: cargo ci-check
- name: check all
if: matrix.target.os == 'ubuntu-latest'
- uses: actions-rs/cargo@v1
- with: { command: ci-check-linux }
+ run: cargo ci-check-linux
- name: tests
if: matrix.target.os == 'macos-latest'
@@ -114,8 +104,15 @@ jobs:
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 }} cargo ci-test && RUSTUP_TOOLCHAIN=${{ matrix.version }} cargo ci-test-linux"
+ 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: Clear the cargo caches
run: |
@@ -127,20 +124,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
- name: Install Rust (nightly)
- uses: actions-rs/toolchain@v1
+ uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
with:
- toolchain: nightly-x86_64-unknown-linux-gnu
- profile: minimal
- override: true
-
- - name: Generate Cargo.lock
- uses: actions-rs/cargo@v1
- with: { command: generate-lockfile }
- - name: Cache Dependencies
- uses: Swatinem/rust-cache@v1.3.0
+ toolchain: nightly
- name: doc tests io-uring
run: |
diff --git a/.github/workflows/clippy-fmt.yml b/.github/workflows/clippy-fmt.yml
deleted file mode 100644
index ca637beb..00000000
--- a/.github/workflows/clippy-fmt.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-name: Lint
-
-on:
- pull_request:
- types: [opened, synchronize, reopened]
-
-jobs:
- fmt:
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v2
-
- - name: Install Rust
- uses: actions-rs/toolchain@v1
- with:
- toolchain: stable
- profile: minimal
- components: rustfmt
- override: true
- - name: Rustfmt Check
- uses: actions-rs/cargo@v1
- with:
- command: fmt
- args: --all -- --check
-
- clippy:
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v2
-
- - name: Install Rust
- uses: actions-rs/toolchain@v1
- with:
- toolchain: stable
- profile: minimal
- components: clippy
- override: true
- - name: Clippy Check
- uses: actions-rs/clippy-check@v1
- with:
- token: ${{ secrets.GITHUB_TOKEN }}
- args: --workspace --all-features --tests --examples --bins -- -Dclippy::todo
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
new file mode 100644
index 00000000..ed2ef99a
--- /dev/null
+++ b/.github/workflows/coverage.yml
@@ -0,0 +1,37 @@
+name: Coverage
+
+on:
+ push:
+ branches: [master]
+
+permissions:
+ contents: read
+
+concurrency:
+ group: ${{ github.workflow }}-${{ github.ref }}
+ cancel-in-progress: true
+
+jobs:
+ coverage:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v4
+
+ - name: Install Rust
+ uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
+ with:
+ components: llvm-tools-preview
+
+ - name: Install cargo-llvm-cov
+ uses: taiki-e/install-action@v2.21.7
+ with:
+ tool: cargo-llvm-cov
+
+ - name: Generate code coverage
+ run: cargo llvm-cov --workspace --all-features --codecov --output-path codecov.json
+
+ - name: Upload coverage to Codecov
+ uses: codecov/codecov-action@v3.1.4
+ with:
+ files: codecov.json
+ fail_ci_if_error: true
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
new file mode 100644
index 00000000..32d9d4ea
--- /dev/null
+++ b/.github/workflows/lint.yml
@@ -0,0 +1,66 @@
+name: Lint
+
+on: [pull_request]
+
+permissions:
+ contents: read
+
+concurrency:
+ group: ${{ github.workflow }}-${{ github.ref }}
+ cancel-in-progress: true
+
+jobs:
+ fmt:
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v4
+
+ - uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
+ with:
+ toolchain: nightly
+ components: rustfmt
+
+ - name: Rustfmt Check
+ run: cargo fmt --all -- --check
+
+ clippy:
+ permissions:
+ contents: write
+
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v4
+
+ - uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
+ with: { components: clippy }
+
+ - uses: giraffate/clippy-action@v1.0.1
+ with:
+ reporter: 'github-pr-check'
+ github_token: ${{ secrets.GITHUB_TOKEN }}
+ clippy_flags: --workspace --all-features --tests --examples --bins -- -Dclippy::todo -Aunknown_lints
+
+ check-external-types:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v4
+
+ - name: Install Rust (nightly-2023-10-10)
+ uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
+ with:
+ toolchain: nightly-2023-10-10
+
+ - name: Install just
+ uses: taiki-e/install-action@v2.21.7
+ with:
+ tool: just
+
+ - name: Install cargo-check-external-types
+ uses: taiki-e/cache-cargo-install-action@v1.3.0
+ with:
+ tool: cargo-check-external-types@0.1.10
+
+ - name: check external types
+ run: just check-external-types-all +nightly-2023-10-10
diff --git a/.github/workflows/upload-doc.yml b/.github/workflows/upload-doc.yml
index 36044230..f54fdf6a 100644
--- a/.github/workflows/upload-doc.yml
+++ b/.github/workflows/upload-doc.yml
@@ -1,35 +1,36 @@
name: Upload documentation
on:
- push:
- branches: [master]
+ 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@v2
+ - uses: actions/checkout@v4
- - name: Install Rust
- uses: actions-rs/toolchain@v1
- with:
- toolchain: nightly-x86_64-unknown-linux-gnu
- profile: minimal
- override: true
+ - uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
+ with: { toolchain: nightly }
- name: Build Docs
- uses: actions-rs/cargo@v1
- with:
- command: doc
- args: --workspace --all-features --no-deps
+ run: cargo doc --workspace --all-features --no-deps
- name: Tweak HTML
run: echo '' > target/doc/index.html
- name: Deploy to GitHub Pages
- uses: JamesIves/github-pages-deploy-action@3.7.1
+ uses: JamesIves/github-pages-deploy-action@v4.4.3
with:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- BRANCH: gh-pages
- FOLDER: target/doc
+ folder: target/doc
+ single-commit: true
diff --git a/.rustfmt.toml b/.rustfmt.toml
new file mode 100644
index 00000000..71b9be3a
--- /dev/null
+++ b/.rustfmt.toml
@@ -0,0 +1,3 @@
+group_imports = "StdExternalCrate"
+imports_granularity = "Crate"
+use_field_init_shorthand = true
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index ae97b324..9628fb82 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -8,19 +8,19 @@ In the interest of fostering an open and welcoming environment, we as contributo
Examples of behavior that contributes to creating a positive environment include:
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
+- Using welcoming and inclusive language
+- Being respectful of differing viewpoints and experiences
+- Gracefully accepting constructive criticism
+- Focusing on what is best for the community
+- Showing empathy towards other community members
Examples of unacceptable behavior by participants include:
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
+- The use of sexualized language or imagery and unwelcome sexual attention or advances
+- Trolling, insulting/derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or electronic address, without explicit permission
+- Other conduct which could reasonably be considered inappropriate in a professional setting
## Our Responsibilities
@@ -39,7 +39,7 @@ Instances of abusive, harassing, or otherwise unacceptable behavior may be repor
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
[@robjtede]: https://github.com/robjtede
-[@JohnTitor]: https://github.com/JohnTitor
+[@johntitor]: https://github.com/JohnTitor
## Attribution
diff --git a/Cargo.toml b/Cargo.toml
index eb452e1a..696de4a5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,6 +12,12 @@ members = [
"local-channel",
"local-waker",
]
+resolver = "2"
+
+[workspace.package]
+license = "MIT OR Apache-2.0"
+edition = "2021"
+rust-version = "1.65"
[patch.crates-io]
actix-codec = { path = "actix-codec" }
diff --git a/README.md b/README.md
index 0e122cc4..9d99d5ee 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ See example folders for [`actix-server`](./actix-server/examples) and [`actix-tl
## MSRV
-Most crates in this repo's have a Minimum Supported Rust Version (MSRV) of 1.49.0. Only `actix-tls` and `actix-server` have MSRV of 1.54.0. As a policy, we permit MSRV increases in non-breaking releases.
+Crates in this repo currently have a Minimum Supported Rust Version (MSRV) of 1.65. As a policy, we permit MSRV increases in non-breaking releases.
## License
diff --git a/actix-codec/CHANGES.md b/actix-codec/CHANGES.md
index 2de0bcf6..ec54e407 100644
--- a/actix-codec/CHANGES.md
+++ b/actix-codec/CHANGES.md
@@ -1,39 +1,40 @@
# Changes
-## Unreleased - 2022-xx-xx
-- Minimum supported Rust version (MSRV) is now 1.57.
+## Unreleased
+- Minimum supported Rust version (MSRV) is now 1.65.
+
+## 0.5.1
-## 0.5.1 - 2022-03-15
- 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
-## 0.5.0 - 2022-02-15
- Updated `tokio-util` dependency to `0.7.0`. [#446]
[#446]: https://github.com/actix/actix-net/pull/446
+## 0.4.2
-## 0.4.2 - 2021-12-31
- No significant changes since `0.4.1`.
+## 0.4.1
-## 0.4.1 - 2021-11-05
- 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
-## 0.4.0 - 2021-04-20
- No significant changes since v0.4.0-beta.1.
+## 0.4.0-beta.1
-## 0.4.0-beta.1 - 2020-12-28
- Replace `pin-project` with `pin-project-lite`. [#237]
- Upgrade `tokio` dependency to `1`. [#237]
- Upgrade `tokio-util` dependency to `0.6`. [#237]
@@ -41,16 +42,16 @@
[#237]: https://github.com/actix/actix-net/pull/237
+## 0.3.0
-## 0.3.0 - 2020-08-23
- No changes from beta 2.
+## 0.3.0-beta.2
-## 0.3.0-beta.2 - 2020-08-19
- Remove unused type parameter from `Framed::replace_codec`.
+## 0.3.0-beta.1
-## 0.3.0-beta.1 - 2020-08-19
- Use `.advance()` instead of `.split_to()`.
- Upgrade `tokio-util` to `0.3`.
- Improve `BytesCodec::encode()` performance.
@@ -59,31 +60,31 @@
- Add method on `Framed` to get a pinned reference to the underlying I/O.
- Add method on `Framed` check emptiness of read buffer.
+## 0.2.0
-## 0.2.0 - 2019-12-10
- Use specific futures dependencies.
-
## 0.2.0-alpha.4
+
- Fix buffer remaining capacity calculation.
-
## 0.2.0-alpha.3
+
- Use tokio 0.2.
- Fix low/high watermark for write/read buffers.
-
## 0.2.0-alpha.2
+
- Migrated to `std::future`.
+## 0.1.2
-## 0.1.2 - 2019-03-27
- Added `Framed::map_io()` method.
+## 0.1.1
-## 0.1.1 - 2019-03-06
- Added `FramedParts::with_read_buffer()` method.
+## 0.1.0
-## 0.1.0 - 2018-12-09
- Move codec to separate crate.
diff --git a/actix-codec/Cargo.toml b/actix-codec/Cargo.toml
index fbefebe0..91fefc7c 100644
--- a/actix-codec/Cargo.toml
+++ b/actix-codec/Cargo.toml
@@ -10,25 +10,31 @@ keywords = ["network", "framework", "async", "futures"]
repository = "https://github.com/actix/actix-net"
categories = ["network-programming", "asynchronous"]
license = "MIT OR Apache-2.0"
-edition = "2018"
+edition.workspace = true
+rust-version.workspace = true
-[lib]
-name = "actix_codec"
-path = "src/lib.rs"
+[package.metadata.cargo_check_external_types]
+allowed_external_types = [
+ "bytes::*",
+ "futures_core::*",
+ "futures_sink::*",
+ "tokio::*",
+ "tokio_util::*",
+]
[dependencies]
-bitflags = "1.2"
+bitflags = "2"
bytes = "1"
futures-core = { version = "0.3.7", default-features = false }
futures-sink = { version = "0.3.7", default-features = false }
memchr = "2.3"
pin-project-lite = "0.2"
-tokio = "1.13.1"
+tokio = "1.23.1"
tokio-util = { version = "0.7", features = ["codec", "io"] }
tracing = { version = "0.1.30", default-features = false, features = ["log"] }
[dev-dependencies]
-criterion = { version = "0.3", features = ["html_reports"] }
+criterion = { version = "0.5", features = ["html_reports"] }
tokio-test = "0.4.2"
[[bench]]
diff --git a/actix-codec/src/framed.rs b/actix-codec/src/framed.rs
index c03ea02d..6d6e1478 100644
--- a/actix-codec/src/framed.rs
+++ b/actix-codec/src/framed.rs
@@ -18,6 +18,7 @@ const LW: usize = 1024;
const HW: usize = 8 * 1024;
bitflags! {
+ #[derive(Debug, Clone, Copy)]
struct Flags: u8 {
const EOF = 0b0001;
const READABLE = 0b0010;
@@ -233,10 +234,7 @@ impl Framed {
}
/// Flush write buffer to underlying I/O stream.
- pub fn flush(
- mut self: Pin<&mut Self>,
- cx: &mut Context<'_>,
- ) -> Poll>
+ pub fn flush(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll>
where
T: AsyncWrite,
U: Encoder,
@@ -269,10 +267,7 @@ impl Framed {
}
/// Flush write buffer and shutdown underlying I/O stream.
- pub fn close(
- mut self: Pin<&mut Self>,
- cx: &mut Context<'_>,
- ) -> Poll>
+ pub fn close(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll>
where
T: AsyncWrite,
U: Encoder,
diff --git a/actix-codec/src/lib.rs b/actix-codec/src/lib.rs
index db1f90de..7dc28b35 100644
--- a/actix-codec/src/lib.rs
+++ b/actix-codec/src/lib.rs
@@ -1,8 +1,7 @@
//! Codec utilities for working with framed protocols.
//!
-//! Contains adapters to go from streams of bytes, [`AsyncRead`] and
-//! [`AsyncWrite`], to framed streams implementing [`Sink`] and [`Stream`].
-//! Framed streams are also known as `transports`.
+//! Contains adapters to go from streams of bytes, [`AsyncRead`] and [`AsyncWrite`], to framed
+//! streams implementing [`Sink`] and [`Stream`]. Framed streams are also known as `transports`.
//!
//! [`Sink`]: futures_sink::Sink
//! [`Stream`]: futures_core::Stream
@@ -12,14 +11,18 @@
#![doc(html_logo_url = "https://actix.rs/img/logo.png")]
#![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
+pub use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
+pub use tokio_util::{
+ codec::{Decoder, Encoder},
+ io::poll_read_buf,
+};
+
mod bcodec;
mod framed;
mod lines;
-pub use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
-pub use tokio_util::codec::{Decoder, Encoder};
-pub use tokio_util::io::poll_read_buf;
-
-pub use self::bcodec::BytesCodec;
-pub use self::framed::{Framed, FramedParts};
-pub use self::lines::LinesCodec;
+pub use self::{
+ bcodec::BytesCodec,
+ framed::{Framed, FramedParts},
+ lines::LinesCodec,
+};
diff --git a/actix-codec/tests/test_framed_sink.rs b/actix-codec/tests/test_framed_sink.rs
index 390aebf2..8c98ff18 100644
--- a/actix-codec/tests/test_framed_sink.rs
+++ b/actix-codec/tests/test_framed_sink.rs
@@ -81,10 +81,7 @@ impl AsyncWrite for Bilateral {
other => Ready(other),
}
}
- fn poll_shutdown(
- self: Pin<&mut Self>,
- _cx: &mut Context<'_>,
- ) -> Poll> {
+ fn poll_shutdown(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll> {
unimplemented!()
}
}
diff --git a/actix-macros/CHANGES.md b/actix-macros/CHANGES.md
index 9a25f7ed..570c4e1e 100644
--- a/actix-macros/CHANGES.md
+++ b/actix-macros/CHANGES.md
@@ -1,47 +1,51 @@
# Changes
-## Unreleased - 2022-xx-xx
-- Minimum supported Rust version (MSRV) is now 1.57.
+## Unreleased
+## 0.2.4
+
+- Update `syn` dependency to `2`.
+- Minimum supported Rust version (MSRV) is now 1.65.
+
+## 0.2.3
-## 0.2.3 - 2021-10-19
- Fix test macro in presence of other imports named "test". [#399]
[#399]: https://github.com/actix/actix-net/pull/399
+## 0.2.2
-## 0.2.2 - 2021-10-14
- Improve error recovery potential when macro input is invalid. [#391]
- Allow custom `System`s on test macro. [#391]
[#391]: https://github.com/actix/actix-net/pull/391
+## 0.2.1
-## 0.2.1 - 2021-02-02
- Add optional argument `system` to `main` macro which can be used to specify the path to `actix_rt::System` (useful for re-exports). [#363]
[#363]: https://github.com/actix/actix-net/pull/363
+## 0.2.0
-## 0.2.0 - 2021-02-02
- Update to latest `actix_rt::System::new` signature. [#261]
[#261]: https://github.com/actix/actix-net/pull/261
+## 0.2.0-beta.1
-## 0.2.0-beta.1 - 2021-01-09
- Remove `actix-reexport` feature. [#218]
[#218]: https://github.com/actix/actix-net/pull/218
+## 0.1.3
-## 0.1.3 - 2020-12-03
- Add `actix-reexport` feature. [#218]
[#218]: https://github.com/actix/actix-net/pull/218
+## 0.1.2
-## 0.1.2 - 2020-05-18
- Forward actix_rt::test arguments to test function [#127]
[#127]: https://github.com/actix/actix-net/pull/127
diff --git a/actix-macros/Cargo.toml b/actix-macros/Cargo.toml
index 75ac8b72..b96daeb9 100644
--- a/actix-macros/Cargo.toml
+++ b/actix-macros/Cargo.toml
@@ -1,27 +1,37 @@
[package]
name = "actix-macros"
-version = "0.2.3"
+version = "0.2.4"
authors = [
"Nikolay Kim ",
"Ibraheem Ahmed ",
"Rob Ede ",
]
description = "Macros for Actix system and runtime"
-repository = "https://github.com/actix/actix-net.git"
+repository = "https://github.com/actix/actix-net"
categories = ["network-programming", "asynchronous"]
-license = "MIT OR Apache-2.0"
-edition = "2018"
+license.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+
+[package.metadata.cargo-machete]
+ignored = [
+ "proc_macro2", # specified for minimal versions compat
+]
[lib]
proc-macro = true
[dependencies]
-quote = "1.0.3"
-syn = { version = "^1", features = ["full"] }
+quote = "1"
+syn = { version = "2", features = ["full"] }
+
+# minimal versions compat
+[target.'cfg(any())'.dependencies]
+proc-macro2 = "1.0.60"
[dev-dependencies]
-actix-rt = "2.0.0"
+actix-rt = "2"
-futures-util = { version = "0.3.7", default-features = false }
+futures-util = { version = "0.3.17", default-features = false }
rustversion = "1"
trybuild = "1"
diff --git a/actix-macros/src/lib.rs b/actix-macros/src/lib.rs
index 284f6920..cd546f0e 100644
--- a/actix-macros/src/lib.rs
+++ b/actix-macros/src/lib.rs
@@ -15,6 +15,9 @@
use proc_macro::TokenStream;
use quote::quote;
+use syn::parse::Parser as _;
+
+type AttributeArgs = syn::punctuated::Punctuated;
/// Marks async entry-point function to be executed by Actix system.
///
@@ -25,9 +28,7 @@ use quote::quote;
/// println!("Hello world");
/// }
/// ```
-#[allow(clippy::needless_doctest_main)]
#[proc_macro_attribute]
-#[cfg(not(test))] // Work around for rust-lang/rust#62127
pub fn main(args: TokenStream, item: TokenStream) -> TokenStream {
let mut input = match syn::parse::(item.clone()) {
Ok(input) => input,
@@ -35,7 +36,11 @@ pub fn main(args: TokenStream, item: TokenStream) -> TokenStream {
Err(err) => return input_and_compile_error(item, err),
};
- let args = syn::parse_macro_input!(args as syn::AttributeArgs);
+ let parser = AttributeArgs::parse_terminated;
+ let args = match parser.parse(args.clone()) {
+ Ok(args) => args,
+ Err(err) => return input_and_compile_error(args, err),
+ };
let attrs = &input.attrs;
let vis = &input.vis;
@@ -55,11 +60,15 @@ pub fn main(args: TokenStream, item: TokenStream) -> TokenStream {
for arg in &args {
match arg {
- syn::NestedMeta::Meta(syn::Meta::NameValue(syn::MetaNameValue {
- lit: syn::Lit::Str(lit),
+ syn::Meta::NameValue(syn::MetaNameValue {
path,
+ value:
+ syn::Expr::Lit(syn::ExprLit {
+ lit: syn::Lit::Str(lit),
+ ..
+ }),
..
- })) => match path
+ }) => match path
.get_ident()
.map(|i| i.to_string().to_lowercase())
.as_deref()
@@ -78,6 +87,7 @@ pub fn main(args: TokenStream, item: TokenStream) -> TokenStream {
.into();
}
},
+
_ => {
return syn::Error::new_spanned(arg, "Unknown attribute specified")
.to_compile_error()
@@ -114,7 +124,11 @@ pub fn test(args: TokenStream, item: TokenStream) -> TokenStream {
Err(err) => return input_and_compile_error(item, err),
};
- let args = syn::parse_macro_input!(args as syn::AttributeArgs);
+ let parser = AttributeArgs::parse_terminated;
+ let args = match parser.parse(args.clone()) {
+ Ok(args) => args,
+ Err(err) => return input_and_compile_error(args, err),
+ };
let attrs = &input.attrs;
let vis = &input.vis;
@@ -123,7 +137,7 @@ pub fn test(args: TokenStream, item: TokenStream) -> TokenStream {
let mut has_test_attr = false;
for attr in attrs {
- if attr.path.is_ident("test") {
+ if attr.path().is_ident("test") {
has_test_attr = true;
}
}
@@ -149,11 +163,15 @@ pub fn test(args: TokenStream, item: TokenStream) -> TokenStream {
for arg in &args {
match arg {
- syn::NestedMeta::Meta(syn::Meta::NameValue(syn::MetaNameValue {
- lit: syn::Lit::Str(lit),
+ syn::Meta::NameValue(syn::MetaNameValue {
path,
+ value:
+ syn::Expr::Lit(syn::ExprLit {
+ lit: syn::Lit::Str(lit),
+ ..
+ }),
..
- })) => match path
+ }) => match path
.get_ident()
.map(|i| i.to_string().to_lowercase())
.as_deref()
diff --git a/actix-macros/tests/trybuild.rs b/actix-macros/tests/trybuild.rs
index 2af99636..b37b84ba 100644
--- a/actix-macros/tests/trybuild.rs
+++ b/actix-macros/tests/trybuild.rs
@@ -1,7 +1,8 @@
-#[rustversion::stable(1.46)] // MSRV
+#[rustversion::stable(1.65)] // MSRV
#[test]
fn compile_macros() {
let t = trybuild::TestCases::new();
+
t.pass("tests/trybuild/main-01-basic.rs");
t.compile_fail("tests/trybuild/main-02-only-async.rs");
t.pass("tests/trybuild/main-03-fn-params.rs");
diff --git a/actix-macros/tests/trybuild/main-02-only-async.stderr b/actix-macros/tests/trybuild/main-02-only-async.stderr
index fc060071..2b15ecaa 100644
--- a/actix-macros/tests/trybuild/main-02-only-async.stderr
+++ b/actix-macros/tests/trybuild/main-02-only-async.stderr
@@ -1,14 +1,11 @@
error: the async keyword is missing from the function declaration
- --> $DIR/main-02-only-async.rs:2:1
+ --> tests/trybuild/main-02-only-async.rs:2:1
|
2 | fn main() {
| ^^
error[E0601]: `main` function not found in crate `$CRATE`
- --> $DIR/main-02-only-async.rs:1:1
+ --> tests/trybuild/main-02-only-async.rs:4:2
|
-1 | / #[actix_rt::main]
-2 | | fn main() {
-3 | | futures_util::future::ready(()).await
-4 | | }
- | |_^ consider adding a `main` function to `$DIR/tests/trybuild/main-02-only-async.rs`
+4 | }
+ | ^ consider adding a `main` function to `$DIR/tests/trybuild/main-02-only-async.rs`
diff --git a/actix-rt/CHANGES.md b/actix-rt/CHANGES.md
index b19b2b7d..dc2d0fc3 100644
--- a/actix-rt/CHANGES.md
+++ b/actix-rt/CHANGES.md
@@ -1,91 +1,101 @@
# Changes
-## Unreleased - 2022-xx-xx
+## Unreleased
+
+## 2.9.0
+
+- Add `actix_rt::System::runtime()` method to retrieve the underlying `actix_rt::Runtime` runtime.
+- Add `actix_rt::Runtime::tokio_runtime()` method to retrieve the underlying Tokio runtime.
+- Minimum supported Rust version (MSRV) is now 1.65.
+
+## 2.8.0
+
- Add `#[track_caller]` attribute to `spawn` functions and methods. [#454]
-- Minimum supported Rust version (MSRV) is now 1.57.
+- 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
-## 2.7.0 - 2022-03-08
-- Update `tokio-uring` dependency to `0.3.0`. [#448]
+- 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
-## 2.6.0 - 2022-01-12
-- Update `tokio-uring` dependency to `0.2.0`. [#436]
+- Update `tokio-uring` dependency to `0.2`. [#436]
[#436]: https://github.com/actix/actix-net/pull/436
+## 2.5.1
-## 2.5.1 - 2021-12-31
- Expose `System::with_tokio_rt` and `Arbiter::with_tokio_rt`. [#430]
[#430]: https://github.com/actix/actix-net/pull/430
+## 2.5.0
-## 2.5.0 - 2021-11-22
- 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
-## 2.4.0 - 2021-11-05
- 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
-## 2.3.0 - 2021-10-11
- 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
-## 2.2.0 - 2021-03-29
-- **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.
+- **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
-## 2.1.0 - 2021-02-24
- 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
-## 2.0.2 - 2021-02-06
- 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
-## 2.0.1 - 2021-02-06
- Expose `JoinError` from Tokio. [#271]
[#271]: https://github.com/actix/actix-net/pull/271
+## 2.0.0
-## 2.0.0 - 2021-02-02
- 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
-## 2.0.0-beta.3 - 2021-01-31
- 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]
@@ -108,21 +118,20 @@
[#256]: https://github.com/actix/actix-net/pull/256
[#257]: https://github.com/actix/actix-net/pull/257
+## 2.0.0-beta.2
-## 2.0.0-beta.2 - 2021-01-09
- 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
-## 2.0.0-beta.1 - 2020-12-28
- 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]
+- 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. [#236]
+ - 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]
@@ -130,74 +139,73 @@
[#207]: https://github.com/actix/actix-net/pull/207
[#236]: https://github.com/actix/actix-net/pull/236
+## 1.1.1
-## 1.1.1 - 2020-04-30
- Fix memory leak due to [#94] (see [#129] for more detail)
[#129]: https://github.com/actix/actix-net/issues/129
+## 1.1.0 _(YANKED)_
-## 1.1.0 - 2020-04-08 _(YANKED)_
- 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]
+- 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
-## 1.0.0 - 2019-12-11
- Update dependencies
+## 1.0.0-alpha.3
-## 1.0.0-alpha.3 - 2019-12-07
- Migrate to tokio 0.2
- Fix compilation on non-unix platforms
+## 1.0.0-alpha.2
-## 1.0.0-alpha.2 - 2019-12-02
- Export `main` and `test` attribute macros
- Export `time` module (re-export of tokio-timer)
- Export `net` module (re-export of tokio-net)
+## 1.0.0-alpha.1
-## 1.0.0-alpha.1 - 2019-11-22
- Migrate to std::future and tokio 0.2
+## 0.2.6
-## 0.2.6 - 2019-11-14
- Allow to join arbiter's thread. #60
- Fix arbiter's thread panic message.
+## 0.2.5
-## 0.2.5 - 2019-09-02
- Add arbiter specific storage
+## 0.2.4
-## 0.2.4 - 2019-07-17
- Avoid a copy of the Future when initializing the Box. #29
+## 0.2.3
-## 0.2.3 - 2019-06-22
- Allow to start System using existing CurrentThread Handle #22
+## 0.2.2
-## 0.2.2 - 2019-03-28
- Moved `blocking` module to `actix-threadpool` crate
+## 0.2.1
-## 0.2.1 - 2019-03-11
- Added `blocking` module
- Added `Arbiter::exec_fn` - execute fn on the arbiter's thread
- Added `Arbiter::exec` - execute fn on the arbiter's thread and wait result
+## 0.2.0
-## 0.2.0 - 2019-03-06
- `run` method returns `io::Result<()>`
- Removed `Handle`
+## 0.1.0
-## 0.1.0 - 2018-12-09
- Initial release
diff --git a/actix-rt/Cargo.toml b/actix-rt/Cargo.toml
index 356c1f09..1f2970bf 100644
--- a/actix-rt/Cargo.toml
+++ b/actix-rt/Cargo.toml
@@ -1,10 +1,9 @@
[package]
name = "actix-rt"
-version = "2.7.0"
+version = "2.9.0"
authors = [
"Nikolay Kim ",
"Rob Ede ",
- "fakeshadow <24548779@qq.com>",
]
description = "Tokio-based single-threaded async runtime for the Actix ecosystem"
keywords = ["async", "futures", "io", "runtime"]
@@ -12,11 +11,13 @@ homepage = "https://actix.rs"
repository = "https://github.com/actix/actix-net.git"
categories = ["network-programming", "asynchronous"]
license = "MIT OR Apache-2.0"
-edition = "2018"
+edition.workspace = true
+rust-version.workspace = true
-[lib]
-name = "actix_rt"
-path = "src/lib.rs"
+[package.metadata.cargo_check_external_types]
+allowed_external_types = [
+ "tokio::*",
+]
[features]
default = ["macros", "net"]
@@ -28,12 +29,12 @@ net = ["tokio/net", "tokio/signal"]
actix-macros = { version = "0.2.3", optional = true }
futures-core = { version = "0.3", default-features = false }
-tokio = { version = "1.13.1", features = ["rt", "parking_lot", "sync", "time"] }
+tokio = { version = "1.23.1", features = ["rt", "parking_lot", "sync", "time"] }
# runtime for `io-uring` feature
[target.'cfg(target_os = "linux")'.dependencies]
-tokio-uring = { version = "0.3", optional = true }
+tokio-uring = { version = "0.4", optional = true }
[dev-dependencies]
-tokio = { version = "1.13.1", features = ["full"] }
+tokio = { version = "1.23.1", features = ["full"] }
hyper = { version = "0.14.10", default-features = false, features = ["server", "tcp", "http1"] }
diff --git a/actix-rt/README.md b/actix-rt/README.md
index e598f0b6..ee206b03 100644
--- a/actix-rt/README.md
+++ b/actix-rt/README.md
@@ -3,11 +3,11 @@
> Tokio-based single-threaded async runtime for the Actix ecosystem.
[](https://crates.io/crates/actix-rt)
-[](https://docs.rs/actix-rt/2.7.0)
+[](https://docs.rs/actix-rt/2.9.0)
[](https://blog.rust-lang.org/2020/03/12/Rust-1.46.html)
-[](https://deps.rs/crate/actix-rt/2.7.0)
+[](https://deps.rs/crate/actix-rt/2.9.0)
[](https://discord.gg/WghFtEH6Hb)
diff --git a/actix-rt/examples/hyper.rs b/actix-rt/examples/hyper.rs
index 45b5e551..41c5a7d8 100644
--- a/actix-rt/examples/hyper.rs
+++ b/actix-rt/examples/hyper.rs
@@ -20,8 +20,7 @@ fn main() {
let make_service =
make_service_fn(|_conn| async { Ok::<_, Infallible>(service_fn(handle)) });
- let server =
- Server::bind(&SocketAddr::from(([127, 0, 0, 1], 3000))).serve(make_service);
+ let server = Server::bind(&SocketAddr::from(([127, 0, 0, 1], 3000))).serve(make_service);
if let Err(err) = server.await {
eprintln!("server error: {}", err);
diff --git a/actix-rt/src/arbiter.rs b/actix-rt/src/arbiter.rs
index 4c9a588e..48cc752f 100644
--- a/actix-rt/src/arbiter.rs
+++ b/actix-rt/src/arbiter.rs
@@ -99,8 +99,7 @@ impl Arbiter {
#[allow(clippy::new_without_default)]
pub fn new() -> Arbiter {
Self::with_tokio_rt(|| {
- crate::runtime::default_tokio_runtime()
- .expect("Cannot create new Arbiter's Runtime.")
+ crate::runtime::default_tokio_runtime().expect("Cannot create new Arbiter's Runtime.")
})
}
@@ -149,9 +148,7 @@ impl Arbiter {
.send(SystemCommand::DeregisterArbiter(arb_id));
}
})
- .unwrap_or_else(|err| {
- panic!("Cannot spawn Arbiter's thread: {:?}. {:?}", &name, err)
- });
+ .unwrap_or_else(|err| panic!("Cannot spawn Arbiter's thread: {name:?}: {err:?}"));
ready_rx.recv().unwrap();
@@ -201,9 +198,7 @@ impl Arbiter {
.send(SystemCommand::DeregisterArbiter(arb_id));
}
})
- .unwrap_or_else(|err| {
- panic!("Cannot spawn Arbiter's thread: {:?}. {:?}", &name, err)
- });
+ .unwrap_or_else(|err| panic!("Cannot spawn Arbiter's thread: {name:?}: {err:?}"));
ready_rx.recv().unwrap();
@@ -303,7 +298,7 @@ impl Future for ArbiterRunner {
fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll {
// process all items currently buffered in channel
loop {
- match ready!(Pin::new(&mut self.rx).poll_recv(cx)) {
+ match ready!(self.rx.poll_recv(cx)) {
// channel closed; no more messages can be received
None => return Poll::Ready(()),
diff --git a/actix-rt/src/lib.rs b/actix-rt/src/lib.rs
index 22002b8f..39eb4ab5 100644
--- a/actix-rt/src/lib.rs
+++ b/actix-rt/src/lib.rs
@@ -65,9 +65,11 @@ mod system;
pub use tokio::pin;
use tokio::task::JoinHandle;
-pub use self::arbiter::{Arbiter, ArbiterHandle};
-pub use self::runtime::Runtime;
-pub use self::system::{System, SystemRunner};
+pub use self::{
+ arbiter::{Arbiter, ArbiterHandle},
+ runtime::Runtime,
+ system::{System, SystemRunner},
+};
#[cfg(feature = "net")]
pub mod signal {
@@ -91,12 +93,13 @@ pub mod net {
task::{Context, Poll},
};
- pub use tokio::io::Ready;
use tokio::io::{AsyncRead, AsyncWrite, Interest};
- pub use tokio::net::UdpSocket;
- pub use tokio::net::{TcpListener, TcpSocket, TcpStream};
#[cfg(unix)]
pub use tokio::net::{UnixDatagram, UnixListener, UnixStream};
+ pub use tokio::{
+ io::Ready,
+ net::{TcpListener, TcpSocket, TcpStream, UdpSocket},
+ };
/// Extension trait over async read+write types that can also signal readiness.
#[doc(hidden)]
@@ -155,10 +158,9 @@ pub mod net {
pub mod time {
//! Utilities for tracking time (Tokio re-exports).
- pub use tokio::time::Instant;
- pub use tokio::time::{interval, interval_at, Interval};
- pub use tokio::time::{sleep, sleep_until, Sleep};
- pub use tokio::time::{timeout, Timeout};
+ pub use tokio::time::{
+ interval, interval_at, sleep, sleep_until, timeout, Instant, Interval, Sleep, Timeout,
+ };
}
pub mod task {
diff --git a/actix-rt/src/runtime.rs b/actix-rt/src/runtime.rs
index fb0182ea..cac9f962 100644
--- a/actix-rt/src/runtime.rs
+++ b/actix-rt/src/runtime.rs
@@ -69,6 +69,62 @@ impl Runtime {
self.local.spawn_local(future)
}
+ /// Retrieves a reference to the underlying Tokio runtime associated with this instance.
+ ///
+ /// The Tokio runtime is responsible for executing asynchronous tasks and managing
+ /// the event loop for an asynchronous Rust program. This method allows accessing
+ /// the runtime to interact with its features directly.
+ ///
+ /// In a typical use case, you might need to share the same runtime between different
+ /// modules of your project. For example, a module might require a `tokio::runtime::Handle`
+ /// to spawn tasks on the same runtime, or the runtime itself to configure more complex
+ /// behaviours.
+ ///
+ /// # Example
+ ///
+ /// ```
+ /// use actix_rt::Runtime;
+ ///
+ /// mod module_a {
+ /// pub fn do_something(handle: tokio::runtime::Handle) {
+ /// handle.spawn(async {
+ /// // Some asynchronous task here
+ /// });
+ /// }
+ /// }
+ ///
+ /// mod module_b {
+ /// pub fn do_something_else(rt: &tokio::runtime::Runtime) {
+ /// rt.spawn(async {
+ /// // Another asynchronous task here
+ /// });
+ /// }
+ /// }
+ ///
+ /// let actix_runtime = actix_rt::Runtime::new().unwrap();
+ /// let tokio_runtime = actix_runtime.tokio_runtime();
+ ///
+ /// let handle = tokio_runtime.handle().clone();
+ ///
+ /// module_a::do_something(handle);
+ /// module_b::do_something_else(tokio_runtime);
+ /// ```
+ ///
+ /// # Returns
+ ///
+ /// An immutable reference to the `tokio::runtime::Runtime` instance associated with this
+ /// `Runtime` instance.
+ ///
+ /// # Note
+ ///
+ /// While this method provides an immutable reference to the Tokio runtime, which is safe to share across threads,
+ /// be aware that spawning blocking tasks on the Tokio runtime could potentially impact the execution
+ /// of the Actix runtime. This is because Tokio is responsible for driving the Actix system,
+ /// and blocking tasks could delay or deadlock other tasks in run loop.
+ pub fn tokio_runtime(&self) -> &tokio::runtime::Runtime {
+ &self.rt
+ }
+
/// Runs the provided future, blocking the current thread until the future completes.
///
/// This function can be used to synchronously block the current thread until the provided
diff --git a/actix-rt/src/system.rs b/actix-rt/src/system.rs
index f3a5a4d8..4c276beb 100644
--- a/actix-rt/src/system.rs
+++ b/actix-rt/src/system.rs
@@ -203,6 +203,40 @@ impl SystemRunner {
.map_err(|err| io::Error::new(io::ErrorKind::Other, err))
}
+ /// Retrieves a reference to the underlying [Actix runtime](crate::Runtime) associated with this
+ /// `SystemRunner` instance.
+ ///
+ /// The Actix runtime is responsible for managing the event loop for an Actix system and
+ /// executing asynchronous tasks. This method provides access to the runtime, allowing direct
+ /// interaction with its features.
+ ///
+ /// In a typical use case, you might need to share the same runtime between different
+ /// parts of your project. For example, some components might require a [`Runtime`] to spawn
+ /// tasks on the same runtime.
+ ///
+ /// Read more in the documentation for [`Runtime`].
+ ///
+ /// # Examples
+ ///
+ /// ```
+ /// let system_runner = actix_rt::System::new();
+ /// let actix_runtime = system_runner.runtime();
+ ///
+ /// // Use the runtime to spawn an async task or perform other operations
+ /// ```
+ ///
+ /// # Note
+ ///
+ /// While this method provides an immutable reference to the Actix runtime, which is safe to
+ /// share across threads, be aware that spawning blocking tasks on the Actix runtime could
+ /// potentially impact system performance. This is because the Actix runtime is responsible for
+ /// driving the system, and blocking tasks could delay other tasks in the run loop.
+ ///
+ /// [`Runtime`]: crate::Runtime
+ pub fn runtime(&self) -> &crate::runtime::Runtime {
+ &self.rt
+ }
+
/// Runs the provided future, blocking the current thread until the future completes.
#[track_caller]
#[inline]
@@ -226,9 +260,7 @@ impl SystemRunner {
/// Runs the event loop until [stopped](System::stop_with_code), returning the exit code.
pub fn run_with_code(self) -> io::Result {
- unimplemented!(
- "SystemRunner::run_with_code is not implemented for io-uring feature yet"
- );
+ unimplemented!("SystemRunner::run_with_code is not implemented for io-uring feature yet");
}
/// Runs the provided future, blocking the current thread until the future completes.
@@ -292,7 +324,7 @@ impl Future for SystemController {
fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll {
// process all items currently buffered in channel
loop {
- match ready!(Pin::new(&mut self.cmd_rx).poll_recv(cx)) {
+ match ready!(self.cmd_rx.poll_recv(cx)) {
// channel closed; no more messages can be received
None => return Poll::Ready(()),
diff --git a/actix-server/CHANGES.md b/actix-server/CHANGES.md
index 1fdb63fd..9150031e 100644
--- a/actix-server/CHANGES.md
+++ b/actix-server/CHANGES.md
@@ -1,63 +1,74 @@
# Changes
-## Unreleased - 2022-xx-xx
-- Minimum supported Rust version (MSRV) is now 1.57.
+## Unreleased
+## 2.3.0
+
+- Add support for MultiPath TCP (MPTCP) with `MpTcp` enum and `ServerBuilder::mptcp()` method.
+- Minimum supported Rust version (MSRV) is now 1.65.
+
+## 2.2.0
+
+- Minimum supported Rust version (MSRV) is now 1.59.
+- Update `tokio-uring` dependency to `0.4`. [#473]
+
+[#473]: https://github.com/actix/actix-net/pull/473
+
+## 2.1.1
-## 2.1.1 - 2022-03-09
- No significant changes since `2.1.0`.
+## 2.1.0
-## 2.1.0 - 2022-03-08
-- Update `tokio-uring` dependency to `0.3.0`. [#448]
+- 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
-## 2.0.0 - 2022-01-19
- No significant changes since `2.0.0-rc.4`.
+## 2.0.0-rc.4
-## 2.0.0-rc.4 - 2022-01-12
-- Update `tokio-uring` dependency to `0.2.0`. [#436]
+- Update `tokio-uring` dependency to `0.2`. [#436]
[#436]: https://github.com/actix/actix-net/pull/436
+## 2.0.0-rc.3
-## 2.0.0-rc.3 - 2021-12-31
- No significant changes since `2.0.0-rc.2`.
+## 2.0.0-rc.2
-## 2.0.0-rc.2 - 2021-12-27
- Simplify `TestServer`. [#431]
[#431]: https://github.com/actix/actix-net/pull/431
+## 2.0.0-rc.1
-## 2.0.0-rc.1 - 2021-12-05
- 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
-## 2.0.0-beta.9 - 2021-11-15
- Restore `Arbiter` support lost in `beta.8`. [#417]
[#417]: https://github.com/actix/actix-net/pull/417
+## 2.0.0-beta.8
-## 2.0.0-beta.8 - 2021-11-05 _(YANKED)_
- Fix non-unix signal handler. [#410]
[#410]: https://github.com/actix/actix-net/pull/410
+## 2.0.0-beta.7
-## 2.0.0-beta.7 - 2021-11-05 _(YANKED)_
- 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]
@@ -69,34 +80,31 @@
[#407]: https://github.com/actix/actix-net/pull/407
[#408]: https://github.com/actix/actix-net/pull/408
+## 2.0.0-beta.6
-## 2.0.0-beta.6 - 2021-10-11
- 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]
+- 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
-## 2.0.0-beta.5 - 2021-04-20
-- Server shutdown notifies all workers to exit regardless if shutdown is graceful. This causes all
- workers to shutdown immediately in force shutdown case. [#333]
+- 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
-## 2.0.0-beta.4 - 2021-04-01
- Prevent panic when `shutdown_timeout` is very large. [f9262db]
[f9262db]: https://github.com/actix/actix-net/commit/f9262db
+## 2.0.0-beta.3
-## 2.0.0-beta.3 - 2021-02-06
- 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]
@@ -107,149 +115,148 @@
[#265]: https://github.com/actix/actix-net/pull/265
[#273]: https://github.com/actix/actix-net/pull/273
+## 2.0.0-beta.2
-## 2.0.0-beta.2 - 2021-01-03
- 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
-## 2.0.0-beta.1 - 2020-12-28
- 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]
+- 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
-## 1.0.4 - 2020-09-12
- Update actix-codec to 0.3.0.
- Workers must be greater than 0. [#167]
[#167]: https://github.com/actix/actix-net/pull/167
+## 1.0.3
-## 1.0.3 - 2020-05-19
- Replace deprecated `net2` crate with `socket2` [#140]
[#140]: https://github.com/actix/actix-net/pull/140
+## 1.0.2
-## 1.0.2 - 2020-02-26
- Avoid error by calling `reregister()` on Windows [#103]
[#103]: https://github.com/actix/actix-net/pull/103
+## 1.0.1
-## 1.0.1 - 2019-12-29
- Rename `.start()` method to `.run()`
+## 1.0.0
-## 1.0.0 - 2019-12-11
- Use actix-net releases
+## 1.0.0-alpha.4
-## 1.0.0-alpha.4 - 2019-12-08
- Use actix-service 1.0.0-alpha.4
+## 1.0.0-alpha.3
-## 1.0.0-alpha.3 - 2019-12-07
- Migrate to tokio 0.2
- Fix compilation on non-unix platforms
- Better handling server configuration
+## 1.0.0-alpha.2
-## 1.0.0-alpha.2 - 2019-12-02
- Simplify server service (remove actix-server-config)
- Allow to wait on `Server` until server stops
+## 0.8.0-alpha.1
-## 0.8.0-alpha.1 - 2019-11-22
- Migrate to `std::future`
+## 0.7.0
-## 0.7.0 - 2019-10-04
- Update `rustls` to 0.16
- Minimum required Rust version upped to 1.37.0
+## 0.6.1
-## 0.6.1 - 2019-09-25
- Add UDS listening support to `ServerBuilder`
+## 0.6.0
-## 0.6.0 - 2019-07-18
- Support Unix domain sockets #3
+## 0.5.1
-## 0.5.1 - 2019-05-18
- ServerBuilder::shutdown_timeout() accepts u64
+## 0.5.0
-## 0.5.0 - 2019-05-12
- Add `Debug` impl for `SslError`
- Derive debug for `Server` and `ServerCommand`
- Upgrade to actix-service 0.4
+## 0.4.3
-## 0.4.3 - 2019-04-16
- Re-export `IoStream` trait
- Depend on `ssl` and `rust-tls` features from actix-server-config
+## 0.4.2
-## 0.4.2 - 2019-03-30
- Fix SIGINT force shutdown
+## 0.4.1
-## 0.4.1 - 2019-03-14
- `SystemRuntime::on_start()` - allow to run future before server service initialization
+## 0.4.0
-## 0.4.0 - 2019-03-12
- Use `ServerConfig` for service factory
- Wrap tcp socket to `Io` type
- Upgrade actix-service
+## 0.3.1
-## 0.3.1 - 2019-03-04
- Add `ServerBuilder::maxconnrate` sets the maximum per-worker number of concurrent connections
- Add helper ssl error `SslError`
- Rename `StreamServiceFactory` to `ServiceFactory`
- Deprecate `StreamServiceFactory`
+## 0.3.0
-## 0.3.0 - 2019-03-02
- Use new `NewService` trait
+## 0.2.1
-## 0.2.1 - 2019-02-09
- Drop service response
+## 0.2.0
-## 0.2.0 - 2019-02-01
- Migrate to actix-service 0.2
- Updated rustls dependency
+## 0.1.3
-## 0.1.3 - 2018-12-21
- Fix max concurrent connections handling
+## 0.1.2
-## 0.1.2 - 2018-12-12
- rename ServiceConfig::rt() to ServiceConfig::apply()
- Fix back-pressure for concurrent ssl handshakes
+## 0.1.1
-## 0.1.1 - 2018-12-11
- Fix signal handling on windows
+## 0.1.0
-## 0.1.0 - 2018-12-09
- Move server to separate crate
diff --git a/actix-server/Cargo.toml b/actix-server/Cargo.toml
index be4a81b6..3a939218 100755
--- a/actix-server/Cargo.toml
+++ b/actix-server/Cargo.toml
@@ -1,9 +1,8 @@
[package]
name = "actix-server"
-version = "2.1.1"
+version = "2.3.0"
authors = [
"Nikolay Kim ",
- "fakeshadow <24548779@qq.com>",
"Rob Ede ",
"Ali MJ Al-Nasrawy ",
]
@@ -13,38 +12,39 @@ categories = ["network-programming", "asynchronous"]
homepage = "https://actix.rs"
repository = "https://github.com/actix/actix-net.git"
license = "MIT OR Apache-2.0"
-edition = "2018"
+edition.workspace = true
+rust-version.workspace = true
-[lib]
-name = "actix_server"
-path = "src/lib.rs"
+[package.metadata.cargo_check_external_types]
+allowed_external_types = [
+ "tokio::*",
+]
[features]
default = []
io-uring = ["tokio-uring", "actix-rt/io-uring"]
[dependencies]
-actix-rt = { version = "2.7", default-features = false }
+actix-rt = { version = "2.8", default-features = false }
actix-service = "2"
actix-utils = "3"
-futures-core = { version = "0.3.7", default-features = false, features = ["alloc"] }
-futures-util = { version = "0.3.7", default-features = false, features = ["alloc"] }
+futures-core = { version = "0.3.17", default-features = false, features = ["alloc"] }
+futures-util = { version = "0.3.17", default-features = false, features = ["alloc"] }
mio = { version = "0.8", features = ["os-poll", "net"] }
-num_cpus = "1.13"
-socket2 = "0.4.2"
-tokio = { version = "1.13.1", features = ["sync"] }
+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.3", optional = true }
+tokio-uring = { version = "0.4", optional = true }
[dev-dependencies]
-actix-codec = "0.5.0"
-actix-rt = "2.6.0"
+actix-codec = "0.5"
+actix-rt = "2.8"
bytes = "1"
-env_logger = "0.9"
-futures-util = { version = "0.3.7", default-features = false, features = ["sink", "async-await-macro"] }
-tokio = { version = "1.13.1", features = ["io-util", "rt-multi-thread", "macros", "fs"] }
+env_logger = "0.10"
+futures-util = { version = "0.3.17", default-features = false, features = ["sink", "async-await-macro"] }
+tokio = { version = "1.23.1", features = ["io-util", "rt-multi-thread", "macros", "fs"] }
diff --git a/actix-server/README.md b/actix-server/README.md
index 8fdef1f5..eb9a0bd7 100644
--- a/actix-server/README.md
+++ b/actix-server/README.md
@@ -2,14 +2,20 @@
> General purpose TCP server built for the Actix ecosystem.
+
+
[](https://crates.io/crates/actix-server)
-[](https://docs.rs/actix-server/2.1.1)
+[](https://docs.rs/actix-server/2.3.0)
[](https://blog.rust-lang.org/2021/05/06/Rust-1.52.0.html)
-
-[](https://deps.rs/crate/actix-server/2.1.1)
+
+
+[](https://deps.rs/crate/actix-server/2.3.0)
[](https://discord.gg/NWpN5mmg3x)
+
+
## Resources
+
- [Library Documentation](https://docs.rs/actix-server)
- [Examples](/actix-server/examples)
diff --git a/actix-server/src/builder.rs b/actix-server/src/builder.rs
index b6646081..bd5418c1 100644
--- a/actix-server/src/builder.rs
+++ b/actix-server/src/builder.rs
@@ -1,19 +1,34 @@
-use std::{io, time::Duration};
+use std::{io, num::NonZeroUsize, time::Duration};
use actix_rt::net::TcpStream;
use tokio::sync::mpsc::{unbounded_channel, UnboundedReceiver, UnboundedSender};
-use tracing::{info, trace};
use crate::{
server::ServerCommand,
service::{InternalServiceFactory, ServerServiceFactory, StreamNewService},
- socket::{
- create_mio_tcp_listener, MioListener, MioTcpListener, StdTcpListener, ToSocketAddrs,
- },
+ socket::{create_mio_tcp_listener, MioListener, MioTcpListener, StdTcpListener, ToSocketAddrs},
worker::ServerWorkerConfig,
Server,
};
+/// Multipath TCP (MPTCP) preference.
+///
+/// Currently only useful on Linux.
+///
+#[cfg_attr(target_os = "linux", doc = "Also see [`ServerBuilder::mptcp()`].")]
+#[derive(Debug, Clone)]
+pub enum MpTcp {
+ /// MPTCP will not be used when binding sockets.
+ Disabled,
+
+ /// MPTCP will be attempted when binding sockets. If errors occur, regular TCP will be
+ /// attempted, too.
+ TcpFallback,
+
+ /// MPTCP will be used when binding sockets (with no fallback).
+ NoFallback,
+}
+
/// [Server] builder.
pub struct ServerBuilder {
pub(crate) threads: usize,
@@ -21,6 +36,7 @@ pub struct ServerBuilder {
pub(crate) backlog: u32,
pub(crate) factories: Vec>,
pub(crate) sockets: Vec<(usize, String, MioListener)>,
+ pub(crate) mptcp: MpTcp,
pub(crate) exit: bool,
pub(crate) listen_os_signals: bool,
pub(crate) cmd_tx: UnboundedSender,
@@ -40,11 +56,12 @@ impl ServerBuilder {
let (cmd_tx, cmd_rx) = unbounded_channel();
ServerBuilder {
- threads: num_cpus::get_physical(),
+ threads: std::thread::available_parallelism().map_or(2, NonZeroUsize::get),
token: 0,
factories: Vec::new(),
sockets: Vec::new(),
backlog: 2048,
+ mptcp: MpTcp::Disabled,
exit: false,
listen_os_signals: true,
cmd_tx,
@@ -53,13 +70,19 @@ impl ServerBuilder {
}
}
- /// Set number of workers to start.
+ /// Sets number of workers to start.
+ ///
+ /// See [`bind()`](Self::bind()) for more details on how worker count affects the number of
+ /// server factory instantiations.
+ ///
+ /// The default worker count is the determined by [`std::thread::available_parallelism()`]. See
+ /// its documentation to determine what behavior you should expect when server is run.
///
/// `num` must be greater than 0.
///
- /// The default worker count is the number of physical CPU cores available. If your benchmark
- /// testing indicates that simultaneous multi-threading is beneficial to your app, you can use
- /// the [`num_cpus`] crate to acquire the _logical_ core count instead.
+ /// # Panics
+ ///
+ /// Panics if `num` is 0.
pub fn workers(mut self, num: usize) -> Self {
assert_ne!(num, 0, "workers must be greater than 0");
self.threads = num;
@@ -98,6 +121,24 @@ impl ServerBuilder {
self
}
+ /// Sets MultiPath TCP (MPTCP) preference on bound sockets.
+ ///
+ /// Multipath TCP (MPTCP) builds on top of TCP to improve connection redundancy and performance
+ /// by sharing a network data stream across multiple underlying TCP sessions. See [mptcp.dev]
+ /// for more info about MPTCP itself.
+ ///
+ /// MPTCP is available on Linux kernel version 5.6 and higher. In addition, you'll also need to
+ /// ensure the kernel option is enabled using `sysctl net.mptcp.enabled=1`.
+ ///
+ /// This method will have no effect if called after a `bind()`.
+ ///
+ /// [mptcp.dev]: https://www.mptcp.dev
+ #[cfg(target_os = "linux")]
+ pub fn mptcp(mut self, mptcp_enabled: MpTcp) -> Self {
+ self.mptcp = mptcp_enabled;
+ self
+ }
+
/// Sets the maximum per-worker number of concurrent connections.
///
/// All socket listeners will stop accepting connections when this limit is reached for
@@ -115,13 +156,15 @@ impl ServerBuilder {
self.max_concurrent_connections(num)
}
- /// Stop Actix `System` after server shutdown.
+ /// Sets flag to stop Actix `System` after server shutdown.
+ ///
+ /// This has no effect when server is running in a Tokio-only runtime.
pub fn system_exit(mut self) -> Self {
self.exit = true;
self
}
- /// Disable OS signal handling.
+ /// Disables OS signal handling.
pub fn disable_signals(mut self) -> Self {
self.listen_os_signals = false;
self
@@ -139,25 +182,49 @@ impl ServerBuilder {
self
}
- /// Add new service to the server.
- pub fn bind(mut self, name: N, addr: U, factory: F) -> io::Result
+ /// Adds new service to the server.
+ ///
+ /// Note that, if a DNS lookup is required, resolving hostnames is a blocking operation.
+ ///
+ /// # Worker Count
+ ///
+ /// The `factory` will be instantiated multiple times in most scenarios. The number of
+ /// instantiations is number of [`workers`](Self::workers()) × number of sockets resolved by
+ /// `addrs`.
+ ///
+ /// For example, if you've manually set [`workers`](Self::workers()) to 2, and use `127.0.0.1`
+ /// as the bind `addrs`, then `factory` will be instantiated twice. However, using `localhost`
+ /// as the bind `addrs` can often resolve to both `127.0.0.1` (IPv4) _and_ `::1` (IPv6), causing
+ /// the `factory` to be instantiated 4 times (2 workers × 2 bind addresses).
+ ///
+ /// Using a bind address of `0.0.0.0`, which signals to use all interfaces, may also multiple
+ /// the number of instantiations in a similar way.
+ ///
+ /// # Errors
+ ///
+ /// Returns an `io::Error` if:
+ /// - `addrs` cannot be resolved into one or more socket addresses;
+ /// - all the resolved socket addresses are already bound.
+ pub fn bind(mut self, name: N, addrs: U, factory: F) -> io::Result
where
F: ServerServiceFactory,
U: ToSocketAddrs,
N: AsRef,
{
- let sockets = bind_addr(addr, self.backlog)?;
+ let sockets = bind_addr(addrs, self.backlog, &self.mptcp)?;
- trace!("binding server to: {:?}", &sockets);
+ tracing::trace!("binding server to: {sockets:?}");
for lst in sockets {
let token = self.next_token();
+
self.factories.push(StreamNewService::create(
name.as_ref().to_string(),
token,
factory.clone(),
lst.local_addr()?,
));
+
self.sockets
.push((token, name.as_ref().to_string(), MioListener::Tcp(lst)));
}
@@ -165,7 +232,12 @@ impl ServerBuilder {
Ok(self)
}
- /// Add new service to the server.
+ /// Adds service to the server using a socket listener already bound.
+ ///
+ /// # Worker Count
+ ///
+ /// The `factory` will be instantiated multiple times in most scenarios. The number of
+ /// instantiations is: number of [`workers`](Self::workers()).
pub fn listen>(
mut self,
name: N,
@@ -197,7 +269,7 @@ impl ServerBuilder {
if self.sockets.is_empty() {
panic!("Server should have at least one bound socket");
} else {
- info!("starting {} workers", self.threads);
+ tracing::info!("starting {} workers", self.threads);
Server::new(self)
}
}
@@ -211,7 +283,12 @@ impl ServerBuilder {
#[cfg(unix)]
impl ServerBuilder {
- /// Add new unix domain service to the server.
+ /// Adds new service to the server using a UDS (unix domain socket) address.
+ ///
+ /// # Worker Count
+ ///
+ /// The `factory` will be instantiated multiple times in most scenarios. The number of
+ /// instantiations is: number of [`workers`](Self::workers()).
pub fn bind_uds(self, name: N, addr: U, factory: F) -> io::Result
where
F: ServerServiceFactory,
@@ -231,9 +308,14 @@ impl ServerBuilder {
self.listen_uds(name, lst, factory)
}
- /// Add new unix domain service to the server.
+ /// Adds new service to the server using a UDS (unix domain socket) listener already bound.
///
/// Useful when running as a systemd service and a socket FD is acquired externally.
+ ///
+ /// # Worker Count
+ ///
+ /// The `factory` will be instantiated multiple times in most scenarios. The number of
+ /// instantiations is: number of [`workers`](Self::workers()).
pub fn listen_uds>(
mut self,
name: N,
@@ -244,18 +326,22 @@ impl ServerBuilder {
F: ServerServiceFactory,
{
use std::net::{IpAddr, Ipv4Addr};
+
lst.set_nonblocking(true)?;
+
let token = self.next_token();
- let addr =
- crate::socket::StdSocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 8080);
+ let addr = crate::socket::StdSocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 8080);
+
self.factories.push(StreamNewService::create(
name.as_ref().to_string(),
token,
factory,
addr,
));
+
self.sockets
.push((token, name.as_ref().to_string(), MioListener::from(lst)));
+
Ok(self)
}
}
@@ -263,13 +349,14 @@ impl ServerBuilder {
pub(super) fn bind_addr(
addr: S,
backlog: u32,
+ mptcp: &MpTcp,
) -> io::Result> {
let mut opt_err = None;
let mut success = false;
let mut sockets = Vec::new();
for addr in addr.to_socket_addrs()? {
- match create_mio_tcp_listener(addr, backlog) {
+ match create_mio_tcp_listener(addr, backlog, mptcp) {
Ok(lst) => {
success = true;
sockets.push(lst);
diff --git a/actix-server/src/lib.rs b/actix-server/src/lib.rs
index 532313b6..24adf8ff 100644
--- a/actix-server/src/lib.rs
+++ b/actix-server/src/lib.rs
@@ -18,13 +18,15 @@ mod test_server;
mod waker_queue;
mod worker;
-pub use self::builder::ServerBuilder;
-pub use self::handle::ServerHandle;
-pub use self::server::Server;
-pub use self::service::ServerServiceFactory;
#[doc(hidden)]
pub use self::socket::FromStream;
-pub use self::test_server::TestServer;
+pub use self::{
+ builder::{MpTcp, ServerBuilder},
+ handle::ServerHandle,
+ server::Server,
+ service::ServerServiceFactory,
+ test_server::TestServer,
+};
/// Start server building process
#[doc(hidden)]
diff --git a/actix-server/src/server.rs b/actix-server/src/server.rs
index a7bd5b53..7e092e2b 100644
--- a/actix-server/src/server.rs
+++ b/actix-server/src/server.rs
@@ -363,6 +363,6 @@ impl Stream for ServerEventMultiplexer {
}
}
- Pin::new(&mut this.cmd_rx).poll_recv(cx)
+ this.cmd_rx.poll_recv(cx)
}
}
diff --git a/actix-server/src/service.rs b/actix-server/src/service.rs
index f07ec3e5..eba1470e 100644
--- a/actix-server/src/service.rs
+++ b/actix-server/src/service.rs
@@ -78,7 +78,7 @@ where
Ok(())
}
Err(err) => {
- error!("can not convert to an async TCP stream: {}", err);
+ error!("can not convert to an async TCP stream: {err}");
Err(())
}
})
diff --git a/actix-server/src/signals.rs b/actix-server/src/signals.rs
index 6a212d83..2b01f015 100644
--- a/actix-server/src/signals.rs
+++ b/actix-server/src/signals.rs
@@ -96,7 +96,7 @@ impl Future for Signals {
#[cfg(unix)]
{
for (sig, fut) in self.signals.iter_mut() {
- if Pin::new(fut).poll_recv(cx).is_ready() {
+ if fut.poll_recv(cx).is_ready() {
trace!("{} received", sig);
return Poll::Ready(*sig);
}
diff --git a/actix-server/src/socket.rs b/actix-server/src/socket.rs
index 8d2ffe8f..486c0d46 100644
--- a/actix-server/src/socket.rs
+++ b/actix-server/src/socket.rs
@@ -8,10 +8,11 @@ pub(crate) use mio::net::TcpListener as MioTcpListener;
use mio::{event::Source, Interest, Registry, Token};
#[cfg(unix)]
pub(crate) use {
- mio::net::UnixListener as MioUnixListener,
- std::os::unix::net::UnixListener as StdUnixListener,
+ mio::net::UnixListener as MioUnixListener, std::os::unix::net::UnixListener as StdUnixListener,
};
+use crate::builder::MpTcp;
+
pub(crate) enum MioListener {
Tcp(MioTcpListener),
#[cfg(unix)]
@@ -105,7 +106,7 @@ impl fmt::Debug for MioListener {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match *self {
MioListener::Tcp(ref lst) => write!(f, "{:?}", lst),
- #[cfg(all(unix))]
+ #[cfg(unix)]
MioListener::Uds(ref lst) => write!(f, "{:?}", lst),
}
}
@@ -224,10 +225,30 @@ mod unix_impl {
pub(crate) fn create_mio_tcp_listener(
addr: StdSocketAddr,
backlog: u32,
+ mptcp: &MpTcp,
) -> io::Result {
use socket2::{Domain, Protocol, Socket, Type};
- let socket = Socket::new(Domain::for_address(addr), Type::STREAM, Some(Protocol::TCP))?;
+ #[cfg(not(target_os = "linux"))]
+ let protocol = Protocol::TCP;
+ #[cfg(target_os = "linux")]
+ let protocol = if matches!(mptcp, MpTcp::Disabled) {
+ Protocol::TCP
+ } else {
+ Protocol::MPTCP
+ };
+
+ let socket = match Socket::new(Domain::for_address(addr), Type::STREAM, Some(protocol)) {
+ Ok(sock) => sock,
+
+ Err(err) if matches!(mptcp, MpTcp::TcpFallback) => {
+ tracing::warn!("binding socket as MPTCP failed: {err}");
+ tracing::warn!("falling back to TCP");
+ Socket::new(Domain::for_address(addr), Type::STREAM, Some(Protocol::TCP))?
+ }
+
+ Err(err) => return Err(err),
+ };
socket.set_reuse_address(true)?;
socket.set_nonblocking(true)?;
@@ -248,7 +269,7 @@ mod tests {
assert_eq!(format!("{}", addr), "127.0.0.1:8080");
let addr: StdSocketAddr = "127.0.0.1:0".parse().unwrap();
- let lst = create_mio_tcp_listener(addr, 128).unwrap();
+ let lst = create_mio_tcp_listener(addr, 128, &MpTcp::Disabled).unwrap();
let lst = MioListener::Tcp(lst);
assert!(format!("{:?}", lst).contains("TcpListener"));
assert!(format!("{}", lst).contains("127.0.0.1"));
diff --git a/actix-server/src/test_server.rs b/actix-server/src/test_server.rs
index 67659948..828e0216 100644
--- a/actix-server/src/test_server.rs
+++ b/actix-server/src/test_server.rs
@@ -117,7 +117,7 @@ impl TestServerHandle {
/// Stop server.
fn stop(&mut self) {
- let _ = self.server_handle.stop(false);
+ drop(self.server_handle.stop(false));
self.thread_handle.take().unwrap().join().unwrap().unwrap();
}
diff --git a/actix-server/src/worker.rs b/actix-server/src/worker.rs
index 35ba1366..7050fcd2 100644
--- a/actix-server/src/worker.rs
+++ b/actix-server/src/worker.rs
@@ -1,6 +1,7 @@
use std::{
future::Future,
io, mem,
+ num::NonZeroUsize,
pin::Pin,
rc::Rc,
sync::{
@@ -249,8 +250,11 @@ pub(crate) struct ServerWorkerConfig {
impl Default for ServerWorkerConfig {
fn default() -> Self {
- // 512 is the default max blocking thread count of tokio runtime.
- let max_blocking_threads = std::cmp::max(512 / num_cpus::get_physical(), 1);
+ let parallelism = std::thread::available_parallelism().map_or(2, NonZeroUsize::get);
+
+ // 512 is the default max blocking thread count of a Tokio runtime.
+ let max_blocking_threads = std::cmp::max(512 / parallelism, 1);
+
Self {
shutdown_timeout: Duration::from_secs(30),
max_blocking_threads,
@@ -585,9 +589,7 @@ impl Future for ServerWorker {
let this = self.as_mut().get_mut();
// `StopWorker` message handler
- if let Poll::Ready(Some(Stop { graceful, tx })) =
- Pin::new(&mut this.stop_rx).poll_recv(cx)
- {
+ if let Poll::Ready(Some(Stop { graceful, tx })) = this.stop_rx.poll_recv(cx) {
let num = this.counter.total();
if num == 0 {
info!("shutting down idle worker");
@@ -623,12 +625,13 @@ impl Future for ServerWorker {
self.poll(cx)
}
},
+
WorkerState::Restarting(ref mut restart) => {
let factory_id = restart.factory_id;
let token = restart.token;
- let (token_new, service) = ready!(restart.fut.as_mut().poll(cx))
- .unwrap_or_else(|_| {
+ let (token_new, service) =
+ ready!(restart.fut.as_mut().poll(cx)).unwrap_or_else(|_| {
panic!(
"Can not restart {:?} service",
this.factories[factory_id].name(token)
@@ -647,9 +650,10 @@ impl Future for ServerWorker {
self.poll(cx)
}
+
WorkerState::Shutdown(ref mut shutdown) => {
// drop all pending connections in rx channel.
- while let Poll::Ready(Some(conn)) = Pin::new(&mut this.conn_rx).poll_recv(cx) {
+ while let Poll::Ready(Some(conn)) = this.conn_rx.poll_recv(cx) {
// WorkerCounterGuard is needed as Accept thread has incremented counter.
// It's guard's job to decrement the counter together with drop of Conn.
let guard = this.counter.guard();
@@ -680,6 +684,7 @@ impl Future for ServerWorker {
shutdown.timer.as_mut().poll(cx)
}
}
+
// actively poll stream and handle worker command
WorkerState::Available => loop {
match this.check_readiness(cx) {
@@ -696,10 +701,13 @@ impl Future for ServerWorker {
}
// handle incoming io stream
- match ready!(Pin::new(&mut this.conn_rx).poll_recv(cx)) {
+ match ready!(this.conn_rx.poll_recv(cx)) {
Some(msg) => {
let guard = this.counter.guard();
- let _ = this.services[msg.token].service.call((guard, msg.io));
+ let _ = this.services[msg.token]
+ .service
+ .call((guard, msg.io))
+ .into_inner();
}
None => return Poll::Ready(()),
};
@@ -708,9 +716,7 @@ impl Future for ServerWorker {
}
}
-fn wrap_worker_services(
- services: Vec<(usize, usize, BoxedServerService)>,
-) -> Vec {
+fn wrap_worker_services(services: Vec<(usize, usize, BoxedServerService)>) -> Vec {
services
.into_iter()
.fold(Vec::new(), |mut services, (idx, token, service)| {
diff --git a/actix-server/tests/server.rs b/actix-server/tests/server.rs
index dc0c57ca..a46652d1 100644
--- a/actix-server/tests/server.rs
+++ b/actix-server/tests/server.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::let_underscore_future)]
+
use std::{
net,
sync::{
diff --git a/actix-service/CHANGES.md b/actix-service/CHANGES.md
index 5f4d5086..9a3b70a3 100644
--- a/actix-service/CHANGES.md
+++ b/actix-service/CHANGES.md
@@ -1,36 +1,37 @@
# Changes
-## Unreleased - 2022-xx-xx
-- Minimum supported Rust version (MSRV) is now 1.57.
+## Unreleased
+- Minimum supported Rust version (MSRV) is now 1.65.
+
+## 2.0.2
-## 2.0.2 - 2021-12-18
- Service types can now be `Send` and `'static` regardless of request, response, and config types, etc. [#397]
[#397]: https://github.com/actix/actix-net/pull/397
+## 2.0.1
-## 2.0.1 - 2021-10-11
- Documentation fix. [#388]
[#388]: https://github.com/actix/actix-net/pull/388
+## 2.0.0
-## 2.0.0 - 2021-04-16
- Removed pipeline and related structs/functions. [#335]
[#335]: https://github.com/actix/actix-net/pull/335
+## 2.0.0-beta.5
-## 2.0.0-beta.5 - 2021-03-15
- Add default `Service` trait impl for `Rc` and `&S: Service`. [#288]
- Add `boxed::rc_service` function for constructing `boxed::RcService` type [#290]
[#288]: https://github.com/actix/actix-net/pull/288
[#290]: https://github.com/actix/actix-net/pull/290
+## 2.0.0-beta.4
-## 2.0.0-beta.4 - 2021-02-04
- `Service::poll_ready` and `Service::call` receive `&self`. [#247]
- `apply_fn` and `apply_fn_factory` now receive `Fn(Req, &Service)` function type. [#247]
- `apply_cfg` and `apply_cfg_factory` now receive `Fn(Req, &Service)` function type. [#247]
@@ -38,158 +39,153 @@
[#247]: https://github.com/actix/actix-net/pull/247
+## 2.0.0-beta.3
-## 2.0.0-beta.3 - 2021-01-09
- The `forward_ready!` macro converts errors. [#246]
[#246]: https://github.com/actix/actix-net/pull/246
+## 2.0.0-beta.2
-## 2.0.0-beta.2 - 2021-01-03
- Remove redundant type parameter from `map_config`.
+## 2.0.0-beta.1
-## 2.0.0-beta.1 - 2020-12-28
-- `Service`, other traits, and many type signatures now take the the request type as a type
- parameter instead of an associated type. [#232]
+- `Service`, other traits, and many type signatures now take the the request type as a type parameter instead of an associated type. [#232]
- Add `always_ready!` and `forward_ready!` macros. [#233]
- Crate is now `no_std`. [#233]
- Migrate pin projections to `pin-project-lite`. [#233]
-- Remove `AndThenApplyFn` and Pipeline `and_then_apply_fn`. Use the
- `.and_then(apply_fn(...))` construction. [#233]
+- Remove `AndThenApplyFn` and Pipeline `and_then_apply_fn`. Use the `.and_then(apply_fn(...))` construction. [#233]
- Move non-vital methods to `ServiceExt` and `ServiceFactoryExt` extension traits. [#235]
[#232]: https://github.com/actix/actix-net/pull/232
[#233]: https://github.com/actix/actix-net/pull/233
[#235]: https://github.com/actix/actix-net/pull/235
+## 1.0.6
-## 1.0.6 - 2020-08-09
-- Removed unsound custom Cell implementation that allowed obtaining several mutable references to
- the same data, which is undefined behavior in Rust and could lead to violations of memory safety. External code could obtain several mutable references to the same data through
- service combinators. Attempts to acquire several mutable references to the same data will instead
- result in a panic.
+- Removed unsound custom Cell implementation that allowed obtaining several mutable references to the same data, which is undefined behavior in Rust and could lead to violations of memory safety. External code could obtain several mutable references to the same data through service combinators. Attempts to acquire several mutable references to the same data will instead result in a panic.
+## 1.0.5
-## 1.0.5 - 2020-01-16
- Fixed unsoundness in .and_then()/.then() service combinators.
+## 1.0.4
-## 1.0.4 - 2020-01-15
- Revert 1.0.3 change
+## 1.0.3
-## 1.0.3 - 2020-01-15
- Fixed unsoundness in `AndThenService` impl.
+## 1.0.2
-## 1.0.2 - 2020-01-08
- Add `into_service` helper function.
+## 1.0.1
-## 1.0.1 - 2019-12-22
- `map_config()` and `unit_config()` now accept `IntoServiceFactory` type.
+## 1.0.0
-## 1.0.0 - 2019-12-11
- Add Clone impl for Apply service
+## 1.0.0-alpha.4
-## 1.0.0-alpha.4 - 2019-12-08
- Renamed `service_fn` to `fn_service`
- Renamed `factory_fn` to `fn_factory`
- Renamed `factory_fn_cfg` to `fn_factory_with_config`
+## 1.0.0-alpha.3
-## 1.0.0-alpha.3 - 2019-12-06
- Add missing Clone impls
- Restore `Transform::map_init_err()` combinator
- Restore `Service/Factory::apply_fn()` in form of `Pipeline/Factory::and_then_apply_fn()`
- Optimize service combinators and futures memory layout
+## 1.0.0-alpha.2
-## 1.0.0-alpha.2 - 2019-12-02
- Use owned config value for service factory
- Renamed BoxedNewService/BoxedService to BoxServiceFactory/BoxService
+## 1.0.0-alpha.1
-## 1.0.0-alpha.1 - 2019-11-25
- Migrated to `std::future`
- `NewService` renamed to `ServiceFactory`
- Added `pipeline` and `pipeline_factory` function
+## 0.4.2
-## 0.4.2 - 2019-08-27
- Check service readiness for `new_apply_cfg` combinator
+## 0.4.1
-## 0.4.1 - 2019-06-06
- Add `new_apply_cfg` function
+## 0.4.0
-## 0.4.0 - 2019-05-12
- Add `NewService::map_config` and `NewService::unit_config` combinators.
- Use associated type for `NewService` config.
- Change `apply_cfg` function.
- Renamed helper functions.
+## 0.3.6
-## 0.3.6 - 2019-04-07
- Poll boxed service call result immediately
+## 0.3.5
-## 0.3.5 - 2019-03-29
- Add `impl Service for Rc>`.
+## 0.3.4
-## 0.3.4 - 2019-03-12
- Add `Transform::from_err()` combinator
- Add `apply_fn` helper
- Add `apply_fn_factory` helper
- Add `apply_transform` helper
- Add `apply_cfg` helper
+## 0.3.3
-## 0.3.3 - 2019-03-09
- Add `ApplyTransform` new service for transform and new service.
- Add `NewService::apply_cfg()` combinator, allows to use nested `NewService` with different config parameter.
- Revert IntoFuture change
+## 0.3.2
-## 0.3.2 - 2019-03-04
- Change `NewService::Future` and `Transform::Future` to the `IntoFuture` trait.
- Export `AndThenTransform` type
+## 0.3.1
-## 0.3.1 - 2019-03-04
- Simplify Transform trait
+## 0.3.0
-## 0.3.0 - 2019-03-02
- Added boxed NewService and Service.
- Added `Config` parameter to `NewService` trait.
- Added `Config` parameter to `NewTransform` trait.
+## 0.2.2
-## 0.2.2 - 2019-02-19
- Added `NewService` impl for `Rc where S: NewService`
- Added `NewService` impl for `Arc where S: NewService`
+## 0.2.1
-## 0.2.1 - 2019-02-03
- Generalize `.apply` combinator with Transform trait
+## 0.2.0
-## 0.2.0 - 2019-02-01
- Use associated type instead of generic for Service definition.
- * Before:
+ - Before:
```rust
impl Service for Client {
type Response = Response;
// ...
}
```
- * After:
+ - After:
```rust
impl Service for Client {
type Request = Request;
@@ -198,31 +194,31 @@
}
```
+## 0.1.6
-## 0.1.6 - 2019-01-24
- Use `FnMut` instead of `Fn` for .apply() and .map() combinators and `FnService` type
- Change `.apply()` error semantic, new service's error is `From`
+## 0.1.5
-## 0.1.5 - 2019-01-13
- Make `Out::Error` convertible from `T::Error` for apply combinator
+## 0.1.4
-## 0.1.4 - 2019-01-11
- Use `FnMut` instead of `Fn` for `FnService`
+## 0.1.3
-## 0.1.3 - 2018-12-12
- Split service combinators to separate trait
+## 0.1.2
-## 0.1.2 - 2018-12-12
- Release future early for `.and_then()` and `.then()` combinators
+## 0.1.1
-## 0.1.1 - 2018-12-09
- Added Service impl for `Box`
+## 0.1.0
-## 0.1.0 - 2018-12-09
- Initial import
diff --git a/actix-service/Cargo.toml b/actix-service/Cargo.toml
index d4b602fd..dcb6652f 100644
--- a/actix-service/Cargo.toml
+++ b/actix-service/Cargo.toml
@@ -4,25 +4,21 @@ version = "2.0.2"
authors = [
"Nikolay Kim ",
"Rob Ede ",
- "fakeshadow <24548779@qq.com>",
]
description = "Service trait and combinators for representing asynchronous request/response operations."
keywords = ["network", "framework", "async", "futures", "service"]
categories = ["network-programming", "asynchronous", "no-std"]
repository = "https://github.com/actix/actix-net"
license = "MIT OR Apache-2.0"
-edition = "2018"
-
-[lib]
-name = "actix_service"
-path = "src/lib.rs"
+edition.workspace = true
+rust-version.workspace = true
[dependencies]
-futures-core = { version = "0.3.7", default-features = false }
+futures-core = { version = "0.3.17", default-features = false }
paste = "1"
pin-project-lite = "0.2"
[dev-dependencies]
-actix-rt = "2.0.0"
-actix-utils = "3.0.0"
-futures-util = { version = "0.3.7", default-features = false }
+actix-rt = "2"
+actix-utils = "3"
+futures-util = { version = "0.3.17", default-features = false }
diff --git a/actix-service/README.md b/actix-service/README.md
index 62f9fe1c..79bf3028 100644
--- a/actix-service/README.md
+++ b/actix-service/README.md
@@ -5,7 +5,7 @@
[](https://crates.io/crates/actix-service)
[](https://docs.rs/actix-service/2.0.2)
[](https://blog.rust-lang.org/2020/03/12/Rust-1.46.html)
-
+
[](https://deps.rs/crate/actix-service/2.0.2)
[](https://discord.gg/NWpN5mmg3x)
diff --git a/actix-service/src/and_then.rs b/actix-service/src/and_then.rs
index 38980079..28a17044 100644
--- a/actix-service/src/and_then.rs
+++ b/actix-service/src/and_then.rs
@@ -121,12 +121,7 @@ pub struct AndThenServiceFactory
where
A: ServiceFactory,
A::Config: Clone,
- B: ServiceFactory<
- A::Response,
- Config = A::Config,
- Error = A::Error,
- InitError = A::InitError,
- >,
+ B: ServiceFactory,
{
inner: Rc<(A, B)>,
_phantom: PhantomData,
@@ -136,12 +131,7 @@ impl AndThenServiceFactory
where
A: ServiceFactory,
A::Config: Clone,
- B: ServiceFactory<
- A::Response,
- Config = A::Config,
- Error = A::Error,
- InitError = A::InitError,
- >,
+ B: ServiceFactory,
{
/// Create new `AndThenFactory` combinator
pub(crate) fn new(a: A, b: B) -> Self {
@@ -156,12 +146,7 @@ impl ServiceFactory for AndThenServiceFactory
where
A: ServiceFactory,
A::Config: Clone,
- B: ServiceFactory<
- A::Response,
- Config = A::Config,
- Error = A::Error,
- InitError = A::InitError,
- >,
+ B: ServiceFactory,
{
type Response = B::Response;
type Error = A::Error;
@@ -184,12 +169,7 @@ impl Clone for AndThenServiceFactory
where
A: ServiceFactory,
A::Config: Clone,
- B: ServiceFactory<
- A::Response,
- Config = A::Config,
- Error = A::Error,
- InitError = A::InitError,
- >,
+ B: ServiceFactory,
{
fn clone(&self) -> Self {
Self {
@@ -334,9 +314,8 @@ mod tests {
async fn test_new_service() {
let cnt = Rc::new(Cell::new(0));
let cnt2 = cnt.clone();
- let new_srv =
- pipeline_factory(fn_factory(move || ready(Ok::<_, ()>(Srv1(cnt2.clone())))))
- .and_then(move || ready(Ok(Srv2(cnt.clone()))));
+ let new_srv = pipeline_factory(fn_factory(move || ready(Ok::<_, ()>(Srv1(cnt2.clone())))))
+ .and_then(move || ready(Ok(Srv2(cnt.clone()))));
let srv = new_srv.new_service(()).await.unwrap();
let res = srv.call("srv1").await;
diff --git a/actix-service/src/apply.rs b/actix-service/src/apply.rs
index c77f4242..d33bdcd8 100644
--- a/actix-service/src/apply.rs
+++ b/actix-service/src/apply.rs
@@ -140,8 +140,7 @@ where
}
}
-impl ServiceFactory
- for ApplyFactory
+impl ServiceFactory for ApplyFactory
where
SF: ServiceFactory,
F: Fn(Req, &SF::Service) -> Fut + Clone,
diff --git a/actix-service/src/apply_cfg.rs b/actix-service/src/apply_cfg.rs
index 25fc5fc2..028fb317 100644
--- a/actix-service/src/apply_cfg.rs
+++ b/actix-service/src/apply_cfg.rs
@@ -198,8 +198,7 @@ pin_project! {
}
}
-impl Future
- for ApplyConfigServiceFactoryResponse
+impl Future for ApplyConfigServiceFactoryResponse
where
SF: ServiceFactory,
SF::InitError: From,
diff --git a/actix-service/src/boxed.rs b/actix-service/src/boxed.rs
index 3141c5e4..cc9ad410 100644
--- a/actix-service/src/boxed.rs
+++ b/actix-service/src/boxed.rs
@@ -91,8 +91,7 @@ type Inner = Box<
>,
>;
-impl ServiceFactory
- for BoxServiceFactory
+impl ServiceFactory for BoxServiceFactory
where
Req: 'static,
Res: 'static,
diff --git a/actix-service/src/fn_service.rs b/actix-service/src/fn_service.rs
index a2379270..2dac8697 100644
--- a/actix-service/src/fn_service.rs
+++ b/actix-service/src/fn_service.rs
@@ -3,9 +3,7 @@ use core::{future::Future, marker::PhantomData};
use crate::{ok, IntoService, IntoServiceFactory, Ready, Service, ServiceFactory};
/// Create `ServiceFactory` for function that can act as a `Service`
-pub fn fn_service(
- f: F,
-) -> FnServiceFactory
+pub fn fn_service(f: F) -> FnServiceFactory
where
F: Fn(Req) -> Fut + Clone,
Fut: Future