bump msrv to 1.46 (#1858)

2024-11-24 00:21:08 +01:00 · 2020-12-28 00:44:15 +00:00 · 2020-12-28 00:44:15 +00:00 · 2a2a20c3e7
commit 2a2a20c3e7
parent 093d3a6c59
16 changed files with 59 additions and 52 deletions
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@ -13,7 +13,7 @@ jobs:
      fail-fast: false
      matrix:
        version:
-          - 1.42.0 # MSRV
+          - 1.46.0 # MSRV
          - stable
          - nightly

@ -30,6 +30,13 @@ jobs:
          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.0.1
+
      - name: check build
        uses: actions-rs/cargo@v1
        with:
@ -58,12 +65,17 @@ jobs:
          args: --package=awc --no-default-features --features=rustls -- --nocapture

      - name: Generate coverage file
-        if: matrix.version == 'stable' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
+        if: matrix.version == 'stable' && github.ref == 'refs/heads/master'
        run: |
          cargo install cargo-tarpaulin --vers "^0.13"
          cargo tarpaulin --out Xml
      - name: Upload to Codecov
-        if: matrix.version == 'stable' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
+        if: matrix.version == 'stable' && github.ref == 'refs/heads/master'
        uses: codecov/codecov-action@v1
        with:
          file: cobertura.xml
+
+      - name: Clear the cargo caches
+        run: |
+          cargo install cargo-cache --no-default-features --features ci-autoclean
+          cargo-cache
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@ -29,6 +29,13 @@ jobs:
          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.0.1
+
      - name: check build
        uses: actions-rs/cargo@v1
        with:
@ -42,3 +49,8 @@ jobs:
          args: --all --all-features --no-fail-fast -- --nocapture
                --skip=test_h2_content_length
                --skip=test_reading_deflate_encoding_large_random_rustls
+
+      - name: Clear the cargo caches
+        run: |
+          cargo install cargo-cache --no-default-features --features ci-autoclean
+          cargo-cache
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@ -41,6 +41,13 @@ jobs:
          Get-ChildItem C:\vcpkg\installed\x64-windows\bin
          Get-ChildItem C:\vcpkg\installed\x64-windows\lib

+      - name: Generate Cargo.lock
+        uses: actions-rs/cargo@v1
+        with:
+          command: generate-lockfile
+      - name: Cache Dependencies
+        uses: Swatinem/rust-cache@v1.0.1
+
      - name: check build
        uses: actions-rs/cargo@v1
        with:
@ -62,3 +69,8 @@ jobs:
                --skip=test_connection_force_close
                --skip=test_connection_server_close
                --skip=test_connection_wait_queue_force_close
+
+      - name: Clear the cargo caches
+        run: |
+          cargo install cargo-cache --no-default-features --features ci-autoclean
+          cargo-cache
--- a/CHANGES.md
+++ b/CHANGES.md
@ -4,6 +4,7 @@
 ### Changed
 * Bumped `rand` to `0.8`
 * Rename `Handler` to `HandlerService` and rename `Factory` to `Handler`. [#1852]
+* MSRV is now 1.46.0.

 ### Fixed
 * added the actual parsing error to `test::read_body_json` [#1812]
--- a/README.md
+++ b/README.md
@ -7,7 +7,7 @@

 [![crates.io](https://img.shields.io/crates/v/actix-web?label=latest)](https://crates.io/crates/actix-web)
 [![Documentation](https://docs.rs/actix-web/badge.svg?version=3.3.2)](https://docs.rs/actix-web/3.3.2)
-[![Version](https://img.shields.io/badge/rustc-1.42+-ab6000.svg)](https://blog.rust-lang.org/2020/03/12/Rust-1.42.html)
+[![Version](https://img.shields.io/badge/rustc-1.46+-ab6000.svg)](https://blog.rust-lang.org/2020/03/12/Rust-1.46.html)
 ![License](https://img.shields.io/crates/l/actix-web.svg)
 [![Dependency Status](https://deps.rs/crate/actix-web/3.3.2/status.svg)](https://deps.rs/crate/actix-web/3.3.2)
 <br />
@ -34,7 +34,7 @@
 * Middlewares ([Logger, Session, CORS, etc](https://actix.rs/docs/middleware/))
 * Includes an async [HTTP client](https://actix.rs/actix-web/actix_web/client/index.html)
 * Supports [Actix actor framework](https://github.com/actix/actix)
-* Runs on stable Rust 1.42+
+* Runs on stable Rust 1.46+

 ## Documentation

--- a/actix-files/README.md
+++ b/actix-files/README.md
@ -4,7 +4,7 @@

 [![crates.io](https://img.shields.io/crates/v/actix-files?label=latest)](https://crates.io/crates/actix-files)
 [![Documentation](https://docs.rs/actix-files/badge.svg?version=0.5.0)](https://docs.rs/actix-files/0.5.0)
-[![Version](https://img.shields.io/badge/rustc-1.42+-ab6000.svg)](https://blog.rust-lang.org/2020/03/12/Rust-1.42.html)
+[![Version](https://img.shields.io/badge/rustc-1.46+-ab6000.svg)](https://blog.rust-lang.org/2020/03/12/Rust-1.46.html)
 ![License](https://img.shields.io/crates/l/actix-files.svg)
 <br />
 [![dependency status](https://deps.rs/crate/actix-files/0.5.0/status.svg)](https://deps.rs/crate/actix-files/0.5.0)
@ -16,4 +16,4 @@
 - [API Documentation](https://docs.rs/actix-files/)
 - [Example Project](https://github.com/actix/examples/tree/master/static_index)
 - [Chat on Gitter](https://gitter.im/actix/actix-web)
- Minimum supported Rust version: 1.42 or later
+- Minimum supported Rust version: 1.46 or later
--- a/actix-http-test/README.md
+++ b/actix-http-test/README.md
@ -12,4 +12,4 @@

 - [API Documentation](https://docs.rs/actix-http-test)
 - [Chat on Gitter](https://gitter.im/actix/actix-web)
- Minimum Supported Rust Version (MSRV): 1.42.0
+- Minimum Supported Rust Version (MSRV): 1.46.0
--- a/actix-http/README.md
+++ b/actix-http/README.md
@ -12,7 +12,7 @@

 - [API Documentation](https://docs.rs/actix-http)
 - [Chat on Gitter](https://gitter.im/actix/actix-web)
- Minimum Supported Rust Version (MSRV): 1.42.0
+- Minimum Supported Rust Version (MSRV): 1.46.0

 ## Example

--- a/actix-http/src/header/common/content_disposition.rs
+++ b/actix-http/src/header/common/content_disposition.rs
@ -318,9 +318,8 @@ impl ContentDisposition {
                return Err(crate::error::ParseError::Header);
            }
            left = new_left;
-            if param_name.ends_with('*') {
+            if let Some(param_name) = param_name.strip_suffix('*') {
                // extended parameters
-                let param_name = &param_name[..param_name.len() - 1]; // trim asterisk
                let (ext_value, new_left) = split_once_and_trim(left, ';');
                left = new_left;
                let ext_value = header::parse_extended_value(ext_value)?;
--- a/actix-http/src/lib.rs
+++ b/actix-http/src/lib.rs
@ -7,7 +7,6 @@
    clippy::new_without_default,
    clippy::borrow_interior_mutable_const
 )]
-#![allow(clippy::manual_strip)] // Allow this to keep MSRV(1.42).
 #![doc(html_logo_url = "https://actix.rs/img/logo.png")]
 #![doc(html_favicon_url = "https://actix.rs/favicon.ico")]

--- a/actix-web-codegen/README.md
+++ b/actix-web-codegen/README.md
@ -4,7 +4,7 @@

 [![crates.io](https://meritbadge.herokuapp.com/actix-web-codegen)](https://crates.io/crates/actix-web-codegen)
 [![Documentation](https://docs.rs/actix-web-codegen/badge.svg)](https://docs.rs/actix-web-codegen/0.4.0/actix_web_codegen/)
-[![Version](https://img.shields.io/badge/rustc-1.42+-ab6000.svg)](https://blog.rust-lang.org/2020/03/12/Rust-1.42.html)
+[![Version](https://img.shields.io/badge/rustc-1.46+-ab6000.svg)](https://blog.rust-lang.org/2020/03/12/Rust-1.46.html)
 [![Build Status](https://travis-ci.org/actix/actix-web.svg?branch=master)](https://travis-ci.org/actix/actix-web)
 [![codecov](https://codecov.io/gh/actix/actix-web/branch/master/graph/badge.svg)](https://codecov.io/gh/actix/actix-web)
 [![Join the chat at https://gitter.im/actix/actix](https://badges.gitter.im/actix/actix.svg)](https://gitter.im/actix/actix?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
@ -14,7 +14,7 @@
 - [API Documentation](https://docs.rs/actix-web-codegen)
 - [Chat on Gitter](https://gitter.im/actix/actix-web)
 - Cargo package: [actix-web-codegen](https://crates.io/crates/actix-web-codegen)
- Minimum supported Rust version: 1.42 or later.
+- Minimum supported Rust version: 1.46 or later.

 ## Compile Testing
 Uses the [`trybuild`] crate. All compile fail tests should include a stderr file generated by `trybuild`. See the [workflow section](https://github.com/dtolnay/trybuild#workflow) of the trybuild docs for info on how to do this.
--- a/actix-web-codegen/tests/trybuild.rs
+++ b/actix-web-codegen/tests/trybuild.rs
@ -6,31 +6,15 @@ fn compile_macros() {
    t.compile_fail("tests/trybuild/simple-fail.rs");

    t.pass("tests/trybuild/route-ok.rs");
-
-    test_route_duplicate_unexpected_method(&t);
-    test_route_missing_method(&t)
-}
-
-#[rustversion::stable(1.42)]
-fn test_route_missing_method(t: &trybuild::TestCases) {
-    t.compile_fail("tests/trybuild/route-missing-method-fail-msrv.rs");
-}
-
-#[rustversion::not(stable(1.42))]
-#[rustversion::not(nightly)]
-fn test_route_missing_method(t: &trybuild::TestCases) {
    t.compile_fail("tests/trybuild/route-missing-method-fail.rs");
-}
-
-#[rustversion::nightly]
-fn test_route_missing_method(_t: &trybuild::TestCases) {}
-
-// FIXME: Re-test them on nightly once rust-lang/rust#77993 is fixed.
-#[rustversion::not(nightly)]
-fn test_route_duplicate_unexpected_method(t: &trybuild::TestCases) {
    t.compile_fail("tests/trybuild/route-duplicate-method-fail.rs");
    t.compile_fail("tests/trybuild/route-unexpected-method-fail.rs");
 }

-#[rustversion::nightly]
-fn test_route_duplicate_unexpected_method(_t: &trybuild::TestCases) {}
+// #[rustversion::not(nightly)]
+// fn skip_on_nightly(t: &trybuild::TestCases) {
+//
+// }
+
+// #[rustversion::nightly]
+// fn skip_on_nightly(_t: &trybuild::TestCases) {}
--- a/actix-web-codegen/tests/trybuild/route-missing-method-fail-msrv.rs
+++ b/actix-web-codegen/tests/trybuild/route-missing-method-fail-msrv.rs
@ -1 +0,0 @@
-route-missing-method-fail.rs
--- a/actix-web-codegen/tests/trybuild/route-missing-method-fail-msrv.stderr
+++ b/actix-web-codegen/tests/trybuild/route-missing-method-fail-msrv.stderr
@ -1,11 +0,0 @@
-error: The #[route(..)] macro requires at least one `method` attribute
- --> $DIR/route-missing-method-fail-msrv.rs:3:1
-  |
-3 | #[route("/")]
-  | ^^^^^^^^^^^^^
-
-error[E0425]: cannot find value `index` in this scope
-  --> $DIR/route-missing-method-fail-msrv.rs:12:49
-   |
-12 |     let srv = test::start(|| App::new().service(index));
-   |                                                 ^^^^^ not found in this scope
--- a/awc/README.md
+++ b/awc/README.md
@ -13,7 +13,7 @@
 - [API Documentation](https://docs.rs/awc)
 - [Example Project](https://github.com/actix/examples/tree/HEAD/awc_https)
 - [Chat on Gitter](https://gitter.im/actix/actix-web)
- Minimum Supported Rust Version (MSRV): 1.42.0
+- Minimum Supported Rust Version (MSRV): 1.46.0

 ## Example
 ```rust
--- a/src/lib.rs
+++ b/src/lib.rs
@ -56,7 +56,7 @@
 //! * Middlewares ([Logger, Session, CORS, etc](https://actix.rs/docs/middleware/))
 //! * Includes an async [HTTP client](https://actix.rs/actix-web/actix_web/client/index.html)
 //! * Supports [Actix actor framework](https://github.com/actix/actix)
-//! * Runs on stable Rust 1.42+
+//! * Runs on stable Rust 1.46+
 //!
 //! ## Crate Features
 //!
@ -65,7 +65,7 @@
 //! * `rustls` - HTTPS support via `rustls` crate, supports `HTTP/2`
 //! * `secure-cookies` - secure cookies support

-#![deny(rust_2018_idioms)]
+#![deny(rust_2018_idioms, nonstandard_style)]
 #![allow(clippy::needless_doctest_main, clippy::type_complexity)]
 #![doc(html_logo_url = "https://actix.rs/img/logo.png")]
 #![doc(html_favicon_url = "https://actix.rs/favicon.ico")]