chore: bump MSRV to 1.68

delef · Aug 3, 2023 · f21f3a2 · f21f3a2
1 parent b2dc0d3
commit f21f3a2
Show file tree

Hide file tree

Showing 14 changed files with 58 additions and 58 deletions.
diff --git a/.codecov.yml b/.codecov.yml
@@ -10,7  10,7 @@ coverage:
         threshold: 100% # make CI green anyway
 
 ignore: # ignore codecoverage on following paths
-  - ".github"
-  - "**/tests"
-  - "**/benches"
-  - "**/examples"
   - '.github'
   - '**/tests'
   - '**/benches'
   - '**/examples'
diff --git a/.github/workflows/ci-post-merge.yml b/.github/workflows/ci-post-merge.yml
@@ -31,7  31,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Install Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1
         uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
         with:
           toolchain: ${{ matrix.version }}
 
@@ -47,8  47,25 @@ jobs:
         run: cargo test --workspace --all-features --no-fail-fast -- --nocapture
         timeout-minutes: 10
 
-      - name: Clear the cargo caches
-        run: |
-          rustup override set stable
-          cargo install cargo-cache --version 0.8.3 --no-default-features --features ci-autoclean
-          cargo-cache
   coverage:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - name: Install Rust
         uses: actions-rust-lang/[email protected]
         with:
           components: llvm-tools-preview
 
       - name: Install cargo-llvm-cov
         uses: taiki-e/[email protected]
         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/[email protected]
         with:
           files: codecov.json
           fail_ci_if_error: true
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,22  26,22 @@ jobs:
           - { name: macOS, os: macos-latest, triple: x86_64-apple-darwin }
           - { name: Windows, os: windows-latest, triple: x86_64-pc-windows-msvc }
         version:
-          - 1.65.0 # MSRV
-          - stable
           - { name: msrv, version: 1.68.0 }
           - { name: stable, version: stable }
 
-    name: ${{ matrix.target.name }} / ${{ matrix.version }}
     name: ${{ matrix.target.name }} / ${{ matrix.version.name }}
     runs-on: ${{ matrix.target.os }}
 
     steps:
       - uses: actions/checkout@v3
 
-      - name: Install Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1
       - name: Install Rust (${{ matrix.version.name }})
         uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
         with:
-          toolchain: ${{ matrix.version }}
           toolchain: ${{ matrix.version.version }}
 
       - name: Install cargo-hack
-        uses: taiki-e/install-action@v2
         uses: taiki-e/install-action@v2.13.5
         with:
           tool: cargo-hack
 
@@ -51,27  51,3 @@ jobs:
       - name: tests
         run: cargo test --workspace --all-features --no-fail-fast -- --nocapture
         timeout-minutes: 10
-
-      # disable coverage for now
-      # - name: Generate coverage file
-      #   if: >
-      #     matrix.target.os == 'ubuntu-latest'
-      #     && matrix.version == 'stable'
-      #     && github.ref == 'refs/heads/master'
-      #   run: |
-      #     cargo install cargo-tarpaulin --vers "^0.13"
-      #     cargo tarpaulin --out Xml --verbose
-      # - name: Upload to Codecov
-      #   if: >
-      #     matrix.target.os == 'ubuntu-latest'
-      #     && matrix.version == 'stable'
-      #     && github.ref == 'refs/heads/master'
-      #   uses: codecov/codecov-action@v1
-      #   with:
-      #     file: cobertura.xml
-
-      - name: Clear the cargo caches
-        run: |
-          rustup override set stable
-          cargo install cargo-cache --version 0.8.3 --no-default-features --features ci-autoclean
-          cargo-cache
diff --git a/.github/workflows/clippy-fmt.yml b/.github/workflows/clippy-fmt.yml
@@ -18,7  18,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Install Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1
         uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
         with:
           toolchain: nightly
           components: rustfmt
@@ -36,12  36,12 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Install Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1
         uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
         with:
           components: clippy
 
       - name: Check with Clippy
-        uses: giraffate/clippy-action@v1
         uses: giraffate/clippy-action@v1.0.0
         with:
           reporter: github-pr-review
           github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -56,12  56,12 @@ jobs:
 
       - uses: actions/checkout@v3
 
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
       - uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
         # temp: unpin once https://github.com/rust-lang/rust/issues/113152 is fixed
         with:
           toolchain: nightly-2023-06-28
 
-      - uses: taiki-e/cache-cargo-install-action@v1
       - uses: taiki-e/cache-cargo-install-action@v1.2.0
         with:
           tool: cargo-public-api
 

diff --git a/.github/workflows/upload-doc.yml b/.github/workflows/upload-doc.yml
@@ -22,18  22,20 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Install Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1
         uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
         with:
           toolchain: nightly
 
       - name: Build Docs
         run: cargo doc --workspace --all-features --no-deps
 
       - name: Tweak HTML
-        run: echo '<meta http-equiv="refresh" content="0;url=actix/index.html">' > target/doc/index.html
         run:
           echo '<meta http-equiv="refresh" content="0;url=actix/index.html">' >
           target/doc/index.html
 
       # TODO(JohnTitor): deploy via GHA directly instead.
       - name: Deploy to GitHub Pages
