Adding upstream version 115.7.0esr.upstream/115.7.0esr

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

3 files changed, 395 insertions, 0 deletions

diff --git a/third_party/rust/uuid/src/external/arbitrary_support.rs b/third_party/rust/uuid/src/external/arbitrary_support.rs
new file mode 100644
index 0000000000..38cce7c73e
--- /dev/null
+++ b/third_party/rust/uuid/src/external/arbitrary_support.rs
@@ -0,0 +1,45 @@
+use crate::{std::convert::TryInto, Builder, Uuid};
+
+use arbitrary::{Arbitrary, Unstructured};
+
+impl Arbitrary<'_> for Uuid {
+    fn arbitrary(u: &mut Unstructured<'_>) -> arbitrary::Result<Self> {
+        let b = u
+            .bytes(16)?
+            .try_into()
+            .map_err(|_| arbitrary::Error::NotEnoughData)?;
+
+        Ok(Builder::from_random_bytes(b).into_uuid())
+    }
+
+    fn size_hint(depth: usize) -> (usize, Option<usize>) {
+        (16, Some(16))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    use crate::{Variant, Version};
+
+    #[test]
+    fn test_arbitrary() {
+        let mut bytes = Unstructured::new(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
+
+        let uuid = Uuid::arbitrary(&mut bytes).unwrap();
+
+        assert_eq!(Some(Version::Random), uuid.get_version());
+        assert_eq!(Variant::RFC4122, uuid.get_variant());
+    }
+
+    #[test]
+    fn test_arbitrary_empty() {
+        let mut bytes = Unstructured::new(&[]);
+
+        // Ensure we don't panic when building an arbitrary `Uuid`
+        let uuid = Uuid::arbitrary(&mut bytes);
+
+        assert!(uuid.is_err());
+    }
+}
diff --git a/third_party/rust/uuid/src/external/serde_support.rs b/third_party/rust/uuid/src/external/serde_support.rs
new file mode 100644
index 0000000000..5228daf15f
--- /dev/null
+++ b/third_party/rust/uuid/src/external/serde_support.rs
@@ -0,0 +1,313 @@
+// Copyright 2013-2014 The Rust Project Developers.
+// Copyright 2018 The Uuid Project Developers.
+//
+// See the COPYRIGHT file at the top-level directory of this distribution.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use crate::{
+    error::*,
+    fmt::{Braced, Hyphenated, Simple, Urn},
+    std::fmt,
+    Uuid,
+};
+use serde::{
+    de::{self, Error as _},
+    Deserialize, Deserializer, Serialize, Serializer,
+};
+
+impl Serialize for Uuid {
+    fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        if serializer.is_human_readable() {
+            serializer.serialize_str(self.hyphenated().encode_lower(&mut Uuid::encode_buffer()))
+        } else {
+            serializer.serialize_bytes(self.as_bytes())
+        }
+    }
+}
+
+impl Serialize for Hyphenated {
+    fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        serializer.serialize_str(self.encode_lower(&mut Uuid::encode_buffer()))
+    }
+}
+
+impl Serialize for Simple {
+    fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        serializer.serialize_str(self.encode_lower(&mut Uuid::encode_buffer()))
+    }
+}
+
+impl Serialize for Urn {
+    fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        serializer.serialize_str(self.encode_lower(&mut Uuid::encode_buffer()))
+    }
+}
+
+impl Serialize for Braced {
+    fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        serializer.serialize_str(self.encode_lower(&mut Uuid::encode_buffer()))
+    }
+}
+
+impl<'de> Deserialize<'de> for Uuid {
+    fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        fn de_error<E: de::Error>(e: Error) -> E {
+            E::custom(format_args!("UUID parsing failed: {}", e))
+        }
+
+        if deserializer.is_human_readable() {
+            struct UuidVisitor;
+
+            impl<'vi> de::Visitor<'vi> for UuidVisitor {
+                type Value = Uuid;
+
+                fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
+                    write!(formatter, "a UUID string")
+                }
+
+                fn visit_str<E: de::Error>(self, value: &str) -> Result<Uuid, E> {
+                    value.parse::<Uuid>().map_err(de_error)
+                }
+
+                fn visit_bytes<E: de::Error>(self, value: &[u8]) -> Result<Uuid, E> {
+                    Uuid::from_slice(value).map_err(de_error)
+                }
+
+                fn visit_seq<A>(self, mut seq: A) -> Result<Uuid, A::Error>
+                where
+                    A: de::SeqAccess<'vi>,
+                {
+                    #[rustfmt::skip]
+                    let bytes = [
+                        match seq.next_element()? { Some(e) => e, None => return Err(A::Error::invalid_length(16, &self)) },
+                        match seq.next_element()? { Some(e) => e, None => return Err(A::Error::invalid_length(16, &self)) },
+                        match seq.next_element()? { Some(e) => e, None => return Err(A::Error::invalid_length(16, &self)) },
+                        match seq.next_element()? { Some(e) => e, None => return Err(A::Error::invalid_length(16, &self)) },
+                        match seq.next_element()? { Some(e) => e, None => return Err(A::Error::invalid_length(16, &self)) },
+                        match seq.next_element()? { Some(e) => e, None => return Err(A::Error::invalid_length(16, &self)) },
+                        match seq.next_element()? { Some(e) => e, None => return Err(A::Error::invalid_length(16, &self)) },
+                        match seq.next_element()? { Some(e) => e, None => return Err(A::Error::invalid_length(16, &self)) },
+                        match seq.next_element()? { Some(e) => e, None => return Err(A::Error::invalid_length(16, &self)) },
+                        match seq.next_element()? { Some(e) => e, None => return Err(A::Error::invalid_length(16, &self)) },
+                        match seq.next_element()? { Some(e) => e, None => return Err(A::Error::invalid_length(16, &self)) },
+                        match seq.next_element()? { Some(e) => e, None => return Err(A::Error::invalid_length(16, &self)) },
+                        match seq.next_element()? { Some(e) => e, None => return Err(A::Error::invalid_length(16, &self)) },
+                        match seq.next_element()? { Some(e) => e, None => return Err(A::Error::invalid_length(16, &self)) },
+                        match seq.next_element()? { Some(e) => e, None => return Err(A::Error::invalid_length(16, &self)) },
+                        match seq.next_element()? { Some(e) => e, None => return Err(A::Error::invalid_length(16, &self)) },
+                    ];
+
+                    Ok(Uuid::from_bytes(bytes))
+                }
+            }
+
+            deserializer.deserialize_str(UuidVisitor)
+        } else {
+            struct UuidBytesVisitor;
+
+            impl<'vi> de::Visitor<'vi> for UuidBytesVisitor {
+                type Value = Uuid;
+
+                fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
+                    write!(formatter, "bytes")
+                }
+
+                fn visit_bytes<E: de::Error>(self, value: &[u8]) -> Result<Uuid, E> {
+                    Uuid::from_slice(value).map_err(de_error)
+                }
+            }
+
+            deserializer.deserialize_bytes(UuidBytesVisitor)
+        }
+    }
+}
+
+pub mod compact {
+    //! Serialize a [`Uuid`] as a `[u8; 16]`.
+    //!
+    //! [`Uuid`]: ../../struct.Uuid.html
+
+    /// Serialize from a [`Uuid`] as a `[u8; 16]`
+    ///
+    /// [`Uuid`]: ../../struct.Uuid.html
+    pub fn serialize<S>(u: &crate::Uuid, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        serde::Serialize::serialize(u.as_bytes(), serializer)
+    }
+
+    /// Deserialize a `[u8; 16]` as a [`Uuid`]
+    ///
+    /// [`Uuid`]: ../../struct.Uuid.html
+    pub fn deserialize<'de, D>(deserializer: D) -> Result<crate::Uuid, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        let bytes: [u8; 16] = serde::Deserialize::deserialize(deserializer)?;
+
+        Ok(crate::Uuid::from_bytes(bytes))
+    }
+
+    #[cfg(test)]
+    mod tests {
+        use serde_derive::*;
+        use serde_test::{self, Configure};
+
+        #[test]
+        fn test_serialize_compact() {
+            #[derive(Serialize, Debug, Deserialize, PartialEq)]
+            struct UuidContainer {
+                #[serde(with = "crate::serde::compact")]
+                u: crate::Uuid,
+            }
+
+            let uuid_bytes = b"F9168C5E-CEB2-4F";
+            let container = UuidContainer {
+                u: crate::Uuid::from_slice(uuid_bytes).unwrap(),
+            };
+
+            // more complex because of the struct wrapping the actual UUID
+            // serialization
+            serde_test::assert_tokens(
+                &container.compact(),
+                &[
+                    serde_test::Token::Struct {
+                        name: "UuidContainer",
+                        len: 1,
+                    },
+                    serde_test::Token::Str("u"),
+                    serde_test::Token::Tuple { len: 16 },
+                    serde_test::Token::U8(uuid_bytes[0]),
+                    serde_test::Token::U8(uuid_bytes[1]),
+                    serde_test::Token::U8(uuid_bytes[2]),
+                    serde_test::Token::U8(uuid_bytes[3]),
+                    serde_test::Token::U8(uuid_bytes[4]),
+                    serde_test::Token::U8(uuid_bytes[5]),
+                    serde_test::Token::U8(uuid_bytes[6]),
+                    serde_test::Token::U8(uuid_bytes[7]),
+                    serde_test::Token::U8(uuid_bytes[8]),
+                    serde_test::Token::U8(uuid_bytes[9]),
+                    serde_test::Token::U8(uuid_bytes[10]),
+                    serde_test::Token::U8(uuid_bytes[11]),
+                    serde_test::Token::U8(uuid_bytes[12]),
+                    serde_test::Token::U8(uuid_bytes[13]),
+                    serde_test::Token::U8(uuid_bytes[14]),
+                    serde_test::Token::U8(uuid_bytes[15]),
+                    serde_test::Token::TupleEnd,
+                    serde_test::Token::StructEnd,
+                ],
+            )
+        }
+    }
+}
+
+#[cfg(test)]
+mod serde_tests {
+    use super::*;
+
+    use serde_test::{Compact, Configure, Readable, Token};
+
+    #[test]
+    fn test_serialize_readable_string() {
+        let uuid_str = "f9168c5e-ceb2-4faa-b6bf-329bf39fa1e4";
+        let u = Uuid::parse_str(uuid_str).unwrap();
+        serde_test::assert_tokens(&u.readable(), &[Token::Str(uuid_str)]);
+    }
+
+    #[test]
+    fn test_deserialize_readable_compact() {
+        let uuid_bytes = b"F9168C5E-CEB2-4F";
+        let u = Uuid::from_slice(uuid_bytes).unwrap();
+
+        serde_test::assert_de_tokens(
+            &u.readable(),
+            &[
+                serde_test::Token::Tuple { len: 16 },
+                serde_test::Token::U8(uuid_bytes[0]),
+                serde_test::Token::U8(uuid_bytes[1]),
+                serde_test::Token::U8(uuid_bytes[2]),
+                serde_test::Token::U8(uuid_bytes[3]),
+                serde_test::Token::U8(uuid_bytes[4]),
+                serde_test::Token::U8(uuid_bytes[5]),
+                serde_test::Token::U8(uuid_bytes[6]),
+                serde_test::Token::U8(uuid_bytes[7]),
+                serde_test::Token::U8(uuid_bytes[8]),
+                serde_test::Token::U8(uuid_bytes[9]),
+                serde_test::Token::U8(uuid_bytes[10]),
+                serde_test::Token::U8(uuid_bytes[11]),
+                serde_test::Token::U8(uuid_bytes[12]),
+                serde_test::Token::U8(uuid_bytes[13]),
+                serde_test::Token::U8(uuid_bytes[14]),
+                serde_test::Token::U8(uuid_bytes[15]),
+                serde_test::Token::TupleEnd,
+            ],
+        );
+    }
+
+    #[test]
+    fn test_deserialize_readable_bytes() {
+        let uuid_bytes = b"F9168C5E-CEB2-4F";
+        let u = Uuid::from_slice(uuid_bytes).unwrap();
+
+        serde_test::assert_de_tokens(&u.readable(), &[serde_test::Token::Bytes(uuid_bytes)]);
+    }
+
+    #[test]
+    fn test_serialize_hyphenated() {
+        let uuid_str = "f9168c5e-ceb2-4faa-b6bf-329bf39fa1e4";
+        let u = Uuid::parse_str(uuid_str).unwrap();
+        serde_test::assert_ser_tokens(&u.hyphenated(), &[Token::Str(uuid_str)]);
+    }
+
+    #[test]
+    fn test_serialize_simple() {
+        let uuid_str = "f9168c5eceb24faab6bf329bf39fa1e4";
+        let u = Uuid::parse_str(uuid_str).unwrap();
+        serde_test::assert_ser_tokens(&u.simple(), &[Token::Str(uuid_str)]);
+    }
+
+    #[test]
+    fn test_serialize_urn() {
+        let uuid_str = "urn:uuid:f9168c5e-ceb2-4faa-b6bf-329bf39fa1e4";
+        let u = Uuid::parse_str(uuid_str).unwrap();
+        serde_test::assert_ser_tokens(&u.urn(), &[Token::Str(uuid_str)]);
+    }
+
+    #[test]
+    fn test_serialize_braced() {
+        let uuid_str = "{f9168c5e-ceb2-4faa-b6bf-329bf39fa1e4}";
+        let u = Uuid::parse_str(uuid_str).unwrap();
+        serde_test::assert_ser_tokens(&u.braced(), &[Token::Str(uuid_str)]);
+    }
+
+    #[test]
+    fn test_serialize_non_human_readable() {
+        let uuid_bytes = b"F9168C5E-CEB2-4F";
+        let u = Uuid::from_slice(uuid_bytes).unwrap();
+        serde_test::assert_tokens(
+            &u.compact(),
+            &[serde_test::Token::Bytes(&[
+                70, 57, 49, 54, 56, 67, 53, 69, 45, 67, 69, 66, 50, 45, 52, 70,
+            ])],
+        );
+    }
+
+    #[test]
+    fn test_de_failure() {
+        serde_test::assert_de_tokens_error::<Readable<Uuid>>(
+            &[Token::Str("hello_world")],
+            "UUID parsing failed: invalid character: expected an optional prefix of `urn:uuid:` followed by [0-9a-fA-F-], found `h` at 1",
+        );
+
+        serde_test::assert_de_tokens_error::<Compact<Uuid>>(
+            &[Token::Bytes(b"hello_world")],
+            "UUID parsing failed: invalid length: expected 16 bytes, found 11",
+        );
+    }
+}
diff --git a/third_party/rust/uuid/src/external/slog_support.rs b/third_party/rust/uuid/src/external/slog_support.rs
new file mode 100644
index 0000000000..2d6e817ba2
--- /dev/null
+++ b/third_party/rust/uuid/src/external/slog_support.rs
@@ -0,0 +1,37 @@
+// Copyright 2013-2014 The Rust Project Developers.
+// Copyright 2018 The Uuid Project Developers.
+//
+// See the COPYRIGHT file at the top-level directory of this distribution.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use crate::Uuid;
+
+impl slog::Value for Uuid {
+    fn serialize(
+        &self,
+        _: &slog::Record<'_>,
+        key: slog::Key,
+        serializer: &mut dyn slog::Serializer,
+    ) -> Result<(), slog::Error> {
+        serializer.emit_arguments(key, &format_args!("{}", self))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::tests::new;
+
+    use slog::{self, crit, Drain};
+
+    #[test]
+    fn test_slog_kv() {
+        let root = slog::Logger::root(slog::Discard.fuse(), slog::o!());
+        let u1 = new();
+        crit!(root, "test"; "u1" => u1);
+    }
+}