Handle unused_import lint warnings around macro_rules re-exports

The bug rust#78894 in rustc is now a problem, since more warnings are
issued.

rust-lang/rust#78894
rust-lang/rust#117772

Author: jonasbb

serde_with/src/de/duplicates.rs

@@ -1,4 +1,4 @@
-use super::impls::{foreach_map, foreach_set};
+use super::impls::macros::{foreach_map, foreach_set};
 use crate::{
     duplicate_key_impls::{
         DuplicateInsertsFirstWinsMap, DuplicateInsertsLastWinsSet, PreventDuplicateInsertsMap,

serde_with/src/de/impls.rs

@@ -1,3 +1,4 @@
+pub(crate) use self::macros::*;
 use crate::{formats::*, prelude::*};
 #[cfg(feature = "hashbrown_0_14")]
 use hashbrown_0_14::{HashMap as HashbrownMap014, HashSet as HashbrownSet014};
@@ -12,7 +13,12 @@ use indexmap_2::{IndexMap as IndexMap2, IndexSet as IndexSet2};
 #[cfg(feature = "alloc")]
 type BoxedSlice<T> = Box<[T]>;
 
-macro_rules! foreach_map {
+pub(crate) mod macros {
+    // The unused_import lint has false-positives around macros
+    // https://github.com/rust-lang/rust/issues/78894
+    #![allow(unused_import)]
+
+    macro_rules! foreach_map {
     ($m:ident) => {
         #[cfg(feature = "alloc")]
         $m!(BTreeMap<K: Ord, V>, (|_size| BTreeMap::new()));
@@ -38,9 +44,8 @@ macro_rules! foreach_map {
         );
     };
 }
-pub(crate) use foreach_map;
 
-macro_rules! foreach_set {
+    macro_rules! foreach_set {
     ($m:ident) => {
         #[cfg(feature = "alloc")]
         $m!(BTreeSet<T: Ord>, (|_| BTreeSet::new()), insert);
@@ -70,9 +75,8 @@ macro_rules! foreach_set {
         );
     };
 }
-pub(crate) use foreach_set;
 
-macro_rules! foreach_seq {
+    macro_rules! foreach_seq {
     ($m:ident) => {
         foreach_set!($m);
 
@@ -97,6 +101,12 @@ macro_rules! foreach_seq {
     };
 }
 
+    // Make the macros available to the rest of the crate
+    pub(crate) use foreach_map;
+    pub(crate) use foreach_seq;
+    pub(crate) use foreach_set;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // region: Simple Wrapper types (e.g., Box, Option)
 

serde_with/src/ser/duplicates.rs

@@ -1,4 +1,4 @@
-use super::impls::{foreach_map, foreach_set};
+use super::impls::macros::{foreach_map, foreach_set};
 use crate::prelude::*;
 #[cfg(feature = "hashbrown_0_14")]
 use hashbrown_0_14::{HashMap as HashbrownMap014, HashSet as HashbrownSet014};

serde_with/src/ser/impls.rs

@@ -1,3 +1,4 @@
+pub(crate) use self::macros::*;
 use crate::{formats::Strictness, prelude::*};
 #[cfg(feature = "hashbrown_0_14")]
 use hashbrown_0_14::{HashMap as HashbrownMap014, HashSet as HashbrownSet014};
@@ -13,7 +14,12 @@ use indexmap_2::{IndexMap as IndexMap2, IndexSet as IndexSet2};
 type BoxedSlice<T> = Box<[T]>;
 type Slice<T> = [T];
 
-macro_rules! foreach_map {
+pub(crate) mod macros {
+    // The unused_import lint has false-positives around macros
+    // https://github.com/rust-lang/rust/issues/78894
+    #![allow(unused_import)]
+
+    macro_rules! foreach_map {
     ($m:ident) => {
         #[cfg(feature = "alloc")]
         $m!(BTreeMap<K, V>);
@@ -27,9 +33,8 @@ macro_rules! foreach_map {
         $m!(IndexMap2<K, V, H: Sized>);
     };
 }
-pub(crate) use foreach_map;
 
-macro_rules! foreach_set {
+    macro_rules! foreach_set {
     ($m:ident, $T:tt) => {
         #[cfg(feature = "alloc")]
         $m!(BTreeSet<$T>);
@@ -46,28 +51,34 @@ macro_rules! foreach_set {
         foreach_set!($m, T);
     };
 }
-pub(crate) use foreach_set;
-
-macro_rules! foreach_seq {
-    ($m:ident, $T:tt) => {
-        foreach_set!($m, $T);
 
-        $m!(Slice<$T>);
-
-        #[cfg(feature = "alloc")]
-        $m!(BinaryHeap<$T>);
-        #[cfg(feature = "alloc")]
-        $m!(BoxedSlice<$T>);
-        #[cfg(feature = "alloc")]
-        $m!(LinkedList<$T>);
-        #[cfg(feature = "alloc")]
-        $m!(Vec<$T>);
-        #[cfg(feature = "alloc")]
-        $m!(VecDeque<$T>);
-    };
-    ($m:ident) => {
-        foreach_seq!($m, T);
-    };
+    macro_rules! foreach_seq {
+        ($m:ident, $T:tt) => {
+            foreach_set!($m, $T);
+
+            $m!(Slice<$T>);
+
+            #[cfg(feature = "alloc")]
+            $m!(BinaryHeap<$T>);
+            #[cfg(feature = "alloc")]
+            $m!(BoxedSlice<$T>);
+            #[cfg(feature = "alloc")]
+            $m!(LinkedList<$T>);
+            #[cfg(feature = "alloc")]
+            $m!(Vec<$T>);
+            #[cfg(feature = "alloc")]
+            $m!(VecDeque<$T>);
+        };
+        ($m:
+            ident) => {
+            foreach_seq!($m, T);
+        };
+    }
+
+    // Make the macros available to the rest of the crate
+    pub(crate) use foreach_map;
+    pub(crate) use foreach_seq;
+    pub(crate) use foreach_set;
 }
 
 ///////////////////////////////////////////////////////////////////////////////