Merging upstream version 1.70.0+dfsg2.

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

2 files changed, 193 insertions, 0 deletions

diff --git a/vendor/serde_spanned/src/lib.rs b/vendor/serde_spanned/src/lib.rs
new file mode 100644
index 000000000..8ff723f44
--- /dev/null
+++ b/vendor/serde_spanned/src/lib.rs
@@ -0,0 +1,28 @@
+//! A [serde]-compatible spanned Value
+//!
+//! This allows capturing the location, in bytes, for a value in the original parsed document for
+//! compatible deserializers.
+//!
+//! [serde]: https://serde.rs/
+
+#![deny(missing_docs)]
+#![warn(rust_2018_idioms)]
+// Makes rustc abort compilation if there are any unsafe blocks in the crate.
+// Presence of this annotation is picked up by tools such as cargo-geiger
+// and lets them ensure that there is indeed no unsafe code as opposed to
+// something they couldn't detect (e.g. unsafe added via macro expansion, etc).
+#![forbid(unsafe_code)]
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]
+
+mod spanned;
+pub use crate::spanned::Spanned;
+
+#[doc(hidden)]
+#[cfg(feature = "serde")]
+pub mod __unstable {
+    pub use crate::spanned::is_spanned;
+    pub use crate::spanned::END_FIELD;
+    pub use crate::spanned::NAME;
+    pub use crate::spanned::START_FIELD;
+    pub use crate::spanned::VALUE_FIELD;
+}
diff --git a/vendor/serde_spanned/src/spanned.rs b/vendor/serde_spanned/src/spanned.rs
new file mode 100644
index 000000000..ac351ca8c
--- /dev/null
+++ b/vendor/serde_spanned/src/spanned.rs
@@ -0,0 +1,165 @@
+use std::cmp::Ordering;
+use std::hash::{Hash, Hasher};
+
+// Currently serde itself doesn't have a spanned type, so we map our `Spanned`
+// to a special value in the serde data model. Namely one with these special
+// fields/struct names.
+//
+// In general, supported deserializers should catch this and not literally emit
+// these strings but rather emit `Spanned` as they're intended.
+#[doc(hidden)]
+#[cfg(feature = "serde")]
+pub const NAME: &str = "$__serde_spanned_private_Spanned";
+#[doc(hidden)]
+#[cfg(feature = "serde")]
+pub const START_FIELD: &str = "$__serde_spanned_private_start";
+#[doc(hidden)]
+#[cfg(feature = "serde")]
+pub const END_FIELD: &str = "$__serde_spanned_private_end";
+#[doc(hidden)]
+#[cfg(feature = "serde")]
+pub const VALUE_FIELD: &str = "$__serde_spanned_private_value";
+#[doc(hidden)]
+#[cfg(feature = "serde")]
+pub fn is_spanned(name: &'static str, fields: &'static [&'static str]) -> bool {
+    name == NAME && fields == [START_FIELD, END_FIELD, VALUE_FIELD]
+}
+
+/// A spanned value, indicating the range at which it is defined in the source.
+#[derive(Clone, Debug)]
+pub struct Spanned<T> {
+    /// Byte range
+    span: std::ops::Range<usize>,
+    /// The spanned value.
+    value: T,
+}
+
+impl<T> Spanned<T> {
+    /// Byte range
+    pub fn span(&self) -> std::ops::Range<usize> {
+        self.span.clone()
+    }
+
+    /// Consumes the spanned value and returns the contained value.
+    pub fn into_inner(self) -> T {
+        self.value
+    }
+
+    /// Returns a reference to the contained value.
+    pub fn get_ref(&self) -> &T {
+        &self.value
+    }
+
+    /// Returns a mutable reference to the contained value.
+    pub fn get_mut(&mut self) -> &mut T {
+        &mut self.value
+    }
+}
+
+impl std::borrow::Borrow<str> for Spanned<String> {
+    fn borrow(&self) -> &str {
+        self.get_ref()
+    }
+}
+
+impl<T> AsRef<T> for Spanned<T> {
+    fn as_ref(&self) -> &T {
+        self.get_ref()
+    }
+}
+
+impl<T> AsMut<T> for Spanned<T> {
+    fn as_mut(&mut self) -> &mut T {
+        self.get_mut()
+    }
+}
+
+impl<T: PartialEq> PartialEq for Spanned<T> {
+    fn eq(&self, other: &Self) -> bool {
+        self.value.eq(&other.value)
+    }
+}
+
+impl<T: Eq> Eq for Spanned<T> {}
+
+impl<T: Hash> Hash for Spanned<T> {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        self.value.hash(state);
+    }
+}
+
+impl<T: PartialOrd> PartialOrd for Spanned<T> {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        self.value.partial_cmp(&other.value)
+    }
+}
+
+impl<T: Ord> Ord for Spanned<T> {
+    fn cmp(&self, other: &Self) -> Ordering {
+        self.value.cmp(&other.value)
+    }
+}
+
+#[cfg(feature = "serde")]
+impl<'de, T> serde::de::Deserialize<'de> for Spanned<T>
+where
+    T: serde::de::Deserialize<'de>,
+{
+    fn deserialize<D>(deserializer: D) -> Result<Spanned<T>, D::Error>
+    where
+        D: serde::de::Deserializer<'de>,
+    {
+        struct SpannedVisitor<T>(::std::marker::PhantomData<T>);
+
+        impl<'de, T> serde::de::Visitor<'de> for SpannedVisitor<T>
+        where
+            T: serde::de::Deserialize<'de>,
+        {
+            type Value = Spanned<T>;
+
+            fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                formatter.write_str("a spanned value")
+            }
+
+            fn visit_map<V>(self, mut visitor: V) -> Result<Spanned<T>, V::Error>
+            where
+                V: serde::de::MapAccess<'de>,
+            {
+                if visitor.next_key()? != Some(START_FIELD) {
+                    return Err(serde::de::Error::custom("spanned start key not found"));
+                }
+                let start: usize = visitor.next_value()?;
+
+                if visitor.next_key()? != Some(END_FIELD) {
+                    return Err(serde::de::Error::custom("spanned end key not found"));
+                }
+                let end: usize = visitor.next_value()?;
+
+                if visitor.next_key()? != Some(VALUE_FIELD) {
+                    return Err(serde::de::Error::custom("spanned value key not found"));
+                }
+                let value: T = visitor.next_value()?;
+
+                Ok(Spanned {
+                    span: start..end,
+                    value,
+                })
+            }
+        }
+
+        let visitor = SpannedVisitor(::std::marker::PhantomData);
+
+        static FIELDS: [&str; 3] = [START_FIELD, END_FIELD, VALUE_FIELD];
+        deserializer.deserialize_struct(NAME, &FIELDS, visitor)
+    }
+}
+
+#[cfg(feature = "serde")]
+impl<T: serde::ser::Serialize> serde::ser::Serialize for Spanned<T> {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::ser::Serializer,
+    {
+        self.value.serialize(serializer)
+    }
+}