From 1a0929b52af57d5963dd9da9e5cf85ffbed3a8f7 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Fri, 13 Mar 2020 20:53:23 +0000
Subject: Reorganize serde modules

---
 serde_dhall/src/error.rs | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 serde_dhall/src/error.rs

(limited to 'serde_dhall/src/error.rs')

diff --git a/serde_dhall/src/error.rs b/serde_dhall/src/error.rs
new file mode 100644
index 0000000..91a0b94
--- /dev/null
+++ b/serde_dhall/src/error.rs
@@ -0,0 +1,30 @@
+use dhall::error::Error as DhallError;
+
+pub type Result<T> = std::result::Result<T, Error>;
+
+#[derive(Debug)]
+#[non_exhaustive]
+pub enum Error {
+    Dhall(DhallError),
+    Deserialize(String),
+}
+
+impl std::fmt::Display for Error {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        match self {
+            Error::Dhall(err) => write!(f, "{}", err),
+            Error::Deserialize(err) => write!(f, "{}", err),
+        }
+    }
+}
+
+impl std::error::Error for Error {}
+
+impl serde::de::Error for Error {
+    fn custom<T>(msg: T) -> Self
+    where
+        T: std::fmt::Display,
+    {
+        Error::Deserialize(msg.to_string())
+    }
+}
-- 
cgit v1.2.3


From 002d7c2a74647312a821598ac3d9f5521296873d Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Sun, 22 Mar 2020 21:25:44 +0000
Subject: Add a bunch of TODOs

---
 serde_dhall/src/error.rs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'serde_dhall/src/error.rs')

diff --git a/serde_dhall/src/error.rs b/serde_dhall/src/error.rs
index 91a0b94..23d1b02 100644
--- a/serde_dhall/src/error.rs
+++ b/serde_dhall/src/error.rs
@@ -1,9 +1,11 @@
 use dhall::error::Error as DhallError;
 
+/// TODO
 pub type Result<T> = std::result::Result<T, Error>;
 
 #[derive(Debug)]
 #[non_exhaustive]
+/// TODO
 pub enum Error {
     Dhall(DhallError),
     Deserialize(String),
-- 
cgit v1.2.3


From f9848b54fe2e64901042fba66fb471999f415ff1 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Tue, 24 Mar 2020 18:53:25 +0000
Subject: Hide serde Error internals

---
 serde_dhall/src/error.rs | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

(limited to 'serde_dhall/src/error.rs')

diff --git a/serde_dhall/src/error.rs b/serde_dhall/src/error.rs
index 23d1b02..896e8b9 100644
--- a/serde_dhall/src/error.rs
+++ b/serde_dhall/src/error.rs
@@ -1,21 +1,29 @@
 use dhall::error::Error as DhallError;
 
-/// TODO
+/// Alias for a `Result` with the error type `serde_dhall::Error`.
 pub type Result<T> = std::result::Result<T, Error>;
 
+/// Errors that can occur when deserializing Dhall data.
 #[derive(Debug)]
-#[non_exhaustive]
-/// TODO
-pub enum Error {
+pub struct Error(pub(crate) ErrorKind);
+
+#[derive(Debug)]
+pub(crate) enum ErrorKind {
     Dhall(DhallError),
     Deserialize(String),
 }
 
+impl From<ErrorKind> for Error {
+    fn from(kind: ErrorKind) -> Error {
+        Error(kind)
+    }
+}
+
 impl std::fmt::Display for Error {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        match self {
-            Error::Dhall(err) => write!(f, "{}", err),
-            Error::Deserialize(err) => write!(f, "{}", err),
+        match &self.0 {
+            ErrorKind::Dhall(err) => write!(f, "{}", err),
+            ErrorKind::Deserialize(err) => write!(f, "{}", err),
         }
     }
 }
@@ -27,6 +35,6 @@ impl serde::de::Error for Error {
     where
         T: std::fmt::Display,
     {
-        Error::Deserialize(msg.to_string())
+        ErrorKind::Deserialize(msg.to_string()).into()
     }
 }
-- 
cgit v1.2.3