OpenSource/axum
OpenSource/axum
1
0
Fork 0
mirror of https://github.com/tokio-rs/axum.git synced 2025-01-01 08:56:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Change sse::Event::json_data to use axum_core::Error as its error type (#1762)

Browse source
This commit is contained in:
David Pedersen 2023-02-16 23:32:05 +01:00
parent e1eb7d6615
commit 3ba74aa2f5
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
axum/CHANGELOG.md
View file

@ -7,7 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
# Unreleased # 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.16 (18. April, 2023) # 0.6.16 (18. April, 2023)

1
axum/Cargo.toml
View file

@ -192,7 +192,6 @@ allowed = [
"http_body", "http_body",
"hyper", "hyper",
"serde", "serde",
"serde_json",
"tower_layer", "tower_layer",
"tower_service", "tower_service",
] ]

4
axum/src/response/sse.rs
View file

@ -212,7 +212,7 @@ impl Event {
/// ///
/// [`MessageEvent`'s data field]: https://developer.mozilla.org/en-US/docs/Web/API/MessageEvent/data /// [`MessageEvent`'s data field]: https://developer.mozilla.org/en-US/docs/Web/API/MessageEvent/data
#[cfg(feature = "json")] #[cfg(feature = "json")]
pub fn json_data<T>(mut self, data: T) -> serde_json::Result<Event> pub fn json_data<T>(mut self, data: T) -> Result<Event, axum_core::Error>
where where
T: serde::Serialize, T: serde::Serialize,
{ {
@ -221,7 +221,7 @@ impl Event {
} }
self.buffer.extend_from_slice(b"data:"); 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.buffer.put_u8(b'\n');
self.flags.insert(EventFlags::HAS_DATA); self.flags.insert(EventFlags::HAS_DATA);