summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--axum-macros/CHANGELOG.md4
-rw-r--r--axum-macros/Cargo.toml6
-rw-r--r--axum/CHANGELOG.md9
-rw-r--r--axum/Cargo.toml4
4 files changed, 16 insertions, 7 deletions
diff --git a/axum-macros/CHANGELOG.md b/axum-macros/CHANGELOG.md
index 57b18004..2df0b10b 100644
--- a/axum-macros/CHANGELOG.md
+++ b/axum-macros/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
# Unreleased
+- None.
+
+# 0.3.0-rc.3 (18. November, 2022)
+
- **added:** Add `#[from_ref(skip)]` to skip implementing `FromRef` for individual fields ([#1537])
[#1537]: https://github.com/tokio-rs/axum/pull/1537
diff --git a/axum-macros/Cargo.toml b/axum-macros/Cargo.toml
index 0dabf261..f30ef683 100644
--- a/axum-macros/Cargo.toml
+++ b/axum-macros/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
name = "axum-macros"
readme = "README.md"
repository = "https://github.com/tokio-rs/axum"
-version = "0.3.0-rc.2" # remember to also bump the version that axum and axum-extra depends on
+version = "0.3.0-rc.3" # remember to also bump the version that axum and axum-extra depends on
[lib]
proc-macro = true
@@ -25,8 +25,8 @@ syn = { version = "1.0", features = [
] }
[dev-dependencies]
-axum = { path = "../axum", version = "0.6.0-rc.2", features = ["headers", "macros"] }
-axum-extra = { path = "../axum-extra", version = "0.4.0-rc.1", features = ["typed-routing", "cookie-private"] }
+axum = { path = "../axum", version = "=0.6.0-rc.5", features = ["headers", "macros"] }
+axum-extra = { path = "../axum-extra", version = "=0.4.0-rc.2", features = ["typed-routing", "cookie-private"] }
rustversion = "1.0"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
diff --git a/axum/CHANGELOG.md b/axum/CHANGELOG.md
index 5b7e96e8..6524377d 100644
--- a/axum/CHANGELOG.md
+++ b/axum/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
# Unreleased
+- None.
+
+# 0.6.0-rc.5 (18. November, 2022)
+
- **breaking:** `Router::with_state` is no longer a constructor. It is instead
used to convert the router into a `RouterService` ([#1532])
@@ -22,6 +26,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
Router::new().route(...).with_state(state);
```
+- **breaking:**: `Router::inherit_fallback` has been removed. Use
+ `Router::with_state` instead ([#1532])
- **breaking:**: `Router::nest` and `Router::merge` now only supports nesting
routers that use the same state type as the router they're being merged into.
Use `FromRef` for substates ([#1532])
@@ -32,11 +38,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- **added:** Add `WebSocketUpgrade::on_failed_upgrade` to customize what to do
when upgrading a connection fails ([#1539])
-[#1539]: https://github.com/tokio-rs/axum/pull/1539
-
[#1521]: https://github.com/tokio-rs/axum/pull/1521
[#1529]: https://github.com/tokio-rs/axum/pull/1529
[#1532]: https://github.com/tokio-rs/axum/pull/1532
+[#1539]: https://github.com/tokio-rs/axum/pull/1539
# 0.6.0-rc.4 (9. November, 2022)
diff --git a/axum/Cargo.toml b/axum/Cargo.toml
index 3674e649..7cb9de12 100644
--- a/axum/Cargo.toml
+++ b/axum/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "axum"
-version = "0.6.0-rc.4"
+version = "0.6.0-rc.5"
categories = ["asynchronous", "network-programming", "web-programming::http-server"]
description = "Web framework that focuses on ergonomics and modularity"
edition = "2021"
@@ -52,7 +52,7 @@ tower-layer = "0.3.2"
tower-service = "0.3"
# optional dependencies
-axum-macros = { path = "../axum-macros", version = "=0.3.0-rc.2", optional = true }
+axum-macros = { path = "../axum-macros", version = "=0.3.0-rc.3", optional = true }
base64 = { version = "0.13", optional = true }
headers = { version = "0.3.7", optional = true }
multer = { version = "2.0.0", optional = true }