From 6827c7b3c582a8fe30beb8ddb9e2446bfc391ea7 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Thu, 1 Aug 2024 14:22:10 -0700 Subject: [PATCH] Fix json! invocations when std prelude is not in scope --- src/lib.rs | 6 ++++++ src/macros.rs | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 3225e26f0..4ef91095f 100644 --- 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 index 68e071026..c47bdf929 100644 --- 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)+ ]) => {