Add BTreeSet and HashSet

andrewtoth · Nov 8, 2023 · d141da8 · d141da8
1 parent bc002a7
commit d141da8
Show file tree

Hide file tree

Showing 11 changed files with 89 additions and 3 deletions.
diff --git a/src/authority.rs b/src/authority.rs
@@ -12,3 +12,10 @@ create_visitor!(
 deserialize_string!(Visitor, Type);
 
 derive_extension_types!(super::Type);
+serde_seq!(
+    std::collections::HashSet<super::Type>,
+    super::Type,
+    std::collections::HashSet::with_capacity,
+    insert,
+    hash_set
+);
diff --git a/src/header_name.rs b/src/header_name.rs
@@ -6,3 +6,10 @@ create_visitor!(Visitor, Type, EXPECT_MESSAGE, (visit_str, &str));
 deserialize_str!(Visitor, Type);
 
 derive_extension_types!(super::Type);
+serde_seq!(
+    std::collections::HashSet<super::Type>,
+    super::Type,
+    std::collections::HashSet::with_capacity,
+    insert,
+    hash_set
+);
diff --git a/src/header_value.rs b/src/header_value.rs
@@ -34,3 +34,17 @@ where
 }
 
 derive_extension_types!(super::Type);
+serde_seq!(
+    std::collections::HashSet<super::Type>,
+    super::Type,
+    std::collections::HashSet::with_capacity,
+    insert,
+    hash_set
+);
+serde_seq!(
+    std::collections::BTreeSet<super::Type>,
+    super::Type,
+    |_| std::collections::BTreeSet::new(),
+    insert,
+    btree_set
+);
diff --git a/src/lib.rs b/src/lib.rs
@@ -1,8 +1,8 @@
 //! ## [`serde`] extensions for the [`http`] crate types
 //!
 //! Allows serializing and deserializing the following types from [`http`]:
-//! - [`Response`](response)
 //! - [`Request`](request)
+//! - [`Response`](response)
 //! - [`HeaderMap`](header_map)
 //! - [`StatusCode`](status_code)
 //! - [`Uri`](uri)
@@ -23,6 +23,8 @@
 //! - [`LinkedList`](std::collections::LinkedList)
 //! - [`HashMap`](std::collections::HashMap) in the `Value` position
 //! - [`BTreeMap`](std::collections::BTreeMap) in the `Value` position
+//! - [`HashSet`](std::collections::HashSet) for all except `HeaderMap`, `Request`, and `Response`
+//! - [`BTreeSet`](std::collections::BTreeSet) only for `HeaderValue`, `StatusCode`, and `Version`
 //!
 //! ## Usage
 //!

diff --git a/src/macros.rs b/src/macros.rs
@@ -192,7 +192,7 @@ macro_rules! serde_seq {
             #[derive(serde::Serialize)]
             struct TempSer<'a$(, $generic: serde::Serialize)?>(#[serde(with = "super")] &'a $ty);
 
-
+            #[allow(clippy::mutable_key_type)]
             pub fn serialize<$($generic: serde::Serialize, )?S: serde::Serializer>(
                 val: &$seq,
                 ser: S,
@@ -220,7 +220,7 @@ macro_rules! serde_seq {
                 where
                     V: serde::de::SeqAccess<'de>,
                 {
-                    #[allow(clippy::redundant_closure_call)]
+                    #[allow(clippy::redundant_closure_call, clippy::mutable_key_type)]
                     let mut ret = $create(seq.size_hint().unwrap_or_default());
                     while let Some(val) = seq.next_element::<TempDe$(<$generic>)?>()? {
                         ret.$insert(val.0);

diff --git a/src/method.rs b/src/method.rs
@@ -6,3 +6,10 @@ create_visitor!(Visitor, Type, EXPECT_MESSAGE, (visit_str, &str));
 deserialize_str!(Visitor, Type);
 
 derive_extension_types!(super::Type);
+serde_seq!(
+    std::collections::HashSet<super::Type>,
+    super::Type,
+    std::collections::HashSet::with_capacity,
+    insert,
+    hash_set
+);
diff --git a/src/path_and_query.rs b/src/path_and_query.rs
@@ -12,3 +12,10 @@ create_visitor!(
 deserialize_string!(Visitor, Type);
 
 derive_extension_types!(super::Type);
+serde_seq!(
+    std::collections::HashSet<super::Type>,
+    super::Type,
+    std::collections::HashSet::with_capacity,
+    insert,
+    hash_set
+);
diff --git a/src/scheme.rs b/src/scheme.rs
@@ -6,3 +6,10 @@ create_visitor!(Visitor, Type, EXPECT_MESSAGE, (visit_str, &str));
 deserialize_str!(Visitor, Type);
 
 derive_extension_types!(super::Type);
+serde_seq!(
+    std::collections::HashSet<super::Type>,
+    super::Type,
+    std::collections::HashSet::with_capacity,
+    insert,
+    hash_set
+);
diff --git a/src/status_code.rs b/src/status_code.rs
@@ -55,3 +55,17 @@ where
 }
 
 derive_extension_types!(super::Type);
+serde_seq!(
+    std::collections::HashSet<super::Type>,
+    super::Type,
+    std::collections::HashSet::with_capacity,
+    insert,
+    hash_set
+);
+serde_seq!(
+    std::collections::BTreeSet<super::Type>,
+    super::Type,
+    |_| std::collections::BTreeSet::new(),
+    insert,
+    btree_set
+);
diff --git a/src/uri.rs b/src/uri.rs
@@ -17,3 +17,10 @@ create_visitor!(
 deserialize_string!(Visitor, Type);
 
 derive_extension_types!(super::Type);
+serde_seq!(
+    std::collections::HashSet<super::Type>,
+    super::Type,
+    std::collections::HashSet::with_capacity,
+    insert,
+    hash_set
+);
diff --git a/src/version.rs b/src/version.rs
@@ -47,3 +47,17 @@ impl<'de> de::Visitor<'de> for Visitor {
 deserialize_str!(Visitor, Type);
 
 derive_extension_types!(super::Type);
+serde_seq!(
+    std::collections::HashSet<super::Type>,
+    super::Type,
+    std::collections::HashSet::with_capacity,
+    insert,
+    hash_set
+);
+serde_seq!(
+    std::collections::BTreeSet<super::Type>,
+    super::Type,
+    |_| std::collections::BTreeSet::new(),
+    insert,
+    btree_set
+);