Merge pull request #1166 from dtolnay/allocvec

Fix `json!` invocations when std prelude is not in scope
serde-rs · Aug 1, 2024 · 49d7d66 · 49d7d66
2 parents 611b2a4 + 6827c7b
commit 49d7d66
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -373,6 +373,12 @@ extern crate alloc;
 #[cfg(feature = "std")]
 extern crate std;
 
+// Not public API. Used from macro-generated code.
+#[doc(hidden)]
+pub mod __private {
+    pub use alloc::vec;
+}
+
 #[cfg(feature = "std")]
 #[cfg_attr(docsrs, doc(cfg(feature = "std")))]
 #[doc(inline)]

diff --git a/src/macros.rs b/src/macros.rs
@@ -77,12 +77,12 @@ macro_rules! json_internal {
 
     // Done with trailing comma.
     (@array [$($elems:expr,)*]) => {
-        vec![$($elems,)*]
+        $crate::__private::vec![$($elems,)*]
     };
 
     // Done without trailing comma.
     (@array [$($elems:expr),*]) => {
-        vec![$($elems),*]
+        $crate::__private::vec![$($elems),*]
     };
 
     // Next element is `null`.
@@ -254,7 +254,7 @@ macro_rules! json_internal {
     };
 
     ([]) => {
-        $crate::Value::Array(vec![])
+        $crate::Value::Array($crate::__private::vec![])
     };
 
     ([ $($tt:tt)+ ]) => {