From 3ba74aa2f5e73017086e8a56fa2a3c34607b70b1 Mon Sep 17 00:00:00 2001
From: David Pedersen <david.pdrsn@gmail.com>
Date: Thu, 16 Feb 2023 23:32:05 +0100
Subject: [PATCH] Change `sse::Event::json_data` to use `axum_core::Error` as
 its error type (#1762)

---
 axum/CHANGELOG.md        | 4 +++-
 axum/Cargo.toml          | 1 -
 axum/src/response/sse.rs | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/axum/CHANGELOG.md b/axum/CHANGELOG.md
index c0f92e36..5d51d13d 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.16 (18. April, 2023)
 
diff --git a/axum/Cargo.toml b/axum/Cargo.toml
index 5f82592b..61f834c8 100644
--- a/axum/Cargo.toml
+++ b/axum/Cargo.toml
@@ -192,7 +192,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 2e9e2853..1b205a93 100644
--- a/axum/src/response/sse.rs
+++ b/axum/src/response/sse.rs
@@ -212,7 +212,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<T>(mut self, data: T) -> serde_json::Result<Event>
+    pub fn json_data<T>(mut self, data: T) -> Result<Event, axum_core::Error>
     where
         T: serde::Serialize,
     {
@@ -221,7 +221,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);