-        uses: JamesIves/github-pages-deploy-action@v4
         uses: JamesIves/github-pages-deploy-action@v4.4.0
         with:
           folder: target/doc
diff --git a/.prettierrc.yml b/.prettierrc.yml
@@ -3,3  3,8 @@ overrides:
     options:
       printWidth: 9999
       proseWrap: never
   - files: '*.{yml,yaml}'
     options:
       singleQuote: true
       printWidth: 100
       proseWrap: always
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,7  8,7 @@ resolver = "2"
 
 [workspace.package]
 edition = "2021"
-rust-version = "1.65"
 rust-version = "1.68"
 
 [patch.crates-io]
 actix = { path = "actix" }

diff --git a/actix-broker/CHANGES.md b/actix-broker/CHANGES.md
@@ -2,7  2,7 @@
 
 ## Unreleased
 
-- Minimum supported Rust version (MSRV) is now 1.65.
 - Minimum supported Rust version (MSRV) is now 1.68.
 
 ## 0.4.3 - 2022-05-24
 

diff --git a/actix-broker/README.md b/actix-broker/README.md
@@ -7,7  7,7 @@
 
 [![crates.io](https://img.shields.io/crates/v/actix-broker?label=latest)](https://crates.io/crates/actix-broker)
 [![Documentation](https://docs.rs/actix-broker/badge.svg?version=0.4.3)](https://docs.rs/actix-broker/0.4.3)
-![Minimum Supported Rust Version](https://img.shields.io/badge/rustc-1.65 -ab6000.svg)
 ![Minimum Supported Rust Version](https://img.shields.io/badge/rustc-1.68 -ab6000.svg)
 ![License](https://img.shields.io/crates/l/actix-broker.svg)
 [![Dependency Status](https://deps.rs/crate/actix-broker/0.4.3/status.svg)](https://deps.rs/crate/actix-broker/0.4.3)
 

diff --git a/actix-derive/README.md b/actix-derive/README.md
@@ -6,7  6,7 @@
 
 [![crates.io](https://img.shields.io/crates/v/actix-derive?label=latest)](https://crates.io/crates/actix-derive)
 [![Documentation](https://docs.rs/actix-derive/badge.svg?version=0.6.0)](https://docs.rs/actix-derive/0.6.0)
-![Minimum Supported Rust Version](https://img.shields.io/badge/rustc-1.65 -ab6000.svg)
 ![Minimum Supported Rust Version](https://img.shields.io/badge/rustc-1.68 -ab6000.svg)
 ![License](https://img.shields.io/crates/l/actix-derive.svg)
 [![Dependency Status](https://deps.rs/crate/actix/0.6.0/status.svg)](https://deps.rs/crate/actix/0.6.0)
 

diff --git a/actix-derive/tests/trybuild.rs b/actix-derive/tests/trybuild.rs
@@ -1,7  1,7 @@
 /// Proc macro compile tests.
 ///
 /// Only run on MSRV to ensure stable compile errors.
-#[rustversion::stable(1.65)]
 #[rustversion::stable(1.68)]
 #[test]
 fn compile_macros() {
     let t = trybuild::TestCases::new();

diff --git a/actix/CHANGES.md b/actix/CHANGES.md
@@ -6,7  6,7 @@
 
 - Add `SyncArbiter::start_with_thread_builder()`.
 - Derive `PartialEq` and `Eq` for `MailboxError`.
-- Minimum supported Rust version (MSRV) is now 1.65.
 - Minimum supported Rust version (MSRV) is now 1.68.
 
 ## 0.13.0 - 2022-03-01
 

diff --git a/actix/README.md b/actix/README.md
@@ -9,7  9,7 @@
 
 [![crates.io](https://img.shields.io/crates/v/actix?label=latest)](https://crates.io/crates/actix)
 [![Documentation](https://docs.rs/actix/badge.svg?version=0.13.0)](https://docs.rs/actix/0.13.0)
-![Minimum Supported Rust Version](https://img.shields.io/badge/rustc-1.65 -ab6000.svg)
 ![Minimum Supported Rust Version](https://img.shields.io/badge/rustc-1.68 -ab6000.svg)
 ![License](https://img.shields.io/crates/l/actix.svg)
 [![Dependency Status](https://deps.rs/crate/actix/0.13.0/status.svg)](https://deps.rs/crate/actix/0.13.0)
 <br />
@@ -35,7  35,7 @@
 - Uses [futures](https://crates.io/crates/futures) for asynchronous message handling
 - Actor supervision
 - Typed messages (No `Any` type)
-- Runs on stable Rust 1.65 
 - Runs on stable Rust 1.68 
 
 ## Usage
 

diff --git a/actix/src/lib.rs b/actix/src/lib.rs
@@ -18,7  18,7 @@
 //! - Using Futures for asynchronous message handling
 //! - Actor supervision
 //! - Typed messages (No [`Any`](std::any::Any) type). Generic messages are allowed
-//! - Runs on stable Rust 1.65 
 //! - Runs on stable Rust 1.68 
 
 #![deny(rust_2018_idioms, nonstandard_style, future_incompatible)]
 #![doc(html_logo_url = "https://actix.rs/img/logo.png")]