diff --git a/.clippy.toml b/.clippy.toml index ece14b8d29..62ca742340 100644 --- 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 index 2c335f2c3d..9665d0fd9d 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -88,8 +88,8 @@ 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 @@ -97,7 +97,7 @@ jobs: - 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 index e63ee5d2b3..cf575d6a66 100644 --- 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 index 0f7cb82398..80125106ee 100644 --- 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 index 2506b283bb..bd5efbeb01 100644 --- 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 index e2dd7ae829..9f229bf7b8 100644 --- 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 index 9a9191939e..508f6f2774 100644 --- 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 index 3efacb9cbf..07d2252e57 100644 --- 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 index 812c6c532f..8e14b8ab5b 100644 --- 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 index e3229d3533..b6c9d88737 100644 --- 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 index e5cb15ef69..0018fc17ba 100644 --- 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 index 3bd2a04d68..2568c29c0a 100644 --- 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 index c5de4abfd8..45345302bf 100644 --- 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 index 8768e4596b..8fcb9cc1d0 100644 --- 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 index 257448432d..ec0e232553 100644 --- 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 index 2501791f8e..c114269df4 100644 --- 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 index d5139c73b7..90d88246fa 100644 --- 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 index a9694e1c94..92616ab918 100644 --- 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 index 44fbd5ca49..8ed7d80d83 100644 --- 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 index 2c7dd1a1cd..95f9908050 100644 --- 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 index 3373dc65e5..8f5b1e4487 100644 --- 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 index 5d7b1ca94b..583ab15a59 100644 --- 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 index fc65f6dfe4..a1b8f0ab09 100644 --- 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 index 95a3003c1d..9848d9e830 100644 --- 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 index 87163dc0b9..19af31136c 100644 --- 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 index 36b5dfc694..6fbee18a76 100644 --- 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 index 69f89bbaa7..90ea85c5c5 100644 --- 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 index 7078a65168..a18eb6ec78 100644 --- 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 index 954862cf42..e4c9063cbf 100644 --- 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 index ab753c7143..b5e9c15208 100644 --- 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 index 7860c4dd16..fc8f971a86 100644 --- 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 index c6921de755..6613367379 100644 --- 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 index 1786e2231a..e59f7eae99 100644 --- 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 index 03d40f8cbf..c29993de74 100644 --- 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 index 36a25938ca..b64c1244be 100644 --- 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 index c898d7ccd2..4a79c9bb88 100644 --- 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 index 4b4bbfe01e..4c143cdc50 100644 --- 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 index bc77aa5aaf..81ddb519ca 100644 --- 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 index fa8c14ce94..8cacbd4727 100644 --- 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 index 0129ce41c2..247df4d3c6 100644 --- 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 index 5a1a19f4d6..0587dc7f46 100644 --- 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 index 8e52f3620c..3e9b5b58c7 100644 --- a/examples/sse/Cargo.toml +++ b/examples/sse/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "example-sse" version = "0.1.0" -edition = "2018" +edition = "2021" publish = false [dependencies] diff --git a/examples/static-file-server/Cargo.toml b/examples/static-file-server/Cargo.toml index af4a683097..7f17eca6ac 100644 --- a/examples/static-file-server/Cargo.toml +++ b/examples/static-file-server/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "example-static-file-server" version = "0.1.0" -edition = "2018" +edition = "2021" publish = false [dependencies] diff --git a/examples/stream-to-file/Cargo.toml b/examples/stream-to-file/Cargo.toml index b203f836c7..b159c871ba 100644 --- a/examples/stream-to-file/Cargo.toml +++ b/examples/stream-to-file/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "example-stream-to-file" version = "0.1.0" -edition = "2018" +edition = "2021" publish = false [dependencies] diff --git a/examples/templates/Cargo.toml b/examples/templates/Cargo.toml index 99bc73a37f..2f5aba2791 100644 --- a/examples/templates/Cargo.toml +++ b/examples/templates/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "example-templates" version = "0.1.0" -edition = "2018" +edition = "2021" publish = false [dependencies] diff --git a/examples/testing/Cargo.toml b/examples/testing/Cargo.toml index 8fddfef8da..6ce3e80add 100644 --- a/examples/testing/Cargo.toml +++ b/examples/testing/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "example-testing" version = "0.1.0" -edition = "2018" +edition = "2021" publish = false [dependencies] diff --git a/examples/tls-rustls/Cargo.toml b/examples/tls-rustls/Cargo.toml index 0521f0a12f..0edf74d677 100644 --- a/examples/tls-rustls/Cargo.toml +++ b/examples/tls-rustls/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "example-tls-rustls" version = "0.1.0" -edition = "2018" +edition = "2021" publish = false [dependencies] diff --git a/examples/todos/Cargo.toml b/examples/todos/Cargo.toml index 0bfcb8c451..6e3b0a69bc 100644 --- a/examples/todos/Cargo.toml +++ b/examples/todos/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "example-todos" version = "0.1.0" -edition = "2018" +edition = "2021" publish = false [dependencies] diff --git a/examples/tokio-postgres/Cargo.toml b/examples/tokio-postgres/Cargo.toml index 20a4cbee28..74806044ca 100644 --- a/examples/tokio-postgres/Cargo.toml +++ b/examples/tokio-postgres/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "example-tokio-postgres" version = "0.1.0" -edition = "2018" +edition = "2021" publish = false [dependencies] diff --git a/examples/tracing-aka-logging/Cargo.toml b/examples/tracing-aka-logging/Cargo.toml index 92ce0857c0..39bcb79d47 100644 --- a/examples/tracing-aka-logging/Cargo.toml +++ b/examples/tracing-aka-logging/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "example-tracing-aka-logging" version = "0.1.0" -edition = "2018" +edition = "2021" publish = false [dependencies] diff --git a/examples/unix-domain-socket/Cargo.toml b/examples/unix-domain-socket/Cargo.toml index d283adc7d6..e3e018463b 100644 --- a/examples/unix-domain-socket/Cargo.toml +++ b/examples/unix-domain-socket/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "example-unix-domain-socket" version = "0.1.0" -edition = "2018" +edition = "2021" publish = false [dependencies] diff --git a/examples/validator/Cargo.toml b/examples/validator/Cargo.toml index e4d148cc25..8c35019f10 100644 --- a/examples/validator/Cargo.toml +++ b/examples/validator/Cargo.toml @@ -1,5 +1,5 @@ [package] -edition = "2018" +edition = "2021" name = "example-validator" publish = false version = "0.1.0" diff --git a/examples/versioning/Cargo.toml b/examples/versioning/Cargo.toml index 5a645237bd..ac8628c382 100644 --- a/examples/versioning/Cargo.toml +++ b/examples/versioning/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "example-versioning" version = "0.1.0" -edition = "2018" +edition = "2021" publish = false [dependencies] diff --git a/examples/websockets/Cargo.toml b/examples/websockets/Cargo.toml index 6a435ac211..cb307989f1 100644 --- a/examples/websockets/Cargo.toml +++ b/examples/websockets/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "example-websockets" version = "0.1.0" -edition = "2018" +edition = "2021" publish = false [dependencies]