Bump MSRV to 1.56 and update to the 2021 edition (#1098)

davidpdrsn · web-flow · commit 93251fa20321 · 2022-06-17T20:11:35.000+02:00
diff --git a/.clippy.toml b/.clippy.toml
@@ -1 +1 @@
-msrv = "1.54"
+msrv = "1.56"
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -88,16 +88,16 @@ jobs:
         command: test
         args: --all --all-features --all-targets
 
-  # some examples doesn't support 1.54 (such as async-graphql)
-  # so we only test axum itself on 1.54
+  # some examples doesn't support 1.56 (such as async-graphql)
+  # so we only test axum itself on 1.56
   test-msrv:
     needs: check
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@master
     - uses: actions-rs/toolchain@v1
       with:
-        toolchain: 1.54
+        toolchain: 1.56
         override: true
         profile: minimal
     - uses: Swatinem/rust-cache@v1
@@ -110,7 +110,7 @@ jobs:
           -p axum-extra
           -p axum-core
           --all-features --all-targets
-    # the compiler errors are different on 1.54 which makes
+    # the compiler errors are different on 1.56 which makes
     # the trybuild tests in axum-macros fail, so just run the doc
     # tests
     - name: Run axum-macros doc tests
diff --git a/axum-core/CHANGELOG.md b/axum-core/CHANGELOG.md
@@ -7,7 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 # Unreleased
 
-- None.
+- **change:** axum's MSRV is now 1.56 ([#1098])
+
+[#1098]: https://github.com/tokio-rs/axum/pull/1098
 
 # 0.2.5 (08. June, 2022)
 
diff --git a/axum-core/Cargo.toml b/axum-core/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 categories = ["asynchronous", "network-programming", "web-programming"]
 description = "Core types and traits for axum"
-edition = "2018"
+edition = "2021"
 homepage = "https://github.com/tokio-rs/axum"
 keywords = ["http", "web", "framework"]
 license = "MIT"
diff --git a/axum-core/README.md b/axum-core/README.md
@@ -14,7 +14,7 @@ This crate uses `#![forbid(unsafe_code)]` to ensure everything is implemented in
 
 ## Minimum supported Rust version
 
-axum-core's MSRV is 1.54.
+axum-core's MSRV is 1.56.
 
 ## Getting Help
 
diff --git a/axum-extra/CHANGELOG.md b/axum-extra/CHANGELOG.md
@@ -7,7 +7,9 @@ and this project adheres to [Semantic Versioning].
 
 # Unreleased
 
-- None.
+- **change:** axum's MSRV is now 1.56 ([#1098])
+
+[#1098]: https://github.com/tokio-rs/axum/pull/1098
 
 # 0.3.4 (08. June, 2022)
 
diff --git a/axum-extra/Cargo.toml b/axum-extra/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 categories = ["asynchronous", "network-programming", "web-programming"]
 description = "Extra utilities for axum"
-edition = "2018"
+edition = "2021"
 homepage = "https://github.com/tokio-rs/axum"
 keywords = ["http", "web", "framework"]
 license = "MIT"
diff --git a/axum-extra/README.md b/axum-extra/README.md
@@ -14,7 +14,7 @@ This crate uses `#![forbid(unsafe_code)]` to ensure everything is implemented in
 
 ## Minimum supported Rust version
 
-axum-extra's MSRV is 1.54.
+axum-extra's MSRV is 1.56.
 
 ## Getting Help
 
diff --git a/axum-macros/CHANGELOG.md b/axum-macros/CHANGELOG.md
@@ -7,7 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 # Unreleased
 
-- None.
+- **change:** axum's MSRV is now 1.56 ([#1098])
+
+[#1098]: https://github.com/tokio-rs/axum/pull/1098
 
 # 0.2.2 (18. May, 2022)
 
diff --git a/axum-macros/Cargo.toml b/axum-macros/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 categories = ["asynchronous", "network-programming", "web-programming"]
 description = "Macros for axum"
-edition = "2018"
+edition = "2021"
 homepage = "https://github.com/tokio-rs/axum"
 keywords = ["axum"]
 license = "MIT"
diff --git a/axum-macros/README.md b/axum-macros/README.md
@@ -14,7 +14,7 @@ This crate uses `#![forbid(unsafe_code)]` to ensure everything is implemented in
 
 ## Minimum supported Rust version
 
-axum-macros's MSRV is 1.54.
+axum-macros's MSRV is 1.56.
 
 ## Getting Help
 
diff --git a/axum/CHANGELOG.md b/axum/CHANGELOG.md
@@ -9,8 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - **added:** Support resolving host name via `Forwarded` header in `Host`
   extractor ([#1078])
+- **change:** axum's MSRV is now 1.56 ([#1098])
 
 [#1078]: https://github.com/tokio-rs/axum/pull/1078
+[#1098]: https://github.com/tokio-rs/axum/pull/1098
 
 # 0.5.7 (08. June, 2022)
 
@@ -392,7 +394,7 @@ Yanked, as it contained an accidental breaking change.
     `Router`.
   - **added:** Add `Handler::into_make_service_with_connect_info` for serving a
     handler without a `Router`, and storing info about the incoming connection.
-  - **breaking:** axum's minimum supported rust version is now 1.54
+  - **breaking:** axum's minimum supported rust version is now 1.56
 - Routing:
   - Big internal refactoring of routing leading to several improvements ([#363])
     - **added:** Wildcard routes like `.route("/api/users/*rest", service)` are now supported.
diff --git a/axum/Cargo.toml b/axum/Cargo.toml
@@ -3,7 +3,7 @@ name = "axum"
 version = "0.5.7"
 categories = ["asynchronous", "network-programming", "web-programming"]
 description = "Web framework that focuses on ergonomics and modularity"
-edition = "2018"
+edition = "2021"
 homepage = "https://github.com/tokio-rs/axum"
 keywords = ["http", "web", "framework"]
 license = "MIT"
diff --git a/axum/README.md b/axum/README.md
@@ -111,7 +111,7 @@ This crate uses `#![forbid(unsafe_code)]` to ensure everything is implemented in
 
 ## Minimum supported Rust version
 
-axum's MSRV is 1.54.
+axum's MSRV is 1.56.
 
 ## Examples
 
diff --git a/axum/src/routing/strip_prefix.rs b/axum/src/routing/strip_prefix.rs
@@ -138,7 +138,7 @@ where
     let a = a.map(Some).chain(std::iter::repeat_with(|| None));
     let b = b.map(Some).chain(std::iter::repeat_with(|| None));
     a.zip(b)
-        // use `map_while` when its stable in our MSRV
+        // use `map_while` when its stable in our MSRV (1.57)
         .take_while(|(a, b)| a.is_some() || b.is_some())
         .filter_map(|(a, b)| match (a, b) {
             (Some(a), Some(b)) => Some(Item::Both(a, b)),
diff --git a/examples/async-graphql/Cargo.toml b/examples/async-graphql/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "example-async-graphql"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/chat/Cargo.toml b/examples/chat/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "example-chat"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/consume-body-in-extractor-or-middleware/Cargo.toml b/examples/consume-body-in-extractor-or-middleware/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "example-consume-body-in-extractor-or-middleware"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/cors/Cargo.toml b/examples/cors/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "example-cors"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/customize-extractor-error/Cargo.toml b/examples/customize-extractor-error/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "example-customize-extractor-error"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/customize-path-rejection/Cargo.toml b/examples/customize-path-rejection/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "example-customize-path-rejection"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/error-handling-and-dependency-injection/Cargo.toml b/examples/error-handling-and-dependency-injection/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "example-error-handling-and-dependency-injection"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/form/Cargo.toml b/examples/form/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "example-form"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/global-404-handler/Cargo.toml b/examples/global-404-handler/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "example-global-404-handler"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/graceful-shutdown/Cargo.toml b/examples/graceful-shutdown/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "example-graceful-shutdown"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/hello-world/Cargo.toml b/examples/hello-world/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "example-hello-world"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/http-proxy/Cargo.toml b/examples/http-proxy/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "example-http-proxy"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/jwt/Cargo.toml b/examples/jwt/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "example-jwt"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/key-value-store/Cargo.toml b/examples/key-value-store/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "example-key-value-store"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/low-level-rustls/Cargo.toml b/examples/low-level-rustls/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "example-low-level-rustls"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/multipart-form/Cargo.toml b/examples/multipart-form/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "example-multipart-form"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/oauth/Cargo.toml b/examples/oauth/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "example-oauth"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/print-request-response/Cargo.toml b/examples/print-request-response/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "example-print-request-response"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/prometheus-metrics/Cargo.toml b/examples/prometheus-metrics/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "example-prometheus-metrics"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/query-params-with-empty-strings/Cargo.toml b/examples/query-params-with-empty-strings/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "example-query-params-with-empty-strings"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/readme/Cargo.toml b/examples/readme/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "example-readme"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/rest-grpc-multiplex/Cargo.toml b/examples/rest-grpc-multiplex/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "example-rest-grpc-multiplex"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/reverse-proxy/Cargo.toml b/examples/reverse-proxy/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "example-reverse-proxy"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 axum = { path = "../../axum" }
diff --git a/examples/routes-and-handlers-close-together/Cargo.toml b/examples/routes-and-handlers-close-together/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "example-routes-and-handlers-close-together"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/sessions/Cargo.toml b/examples/sessions/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "example-sessions"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/sqlx-postgres/Cargo.toml b/examples/sqlx-postgres/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "example-sqlx-postgres"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/sse/Cargo.toml b/examples/sse/Cargo.toml
diff --git a/examples/static-file-server/Cargo.toml b/examples/static-file-server/Cargo.toml
diff --git a/examples/stream-to-file/Cargo.toml b/examples/stream-to-file/Cargo.toml
diff --git a/examples/templates/Cargo.toml b/examples/templates/Cargo.toml
diff --git a/examples/testing/Cargo.toml b/examples/testing/Cargo.toml
diff --git a/examples/tls-rustls/Cargo.toml b/examples/tls-rustls/Cargo.toml
diff --git a/examples/todos/Cargo.toml b/examples/todos/Cargo.toml
diff --git a/examples/tokio-postgres/Cargo.toml b/examples/tokio-postgres/Cargo.toml
diff --git a/examples/tracing-aka-logging/Cargo.toml b/examples/tracing-aka-logging/Cargo.toml
diff --git a/examples/unix-domain-socket/Cargo.toml b/examples/unix-domain-socket/Cargo.toml
diff --git a/examples/validator/Cargo.toml b/examples/validator/Cargo.toml
diff --git a/examples/versioning/Cargo.toml b/examples/versioning/Cargo.toml
diff --git a/examples/websockets/Cargo.toml b/examples/websockets/Cargo.toml
