update msrv to 1.60 (#482

* update msrv to 1.60

* inherit workspace msrv

.github/workflows/ci-master.yml

@@ -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:
+    env: {}
-      VCPKGRS_DYNAMIC: 1
 
     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'
+        if: matrix.target.os == 'windows-latest'
-        run: vcpkg install openssl:x64-windows
+        run: choco install openssl
-      - name: Install OpenSSL
+      - name: Set OpenSSL dir in env
-        if: matrix.target.triple == 'i686-pc-windows-msvc'
+        if: matrix.target.os == 'windows-latest'
-        run: vcpkg install openssl:x86-windows
+        run: echo 'OPENSSL_DIR=C:\Program Files\OpenSSL-Win64' | Out-File -FilePath $env:GITHUB_ENV -Append
 
-      - name: Install ${{ matrix.version }}
+      - name: Install Rust (${{ matrix.version }})
-        run: |
+        uses: actions-rust-lang/setup-rust-toolchain@v1
-          rustup set profile minimal
+        with:
-          rustup install ${{ matrix.version }}-${{ matrix.target.triple }}
+          toolchain: ${{ matrix.version }}
-          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 cargo-hack
         run: cargo install cargo-hack
@@ -109,15 +96,8 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Install Rust (nightly)
-        run: |
+        uses: actions-rust-lang/setup-rust-toolchain@v1
-          rustup set profile minimal
+        with: { toolchain: nightly }
-          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
 
       - name: Generate coverage file
         if: github.ref == 'refs/heads/master'
@@ -136,15 +116,8 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Install Rust (nightly)
-        run: |
+        uses: actions-rust-lang/setup-rust-toolchain@v1
-          rustup set profile minimal
+        with: { toolchain: nightly }
-          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
 
       - name: Install cargo-minimal-versions
         run: cargo install cargo-minimal-versions
@@ -162,15 +135,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Install Rust
-        run: |
+        uses: actions-rust-lang/setup-rust-toolchain@v1
-          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
 
       - name: Install cargo-nextest
         run: cargo install cargo-nextest

.github/workflows/ci.yml

@@ -1,10 +1,15 @@
 name: CI
 
-on:
+on: 
-  pull_request:
+  pull_request: {}
-    types: [opened, synchronize, reopened]
+  push: { branches: [master] }
-  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:
+    env: {}
-      VCPKGRS_DYNAMIC: 1
 
     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'
+        if: matrix.target.os == 'windows-latest'
-        run: vcpkg install openssl:x64-windows
+        run: choco install openssl
-      - name: Install OpenSSL
+      - name: Set OpenSSL dir in env
-        if: matrix.target.triple == 'i686-pc-windows-msvc'
+        if: matrix.target.os == 'windows-latest'
-        run: vcpkg install openssl:x86-windows
+        run: echo 'OPENSSL_DIR=C:\Program Files\OpenSSL-Win64' | Out-File -FilePath $env:GITHUB_ENV -Append
 
       - name: Install ${{ matrix.version }}
-        run: |
+        uses: actions-rust-lang/setup-rust-toolchain@v1
-          rustup set profile minimal
+        with:
-          rustup install ${{ matrix.version }}-${{ matrix.target.triple }}
+          toolchain: ${{ matrix.version }}
-          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 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: |
+        uses: actions-rust-lang/setup-rust-toolchain@v1
-          rustup set profile minimal
+        with: { toolchain: nightly }
-          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
 
       - name: doc tests io-uring
         run: |

.github/workflows/clippy-fmt.yml

@@ -1,37 +1,43 @@
 name: Lint
 
-on:
+on: [pull_request]
-  pull_request:
+
-    types: [opened, synchronize, reopened]
+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
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        run: |
+        with:
-          rustup set profile minimal
+          toolchain: nightly
-          rustup install stable
+          components: rustfmt
-          rustup override set stable
+
-          rustup component add 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
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        run: |
+        with: { components: clippy }
-          rustup set profile minimal
+
-          rustup install stable
-          rustup override set stable
-          rustup component add 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

.github/workflows/upload-doc.yml

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

Cargo.toml

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

README.md

@@ -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
 

actix-codec/CHANGES.md

@@ -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
 

actix-codec/Cargo.toml

@@ -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"
+edition = "2021"
-
+rust-version = "1.60"
-[lib]
-name = "actix_codec"
-path = "src/lib.rs"
 
 [dependencies]
 bitflags = "1.2"

actix-macros/CHANGES.md

@@ -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
 

actix-macros/Cargo.toml

@@ -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

actix-macros/tests/trybuild.rs

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

actix-rt/CHANGES.md

@@ -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]

actix-rt/Cargo.toml

@@ -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"
+edition = "2021"
-
+rust-version = "1.60"
-[lib]
-name = "actix_rt"
-path = "src/lib.rs"
 
 [features]
 default = ["macros"]

actix-server/CHANGES.md

@@ -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.

actix-server/Cargo.toml

@@ -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"
+edition = "2021"
-
+rust-version = "1.60"
-[lib]
-name = "actix_server"
-path = "src/lib.rs"
 
 [features]
 default = []

actix-service/CHANGES.md

@@ -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
 

actix-service/Cargo.toml

@@ -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"
+edition = "2021"
-
+rust-version = "1.60"
-[lib]
-name = "actix_service"
-path = "src/lib.rs"
 
 [dependencies]
 futures-core = { version = "0.3.17", default-features = false }

actix-tls/CHANGES.md

@@ -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
 

actix-tls/Cargo.toml

@@ -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"]
 

actix-tracing/CHANGES.md

@@ -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
 

actix-tracing/Cargo.toml

@@ -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"
+edition = "2021"
-
+rust-version = "1.60"
-[lib]
-name = "actix_tracing"
-path = "src/lib.rs"
 
 [dependencies]
 actix-service = "2"

actix-utils/CHANGES.md

@@ -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
 

actix-utils/Cargo.toml

@@ -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"
+edition = "2021"
-
+rust-version = "1.60"
-[lib]
-name = "actix_utils"
-path = "src/lib.rs"
 
 [dependencies]
 pin-project-lite = "0.2"

bytestring/Cargo.toml

@@ -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"
+edition = "2021"
-
+rust-version = "1.60"
-[lib]
-name = "bytestring"
-path = "src/lib.rs"
 
 [dependencies]
 bytes = { version = "1.2", default-features = false }

clippy.toml

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

local-channel/CHANGES.md

@@ -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
 

local-channel/Cargo.toml

@@ -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"

local-waker/CHANGES.md

@@ -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
 

local-waker/Cargo.toml

@@ -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]