Merging upstream version 1.70.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 54 insertions, 0 deletions

diff --git a/vendor/basic-toml/src/error.rs b/vendor/basic-toml/src/error.rs
new file mode 100644
index 000000000..9abfd53e8
--- /dev/null
+++ b/vendor/basic-toml/src/error.rs
@@ -0,0 +1,54 @@
+use std::fmt::{self, Debug, Display};
+
+/// Errors that can occur when serializing or deserializing TOML.
+pub struct Error(Box<ErrorInner>);
+
+pub(crate) enum ErrorInner {
+    Ser(crate::ser::Error),
+    De(crate::de::Error),
+}
+
+impl Error {
+    /// Produces a (line, column) pair of the position of the error if
+    /// available.
+    ///
+    /// All indexes are 0-based.
+    pub fn line_col(&self) -> Option<(usize, usize)> {
+        match &*self.0 {
+            ErrorInner::Ser(_) => None,
+            ErrorInner::De(error) => error.line_col(),
+        }
+    }
+}
+
+impl From<crate::ser::Error> for Error {
+    fn from(error: crate::ser::Error) -> Self {
+        Error(Box::new(ErrorInner::Ser(error)))
+    }
+}
+
+impl From<crate::de::Error> for Error {
+    fn from(error: crate::de::Error) -> Self {
+        Error(Box::new(ErrorInner::De(error)))
+    }
+}
+
+impl Display for Error {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        match &*self.0 {
+            ErrorInner::Ser(error) => Display::fmt(error, formatter),
+            ErrorInner::De(error) => Display::fmt(error, formatter),
+        }
+    }
+}
+
+impl Debug for Error {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        match &*self.0 {
+            ErrorInner::Ser(error) => Debug::fmt(error, formatter),
+            ErrorInner::De(error) => Debug::fmt(error, formatter),
+        }
+    }
+}
+
+impl std::error::Error for Error {}