Merging upstream version 1.71.1+dfsg1.

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

2 files changed, 115 insertions, 0 deletions

diff --git a/vendor/clap_builder/src/util/any_value.rs b/vendor/clap_builder/src/util/any_value.rs
new file mode 100644
index 000000000..dc7a3e953
--- /dev/null
+++ b/vendor/clap_builder/src/util/any_value.rs
@@ -0,0 +1,112 @@
+#[derive(Clone)]
+pub(crate) struct AnyValue {
+    inner: std::sync::Arc<dyn std::any::Any + Send + Sync + 'static>,
+    // While we can extract `TypeId` from `inner`, the debug repr is of a number, so let's track
+    // the type_name in debug builds.
+    id: AnyValueId,
+}
+
+impl AnyValue {
+    pub(crate) fn new<V: std::any::Any + Clone + Send + Sync + 'static>(inner: V) -> Self {
+        let id = AnyValueId::of::<V>();
+        let inner = std::sync::Arc::new(inner);
+        Self { inner, id }
+    }
+
+    pub(crate) fn downcast_ref<T: std::any::Any + Clone + Send + Sync + 'static>(
+        &self,
+    ) -> Option<&T> {
+        self.inner.downcast_ref::<T>()
+    }
+
+    pub(crate) fn downcast_into<T: std::any::Any + Clone + Send + Sync>(self) -> Result<T, Self> {
+        let id = self.id;
+        let value =
+            ok!(std::sync::Arc::downcast::<T>(self.inner).map_err(|inner| Self { inner, id }));
+        let value = std::sync::Arc::try_unwrap(value).unwrap_or_else(|arc| (*arc).clone());
+        Ok(value)
+    }
+
+    pub(crate) fn type_id(&self) -> AnyValueId {
+        self.id
+    }
+}
+
+impl std::fmt::Debug for AnyValue {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> Result<(), std::fmt::Error> {
+        f.debug_struct("AnyValue").field("inner", &self.id).finish()
+    }
+}
+
+#[derive(Copy, Clone)]
+pub struct AnyValueId {
+    type_id: std::any::TypeId,
+    #[cfg(debug_assertions)]
+    type_name: &'static str,
+}
+
+impl AnyValueId {
+    pub(crate) fn of<A: ?Sized + 'static>() -> Self {
+        Self {
+            type_id: std::any::TypeId::of::<A>(),
+            #[cfg(debug_assertions)]
+            type_name: std::any::type_name::<A>(),
+        }
+    }
+}
+
+impl PartialEq for AnyValueId {
+    fn eq(&self, other: &Self) -> bool {
+        self.type_id == other.type_id
+    }
+}
+
+impl Eq for AnyValueId {}
+
+impl PartialOrd for AnyValueId {
+    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        self.type_id.partial_cmp(&other.type_id)
+    }
+}
+
+impl Ord for AnyValueId {
+    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+        self.type_id.cmp(&other.type_id)
+    }
+}
+
+impl std::hash::Hash for AnyValueId {
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+        self.type_id.hash(state);
+    }
+}
+
+impl std::fmt::Debug for AnyValueId {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> Result<(), std::fmt::Error> {
+        #[cfg(not(debug_assertions))]
+        {
+            self.type_id.fmt(f)
+        }
+        #[cfg(debug_assertions)]
+        {
+            f.debug_struct(self.type_name).finish()
+        }
+    }
+}
+
+impl<'a, A: ?Sized + 'static> From<&'a A> for AnyValueId {
+    fn from(_: &'a A) -> Self {
+        Self::of::<A>()
+    }
+}
+
+#[cfg(test)]
+mod test {
+    #[test]
+    #[cfg(debug_assertions)]
+    fn debug_impl() {
+        use super::*;
+
+        assert_eq!(format!("{:?}", AnyValue::new(5)), "AnyValue { inner: i32 }");
+    }
+}
diff --git a/vendor/clap_builder/src/util/mod.rs b/vendor/clap_builder/src/util/mod.rs
index e6a8f70ed..a92aef8c3 100644
--- a/vendor/clap_builder/src/util/mod.rs
+++ b/vendor/clap_builder/src/util/mod.rs
@@ -1,5 +1,6 @@
 #![allow(clippy::single_component_path_imports)]
 
+mod any_value;
 pub(crate) mod flat_map;
 pub(crate) mod flat_set;
 mod graph;
@@ -8,6 +9,8 @@ mod str_to_bool;
 
 pub use self::id::Id;
 
+pub(crate) use self::any_value::AnyValue;
+pub(crate) use self::any_value::AnyValueId;
 pub(crate) use self::flat_map::Entry;
 pub(crate) use self::flat_map::FlatMap;
 pub(crate) use self::flat_set::FlatSet;