actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2024-11-23 22:51:07 +01:00
Code Issues Releases Wiki Activity

update msrv to 1.60 (#482

Browse Source 
* update msrv to 1.60

* inherit workspace msrv
This commit is contained in:
Rob Ede 2023-04-01 21:39:19 +01:00 committed by GitHub
parent 28f36e4e30
commit c0693da9ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
29 changed files with 110 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
.github/workflows/ci-master.yml vendored
View File

@ -4,6 +4,13 @@ on:
push:
branches: [master]
permissions:
contents: read
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs:
build_and_test_nightly:
strategy:
@ -21,8 +28,7 @@ jobs:
name: ${{ matrix.target.name }} / ${{ matrix.version }}
runs-on: ${{ matrix.target.os }}
env:
VCPKGRS_DYNAMIC: 1
env: {}
steps:
- name: Setup Routing
@ -31,36 +37,17 @@ jobs:
- uses: actions/checkout@v3
# 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
- 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
- name: Install ${{ matrix.version }}
run: |
rustup set profile minimal
rustup install ${{ matrix.version }}-${{ matrix.target.triple }}
rustup override set ${{ matrix.version }}-${{ matrix.target.triple }}
# - 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
# run: cargo generate-lockfile
# - name: Cache Dependencies
# uses: Swatinem/rust-cache@v2.2.0
- name: Install Rust (${{ matrix.version }})
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: ${{ matrix.version }}
- name: Install cargo-hack
run: cargo install cargo-hack
@ -109,15 +96,8 @@ jobs:
- uses: actions/checkout@v3
- name: Install Rust (nightly)
run: |
rustup set profile minimal
rustup install nightly
rustup override set nightly
- name: Generate Cargo.lock
run: cargo generate-lockfile
- name: Cache Dependencies
uses: Swatinem/rust-cache@v2.2.0
uses: actions-rust-lang/setup-rust-toolchain@v1
with: { toolchain: nightly }
- name: Generate coverage file
if: github.ref == 'refs/heads/master'
@ -136,15 +116,8 @@ jobs:
- uses: actions/checkout@v3
- name: Install Rust (nightly)
run: |
rustup set profile minimal
rustup install nightly
rustup override set nightly
- name: Generate Cargo.lock
run: cargo generate-lockfile
- name: Cache Dependencies
uses: Swatinem/rust-cache@v2.2.0
uses: actions-rust-lang/setup-rust-toolchain@v1
with: { toolchain: nightly }
- name: Install cargo-minimal-versions
run: cargo install cargo-minimal-versions
@ -162,15 +135,7 @@ jobs:
- uses: actions/checkout@v3
- name: Install Rust
run: |
rustup set profile minimal
rustup install stable
rustup override set stable
- name: Generate Cargo.lock
run: cargo generate-lockfile
- name: Cache Dependencies
uses: Swatinem/rust-cache@v2.2.0
uses: actions-rust-lang/setup-rust-toolchain@v1
- name: Install cargo-nextest
run: cargo install cargo-nextest

80
.github/workflows/ci.yml vendored
View File

@ -1,10 +1,15 @@
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:
@ -18,14 +23,13 @@ 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.59.0
- 1.60.0
- stable
name: ${{ matrix.target.name }} / ${{ matrix.version }}
runs-on: ${{ matrix.target.os }}
env:
VCPKGRS_DYNAMIC: 1
env: {}
steps:
- name: Setup Routing
@ -34,60 +38,28 @@ jobs:
- uses: actions/checkout@v3
# 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
- 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
- name: Install ${{ matrix.version }}
run: |
rustup set profile minimal
rustup install ${{ matrix.version }}-${{ matrix.target.triple }}
rustup override set ${{ matrix.version }}-${{ matrix.target.triple }}
# - 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
# run: cargo generate-lockfile
# - name: Cache Dependencies
# uses: Swatinem/rust-cache@v2.2.0
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: ${{ matrix.version }}
- name: Install cargo-hack
if: matrix.version != '1.59.0'
run: cargo install cargo-hack
# newer cargo-hack versions require 1.60 or above
- name: Install cargo-hack (1.59.0)
if: matrix.version == '1.59.0'
run: cargo install cargo-hack --version=0.5.21
- name: workaround MSRV issues
if: matrix.version == '1.59.0'
run: |
cargo install cargo-edit --version=0.8.0
cargo add env_logger@0.9 --dev -p=actix-tls
cargo add env_logger@0.9 --dev -p=actix-server
- name: Generate Cargo.lock
run: cargo generate-lockfile
- name: workaround MSRV issues
if: matrix.version != 'stable'
run: |
cargo update -p=time --precise=0.3.13 # time is only a dev dep so shouldn't affect msrv
cargo update -p=time --precise=0.3.16 # time is only a dev dep so shouldn't affect msrv
- name: check lib
if: >
@ -125,7 +97,6 @@ jobs:
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
if: matrix.version == 'stable' # MSRV(1.58) cargo-cache now fails to install on 1.59
run: |
cargo install cargo-cache --version 0.6.2 --no-default-features --features ci-autoclean
cargo-cache
@ -138,15 +109,8 @@ jobs:
- uses: actions/checkout@v3
- name: Install Rust (nightly)
run: |
rustup set profile minimal
rustup install nightly
rustup override set nightly
- name: Generate Cargo.lock
run: cargo generate-lockfile
- name: Cache Dependencies
uses: Swatinem/rust-cache@v2.2.0
uses: actions-rust-lang/setup-rust-toolchain@v1
with: { toolchain: nightly }
- name: doc tests io-uring
run: |

38
.github/workflows/clippy-fmt.yml vendored
View File

@ -1,37 +1,43 @@
name: Lint
on:
pull_request:
types: [opened, synchronize, reopened]
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@v3
- name: Install Rust
run: |
rustup set profile minimal
rustup install stable
rustup override set stable
rustup component add rustfmt
- uses: actions-rust-lang/setup-rust-toolchain@v1
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@v3
- name: Install Rust
run: |
rustup set profile minimal
rustup install stable
rustup override set stable
rustup component add clippy
- uses: actions-rust-lang/setup-rust-toolchain@v1
with: { components: clippy }
- uses: giraffate/clippy-action@v1
with:
reporter: "github-pr-check"
reporter: 'github-pr-check'
github_token: ${{ secrets.GITHUB_TOKEN }}
clippy_flags: --workspace --all-features --tests --examples --bins -- -Dclippy::todo

13
.github/workflows/upload-doc.yml vendored
View File

@ -1,21 +1,20 @@
name: Upload documentation
on:
push:
branches: [master]
push: { branches: [master] }
jobs:
build:
permissions:
contents: write
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Install Rust
run: |
rustup set profile minimal
rustup install nightly
rustup override set nightly
- uses: actions-rust-lang/setup-rust-toolchain@v1
with: { toolchain: nightly }
- name: Build Docs
run: cargo doc --workspace --all-features --no-deps

1
Cargo.toml
View File

@ -12,6 +12,7 @@ members = [
"local-channel",
"local-waker",
]
resolver = "2"
[patch.crates-io]
actix-codec = { path = "actix-codec" }

2
README.md
View File

@ -13,7 +13,7 @@ See example folders for [`actix-server`](./actix-server/examples) and [`actix-tl
## MSRV
Crates in this repo currently have a Minimum Supported Rust Version (MSRV) of 1.59. 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.60. As a policy, we permit MSRV increases in non-breaking releases.
## License

2
actix-codec/CHANGES.md
View File

@ -2,7 +2,7 @@
## Unreleased - 2023-xx-xx
- Minimum supported Rust version (MSRV) is now 1.59.
- Minimum supported Rust version (MSRV) is now 1.60.
## 0.5.1 - 2022-03-15

7
actix-codec/Cargo.toml
View File

@ -10,11 +10,8 @@ keywords = ["network", "framework", "async", "futures"]
repository = "https://github.com/actix/actix-net"
categories = ["network-programming", "asynchronous"]
license = "MIT OR Apache-2.0"
edition = "2018"
[lib]
name = "actix_codec"
path = "src/lib.rs"
edition = "2021"
rust-version = "1.60"
[dependencies]
bitflags = "1.2"

2
actix-macros/CHANGES.md
View File

@ -2,7 +2,7 @@
## Unreleased - 2023-xx-xx
- Minimum supported Rust version (MSRV) is now 1.59.
- Minimum supported Rust version (MSRV) is now 1.60.
## 0.2.3 - 2021-10-19

3
actix-macros/Cargo.toml
View File

@ -10,7 +10,8 @@ description = "Macros for Actix system and runtime"
repository = "https://github.com/actix/actix-net.git"
categories = ["network-programming", "asynchronous"]
license = "MIT OR Apache-2.0"
edition = "2018"
edition = "2021"
rust-version = "1.60"
[lib]
proc-macro = true

2
actix-macros/tests/trybuild.rs
View File

@ -1,4 +1,4 @@
#[rustversion::stable(1.59)] // MSRV
#[rustversion::stable(1.60)] // MSRV
#[test]
fn compile_macros() {
let t = trybuild::TestCases::new();

2
actix-rt/CHANGES.md
View File

@ -2,6 +2,8 @@
## Unreleased - 2023-xx-xx
- Minimum supported Rust version (MSRV) is now 1.60.
## 2.8.0 - 2022-12-21
- Add `#[track_caller]` attribute to `spawn` functions and methods. [#454]

7
actix-rt/Cargo.toml
View File

@ -11,11 +11,8 @@ homepage = "https://actix.rs"
repository = "https://github.com/actix/actix-net.git"
categories = ["network-programming", "asynchronous"]
license = "MIT OR Apache-2.0"
edition = "2018"
[lib]
name = "actix_rt"
path = "src/lib.rs"
edition = "2021"
rust-version = "1.60"
[features]
default = ["macros"]

2
actix-server/CHANGES.md
View File

@ -2,6 +2,8 @@
## Unreleased - 2023-xx-xx
- Minimum supported Rust version (MSRV) is now 1.60.
## 2.2.0 - 2022-12-21
- Minimum supported Rust version (MSRV) is now 1.59.

7
actix-server/Cargo.toml
View File

@ -12,11 +12,8 @@ categories = ["network-programming", "asynchronous"]
homepage = "https://actix.rs"
repository = "https://github.com/actix/actix-net.git"
license = "MIT OR Apache-2.0"
edition = "2018"
[lib]
name = "actix_server"
path = "src/lib.rs"
edition = "2021"
rust-version = "1.60"
[features]
default = []

2
actix-service/CHANGES.md
View File

@ -2,7 +2,7 @@
## Unreleased - 2023-xx-xx
- Minimum supported Rust version (MSRV) is now 1.59.
- Minimum supported Rust version (MSRV) is now 1.60.
## 2.0.2 - 2021-12-18

7
actix-service/Cargo.toml
View File

@ -10,11 +10,8 @@ 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 = "2021"
rust-version = "1.60"
[dependencies]
futures-core = { version = "0.3.17", default-features = false }

2
actix-tls/CHANGES.md
View File

@ -2,7 +2,7 @@
## Unreleased - 2023-xx-xx
- Minimum supported Rust version (MSRV) is now 1.59.
- Minimum supported Rust version (MSRV) is now 1.60.
## 3.0.4 - 2022-03-15

7
actix-tls/Cargo.toml
View File

@ -10,16 +10,13 @@ keywords = ["network", "tls", "ssl", "async", "transport"]
repository = "https://github.com/actix/actix-net.git"
categories = ["network-programming", "asynchronous", "cryptography"]
license = "MIT OR Apache-2.0"
edition = "2018"
edition = "2021"
rust-version = "1.60"
[package.metadata.docs.rs]
all-features = true
rustdoc-args = ["--cfg", "docsrs"]
[lib]
name = "actix_tls"
path = "src/lib.rs"
[features]
default = ["accept", "connect"]

2
actix-tracing/CHANGES.md
View File

@ -2,7 +2,7 @@
## Unreleased - 2023-xx-xx
- Minimum supported Rust version (MSRV) is now 1.59.
- Minimum supported Rust version (MSRV) is now 1.60.
## 0.1.0 - 2020-01-15

7
actix-tracing/Cargo.toml
View File

@ -9,11 +9,8 @@ repository = "https://github.com/actix/actix-net.git"
documentation = "https://docs.rs/actix-tracing"
categories = ["network-programming", "asynchronous"]
license = "MIT OR Apache-2.0"
edition = "2018"
[lib]
name = "actix_tracing"
path = "src/lib.rs"
edition = "2021"
rust-version = "1.60"
[dependencies]
actix-service = "2"

2
actix-utils/CHANGES.md
View File

@ -2,7 +2,7 @@
## Unreleased - 2023-xx-xx
- Minimum supported Rust version (MSRV) is now 1.59.
- Minimum supported Rust version (MSRV) is now 1.60.
## 3.0.1 - 2022-10-21

7
actix-utils/Cargo.toml
View File

@ -10,11 +10,8 @@ keywords = ["network", "framework", "async", "futures"]
categories = ["network-programming", "asynchronous"]
repository = "https://github.com/actix/actix-net"
license = "MIT OR Apache-2.0"
edition = "2018"
[lib]
name = "actix_utils"
path = "src/lib.rs"
edition = "2021"
rust-version = "1.60"
[dependencies]
pin-project-lite = "0.2"

7
bytestring/Cargo.toml
View File

@ -11,11 +11,8 @@ categories = ["no-std", "web-programming"]
homepage = "https://actix.rs"
repository = "https://github.com/actix/actix-net.git"
license = "MIT OR Apache-2.0"
edition = "2018"
[lib]
name = "bytestring"
path = "src/lib.rs"
edition = "2021"
rust-version = "1.60"
[dependencies]
bytes = { version = "1.2", default-features = false }

1
clippy.toml
View File

@ -1 +0,0 @@
msrv = "1.59"

2
local-channel/CHANGES.md
View File

@ -2,7 +2,7 @@
## Unreleased - 2023-xx-xx
- Minimum supported Rust version (MSRV) is now 1.59.
- Minimum supported Rust version (MSRV) is now 1.60.
## 0.1.3 - 2022-05-03

3
local-channel/Cargo.toml
View File

@ -9,7 +9,8 @@ authors = [
repository = "https://github.com/actix/actix-net.git"
keywords = ["channel", "local", "futures"]
license = "MIT OR Apache-2.0"
edition = "2018"
edition = "2021"
rust-version = "1.60"
[dependencies]
futures-core = "0.3.17"

2
local-waker/CHANGES.md
View File

@ -2,7 +2,7 @@
## Unreleased - 2023-xx-xx
- Minimum supported Rust version (MSRV) is now 1.59.
- Minimum supported Rust version (MSRV) is now 1.60.
## 0.1.3 - 2022-05-03

3
local-waker/Cargo.toml
View File

@ -10,6 +10,7 @@ repository = "https://github.com/actix/actix-net.git"
keywords = ["waker", "local", "futures", "no-std"]
categories = ["asynchronous", "no-std"]
license = "MIT OR Apache-2.0"
edition = "2018"
edition = "2021"
rust-version = "1.60"
[dependencies]