From 0d77c3a4d64eb26fb5a8ffea26507691c86f4a31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20CORTIER?= Date: Sun, 3 Apr 2022 00:08:47 -0400 Subject: [PATCH 1/3] Update `axum-core` depedency to 0.2 --- maud/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maud/Cargo.toml b/maud/Cargo.toml index 939801aa..7d8cb5b6 100644 --- a/maud/Cargo.toml +++ b/maud/Cargo.toml @@ -25,7 +25,7 @@ rocket = { version = ">= 0.3, < 0.5", optional = true } futures-util = { version = "0.3.0", optional = true, default-features = false } actix-web-dep = { package = "actix-web", version = "4", optional = true, default-features = false } tide = { version = "0.16.0", optional = true, default-features = false } -axum-core = { version = "0.1", optional = true } +axum-core = { version = "0.2", optional = true } http = { version = "0.2", optional = true } [dev-dependencies] From 6dce65145f2cbfe6b395b8dfc40b652b08289269 Mon Sep 17 00:00:00 2001 From: Chris Wong Date: Sun, 10 Apr 2022 19:33:54 +1000 Subject: [PATCH 2/3] Update doctest to use Axum 0.5 --- doctest/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doctest/Cargo.toml b/doctest/Cargo.toml index ad029368..53ec8ac3 100644 --- a/doctest/Cargo.toml +++ b/doctest/Cargo.toml @@ -13,7 +13,7 @@ rocket = "0.4" rouille = "3" tide = "0.16" tokio = { version = "1.9.0", features = ["rt", "macros", "rt-multi-thread"] } -axum = "0.4" +axum = "0.5" [dependencies.async-std] version = "1.9.0" From ae17d612be39402bd8e1033e8285882c0a5b6ff8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20CORTIER?= Date: Mon, 11 Apr 2022 17:12:35 -0400 Subject: [PATCH 3/3] Update CHANGELOG.md regarding axum --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c9a0eb5..eab52f20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,9 @@ - Remove blanket `Render` impl for `T: Display` [#320](https://github.com/lambda-fairy/maud/pull/320) -- Update to axum-core 0.1. This requires axum 0.4 +- Support `axum` v0.5 through `axum-core` v0.2 [#325](https://github.com/lambda-fairy/maud/pull/325) + [#337](https://github.com/lambda-fairy/maud/pull/337) - Update to `actix-web` 4.0. [#331](https://github.com/lambda-fairy/maud/pull/331)