Fix doc tests to work whether or not serde derive feature is used

serde-rs · Jul 6, 2023 · 290449f · 290449f
1 parent 3a1f387
commit 290449f
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 20 deletions.
diff --git a/serde/src/de/mod.rs b/serde/src/de/mod.rs
@@ -2240,8 +2240,8 @@ pub trait VariantAccess<'de>: Sized {
 ///
 /// ```edition2021
 /// use std::str::FromStr;
-/// use serde::Deserialize;
-/// use serde::de::{value, IntoDeserializer};
+/// use serde::de::{value, Deserialize, IntoDeserializer};
+/// use serde_derive::Deserialize;
 ///
 /// #[derive(Deserialize)]
 /// enum Setting {

diff --git a/serde/src/de/value.rs b/serde/src/de/value.rs
@@ -3,8 +3,8 @@
 //!
 //! ```edition2021
 //! use std::str::FromStr;
-//! use serde::Deserialize;
-//! use serde::de::{value, IntoDeserializer};
+//! use serde_derive::Deserialize;
+//! use serde::de::{value, Deserialize, IntoDeserializer};
 //!
 //! #[derive(Deserialize)]
 //! enum Setting {

diff --git a/serde/src/ser/fmt.rs b/serde/src/ser/fmt.rs
@@ -18,7 +18,8 @@ macro_rules! fmt_primitives {
 }
 
 /// ```edition2021
-/// use serde::Serialize;
+/// use serde::ser::Serialize;
+/// use serde_derive::Serialize;
 /// use std::fmt::{self, Display};
 ///
 /// #[derive(Serialize)]

diff --git a/serde_test/Cargo.toml b/serde_test/Cargo.toml
@@ -18,7 +18,7 @@ rust-version = "1.19"
 serde = { version = "1.0.60", path = "../serde" }
 
 [dev-dependencies]
-serde = { version = "1.0", path = "../serde" }
+serde = { version = "1.0", path = "../serde", features = ["rc"] }
 serde_derive = { version = "1.0", path = "../serde_derive" }
 
 [lib]

diff --git a/serde_test/src/assert.rs b/serde_test/src/assert.rs
@@ -9,7 +9,7 @@ use std::fmt::Debug;
 /// Runs both `assert_ser_tokens` and `assert_de_tokens`.
 ///
 /// ```edition2021
-/// # use serde::{Serialize, Deserialize};
+/// # use serde_derive::{Serialize, Deserialize};
 /// # use serde_test::{assert_tokens, Token};
 /// #
 /// #[derive(Serialize, Deserialize, PartialEq, Debug)]
@@ -40,7 +40,7 @@ where
 /// Asserts that `value` serializes to the given `tokens`.
 ///
 /// ```edition2021
-/// # use serde::{Serialize, Deserialize};
+/// # use serde_derive::{Serialize, Deserialize};
 /// # use serde_test::{assert_ser_tokens, Token};
 /// #
 /// #[derive(Serialize, Deserialize, PartialEq, Debug)]
@@ -82,7 +82,7 @@ where
 /// use std::sync::{Arc, Mutex};
 /// use std::thread;
 ///
-/// use serde::Serialize;
+/// use serde_derive::Serialize;
 /// use serde_test::{assert_ser_tokens_error, Token};
 ///
 /// #[derive(Serialize)]
@@ -131,7 +131,7 @@ where
 /// Asserts that the given `tokens` deserialize into `value`.
 ///
 /// ```edition2021
-/// # use serde::{Serialize, Deserialize};
+/// # use serde_derive::{Serialize, Deserialize};
 /// # use serde_test::{assert_de_tokens, Token};
 /// #
 /// #[derive(Serialize, Deserialize, PartialEq, Debug)]
@@ -185,7 +185,7 @@ where
 /// Asserts that the given `tokens` yield `error` when deserializing.
 ///
 /// ```edition2021
-/// # use serde::{Serialize, Deserialize};
+/// # use serde_derive::{Serialize, Deserialize};
 /// # use serde_test::{assert_de_tokens_error, Token};
 /// #
 /// #[derive(Serialize, Deserialize, PartialEq, Debug)]

diff --git a/serde_test/src/token.rs b/serde_test/src/token.rs
@@ -186,7 +186,7 @@ pub enum Token {
     /// A serialized unit struct of the given name.
     ///
     /// ```edition2021
-    /// # use serde::{Serialize, Deserialize};
+    /// # use serde_derive::{Serialize, Deserialize};
     /// # use serde_test::{assert_tokens, Token};
     /// #
     /// # fn main() {
@@ -201,7 +201,7 @@ pub enum Token {
     /// A unit variant of an enum.
     ///
     /// ```edition2021
-    /// # use serde::{Serialize, Deserialize};
+    /// # use serde_derive::{Serialize, Deserialize};
     /// # use serde_test::{assert_tokens, Token};
     /// #
     /// # fn main() {
@@ -224,7 +224,7 @@ pub enum Token {
     /// After this header is the value contained in the newtype struct.
     ///
     /// ```edition2021
-    /// # use serde::{Serialize, Deserialize};
+    /// # use serde_derive::{Serialize, Deserialize};
     /// # use serde_test::{assert_tokens, Token};
     /// #
     /// # fn main() {
@@ -245,7 +245,7 @@ pub enum Token {
     /// After this header is the value contained in the newtype variant.
     ///
     /// ```edition2021
-    /// # use serde::{Serialize, Deserialize};
+    /// # use serde_derive::{Serialize, Deserialize};
     /// # use serde_test::{assert_tokens, Token};
     /// #
     /// # fn main() {
@@ -314,7 +314,7 @@ pub enum Token {
     /// `TupleStructEnd`.
     ///
     /// ```edition2021
-    /// # use serde::{Serialize, Deserialize};
+    /// # use serde_derive::{Serialize, Deserialize};
     /// # use serde_test::{assert_tokens, Token};
     /// #
     /// # fn main() {
@@ -341,7 +341,7 @@ pub enum Token {
     /// `TupleVariantEnd`.
     ///
     /// ```edition2021
-    /// # use serde::{Serialize, Deserialize};
+    /// # use serde_derive::{Serialize, Deserialize};
     /// # use serde_test::{assert_tokens, Token};
     /// #
     /// # fn main() {
@@ -400,7 +400,7 @@ pub enum Token {
     /// After this header are the fields of the struct, followed by `StructEnd`.
     ///
     /// ```edition2021
-    /// # use serde::{Serialize, Deserialize};
+    /// # use serde_derive::{Serialize, Deserialize};
     /// # use serde_test::{assert_tokens, Token};
     /// #
     /// # fn main() {
@@ -432,7 +432,7 @@ pub enum Token {
     /// `StructVariantEnd`.
     ///
     /// ```edition2021
-    /// # use serde::{Serialize, Deserialize};
+    /// # use serde_derive::{Serialize, Deserialize};
     /// # use serde_test::{assert_tokens, Token};
     /// #
     /// # fn main() {
@@ -462,7 +462,7 @@ pub enum Token {
     /// The header to an enum of the given name.
     ///
     /// ```edition2021
-    /// # use serde::{Serialize, Deserialize};
+    /// # use serde_derive::{Serialize, Deserialize};
     /// # use serde_test::{assert_tokens, Token};
     /// #
     /// # fn main() {