Path to deserialization error

Author: Mark-Simulacrum

Cargo.lock

@@ -22,6 +22,7 @@ serde_derive = "1.0.59"
 serde_json = "1.0"
 toml = "0.5.3"
 url = "2.1.0"
+serde_path_to_error = "0.1.5"
 
 [dependencies.chrono]
 features = ["serde"]

Cargo.toml

@@ -12,32 +12,51 @@ pub enum DashError {
     Reqwest(reqwest::Error),
     Io(io::Error),
     Serde(serde_json::error::Error),
+    SerdePath(serde_path_to_error::Error<serde_json::error::Error>),
     R2d2(diesel::r2d2::PoolError),
     DieselError(diesel::result::Error),
     Template(handlebars::RenderError),
     Misc(Option<String>),
 }
 
 impl From<handlebars::RenderError> for DashError {
-    fn from(e: handlebars::RenderError) -> Self { DashError::Template(e) }
+    fn from(e: handlebars::RenderError) -> Self {
+        DashError::Template(e)
+    }
 }
 
 impl From<reqwest::Error> for DashError {
-    fn from(e: reqwest::Error) -> Self { DashError::Reqwest(e) }
+    fn from(e: reqwest::Error) -> Self {
+        DashError::Reqwest(e)
+    }
 }
 
 impl From<io::Error> for DashError {
-    fn from(e: io::Error) -> Self { DashError::Io(e) }
+    fn from(e: io::Error) -> Self {
+        DashError::Io(e)
+    }
 }
 
 impl From<serde_json::error::Error> for DashError {
-    fn from(e: serde_json::error::Error) -> Self { DashError::Serde(e) }
+    fn from(e: serde_json::error::Error) -> Self {
+        DashError::Serde(e)
+    }
+}
+
+impl From<serde_path_to_error::Error<serde_json::error::Error>> for DashError {
+    fn from(e: serde_path_to_error::Error<serde_json::error::Error>) -> Self {
+        DashError::SerdePath(e)
+    }
 }
 
 impl From<diesel::r2d2::PoolError> for DashError {
-    fn from(e: diesel::r2d2::PoolError) -> Self { DashError::R2d2(e) }
+    fn from(e: diesel::r2d2::PoolError) -> Self {
+        DashError::R2d2(e)
+    }
 }
 
 impl From<diesel::result::Error> for DashError {
-    fn from(e: diesel::result::Error) -> Self { DashError::DieselError(e) }
+    fn from(e: diesel::result::Error) -> Self {
+        DashError::DieselError(e)
+    }
 }

src/error.rs

@@ -110,11 +110,19 @@ fn authenticate(secret: &str, payload: &str, signature: &str) -> Result<(), ()>
     }
 }
 
+macro_rules! from_json {
+    ($b:expr) => {{
+        let body = $b;
+        let jd = &mut serde_json::Deserializer::from_str(&body);
+        serde_path_to_error::deserialize(jd)
+    }};
+}
+
 fn parse_event(event_name: &str, body: &str) -> DashResult<Payload> {
     match event_name {
-        "issue_comment" => Ok(Payload::IssueComment(serde_json::from_str(body)?)),
-        "issues" => Ok(Payload::Issues(serde_json::from_str(body)?)),
-        "pull_request" => Ok(Payload::PullRequest(serde_json::from_str(body)?)),
+        "issue_comment" => Ok(Payload::IssueComment(from_json!(body)?)),
+        "issues" => Ok(Payload::Issues(from_json!(body)?)),
+        "pull_request" => Ok(Payload::PullRequest(from_json!(body)?)),
 
         "commit_comment"
         | "create"