diff --git a/axum/CHANGELOG.md b/axum/CHANGELOG.md index d3ace200c7..88c7f3edb9 100644 --- a/axum/CHANGELOG.md +++ b/axum/CHANGELOG.md @@ -7,7 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 # Unreleased -- None. +- **breaking:** Change `sse::Event::json_data` to use `axum_core::Error` as its error type ([#1762]) + +[#1762]: https://github.com/tokio-rs/axum/pull/1762 # 0.6.9 (24. February, 2023) diff --git a/axum/Cargo.toml b/axum/Cargo.toml index 9ae7230fab..9a88dc7830 100644 --- a/axum/Cargo.toml +++ b/axum/Cargo.toml @@ -183,7 +183,6 @@ allowed = [ "http_body", "hyper", "serde", - "serde_json", "tower_layer", "tower_service", ] diff --git a/axum/src/response/sse.rs b/axum/src/response/sse.rs index 3ae691f8bd..b7b42babf7 100644 --- a/axum/src/response/sse.rs +++ b/axum/src/response/sse.rs @@ -210,7 +210,7 @@ impl Event { /// /// [`MessageEvent`'s data field]: https://developer.mozilla.org/en-US/docs/Web/API/MessageEvent/data #[cfg(feature = "json")] - pub fn json_data(mut self, data: T) -> serde_json::Result + pub fn json_data(mut self, data: T) -> Result where T: serde::Serialize, { @@ -219,7 +219,7 @@ impl Event { } self.buffer.extend_from_slice(b"data:"); - serde_json::to_writer((&mut self.buffer).writer(), &data)?; + serde_json::to_writer((&mut self.buffer).writer(), &data).map_err(axum_core::Error::new)?; self.buffer.put_u8(b'\n'); self.flags.insert(EventFlags::HAS_DATA);