Merging upstream version 1.74.1+dfsg1.

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

2 files changed, 13 insertions, 3 deletions

diff --git a/vendor/bitflags/src/external/arbitrary.rs b/vendor/bitflags/src/external/arbitrary.rs
index 715ba251a..ea76f0a25 100644
--- a/vendor/bitflags/src/external/arbitrary.rs
+++ b/vendor/bitflags/src/external/arbitrary.rs
@@ -2,7 +2,9 @@
 
 use crate::Flags;
 
-/// Get a random known flags value.
+/**
+Generate some arbitrary flags value with only known bits set.
+*/
 pub fn arbitrary<'a, B: Flags>(u: &mut arbitrary::Unstructured<'a>) -> arbitrary::Result<B>
 where
     B::Bits: arbitrary::Arbitrary<'a>,
diff --git a/vendor/bitflags/src/external/serde.rs b/vendor/bitflags/src/external/serde.rs
index 1d501db82..be4f2edbf 100644
--- a/vendor/bitflags/src/external/serde.rs
+++ b/vendor/bitflags/src/external/serde.rs
@@ -10,7 +10,11 @@ use serde::{
     Deserialize, Deserializer, Serialize, Serializer,
 };
 
-/// Serialize a set of flags as a human-readable string or their underlying bits.
+/**
+Serialize a set of flags as a human-readable string or their underlying bits.
+
+Any unknown bits will be retained.
+*/
 pub fn serialize<B: Flags, S: Serializer>(flags: &B, serializer: S) -> Result<S::Ok, S::Error>
 where
     B::Bits: WriteHex + Serialize,
@@ -25,7 +29,11 @@ where
     }
 }
 
-/// Deserialize a set of flags from a human-readable string or their underlying bits.
+/**
+Deserialize a set of flags from a human-readable string or their underlying bits.
+
+Any unknown bits will be retained.
+*/
 pub fn deserialize<'de, B: Flags, D: Deserializer<'de>>(deserializer: D) -> Result<B, D::Error>
 where
     B::Bits: ParseHex + Deserialize<'de>,