Skip to content

Commit 14ad346

Browse files
authored
Change sse::Event::json_data to use axum_core::Error as its error type (#1762)
1 parent 3897efd commit 14ad346

3 files changed

Lines changed: 5 additions & 4 deletions

File tree

axum/CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
# Unreleased
99

10-
- None.
10+
- **breaking:** Change `sse::Event::json_data` to use `axum_core::Error` as its error type ([#1762])
11+
12+
[#1762]: https://github.com/tokio-rs/axum/pull/1762
1113

1214
# 0.6.6 (12. February, 2023)
1315

axum/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ allowed = [
122122
"http_body",
123123
"hyper",
124124
"serde",
125-
"serde_json",
126125
"tower_layer",
127126
"tower_service",
128127
]

axum/src/response/sse.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ impl Event {
210210
///
211211
/// [`MessageEvent`'s data field]: https://developer.mozilla.org/en-US/docs/Web/API/MessageEvent/data
212212
#[cfg(feature = "json")]
213-
pub fn json_data<T>(mut self, data: T) -> serde_json::Result<Event>
213+
pub fn json_data<T>(mut self, data: T) -> Result<Event, axum_core::Error>
214214
where
215215
T: serde::Serialize,
216216
{
@@ -219,7 +219,7 @@ impl Event {
219219
}
220220

221221
self.buffer.extend_from_slice(b"data:");
222-
serde_json::to_writer((&mut self.buffer).writer(), &data)?;
222+
serde_json::to_writer((&mut self.buffer).writer(), &data).map_err(axum_core::Error::new)?;
223223
self.buffer.put_u8(b'\n');
224224

225225
self.flags.insert(EventFlags::HAS_DATA);

0 commit comments

Comments
 (0)