Replace serde_derive imports in test with imports from serde

jonasbb · Apr 19, 2022 · fbc9a96 · fbc9a96
1 parent a8bce82
commit fbc9a96
Show file tree

Hide file tree

Showing 11 changed files with 61 additions and 62 deletions.
diff --git a/serde_with/Cargo.toml b/serde_with/Cargo.toml
@@ -54,7 +54,6 @@ regex = {version = "1.3.9", default-features = false, features = ["std"]}
 rmp-serde = "0.15.5"
 ron = "0.7"
 serde-xml-rs = "0.5.0"
-serde_derive = "1.0.122"
 serde_json = {version = "1.0.25", features = ["preserve_order"]}
 serde_test = "1.0.124"
 serde_yaml = "0.8.21"

diff --git a/serde_with/src/base64.rs b/serde_with/src/base64.rs
@@ -24,7 +24,7 @@ use std::marker::PhantomData;
 ///
 /// ```rust
 /// # #[cfg(feature = "macros")] {
-/// # use serde_derive::{Deserialize, Serialize};
+/// # use serde::{Deserialize, Serialize};
 /// # use serde_with::serde_as;
 /// use serde_with::base64::{Base64, Bcrypt, BinHex, Standard};
 /// use serde_with::formats::{Padded, Unpadded};

diff --git a/serde_with/src/chrono.rs b/serde_with/src/chrono.rs
@@ -41,7 +41,7 @@ fn unix_epoch_naive() -> NaiveDateTime {
 ///
 /// ```
 /// # use chrono_crate::{DateTime, Utc};
-/// # use serde_derive::Deserialize;
+/// # use serde::Deserialize;
 /// #
 /// #[derive(Debug, Deserialize)]
 /// struct S {

diff --git a/serde_with/src/guide.md b/serde_with/src/guide.md
@@ -20,7 +20,7 @@ The `serde_as` scheme is based on two new traits: [`SerializeAs`] and [`Deserial
 ### Example
 
 ```rust
-# use serde_derive::{Deserialize, Serialize};
+# use serde::{Deserialize, Serialize};
 # use serde_with::{serde_as, DisplayFromStr};
 # use std::collections::HashMap;
 # use std::net::Ipv4Addr;
@@ -80,7 +80,7 @@ The example shows a similar setup as in the `serde_as` example above, but using
 ### Example
 
 ```rust
-# use serde_derive::{Deserialize, Serialize};
+# use serde::{Deserialize, Serialize};
 # use std::net::Ipv4Addr;
 #
 # #[derive(Debug, PartialEq, Eq)]

diff --git a/serde_with/src/hex.rs b/serde_with/src/hex.rs
@@ -26,7 +26,7 @@ use std::marker::PhantomData;
 ///
 /// ```rust
 /// # #[cfg(feature = "macros")] {
-/// # use serde_derive::{Deserialize, Serialize};
+/// # use serde::{Deserialize, Serialize};
 /// # use serde_json::json;
 /// # use serde_with::serde_as;
 /// #

diff --git a/serde_with/src/json.rs b/serde_with/src/json.rs
@@ -14,7 +14,7 @@ use serde::{Deserializer, Serialize, Serializer};
 /// # Examples
 ///
 /// ```
-/// # use serde_derive::{Deserialize, Serialize};
+/// # use serde::{Deserialize, Serialize};
 /// #
 /// #[derive(Deserialize, Serialize)]
 /// struct A {
@@ -97,7 +97,7 @@ pub mod nested {
 ///
 /// ```
 /// # #[cfg(feature = "macros")] {
-/// # use serde_derive::{Deserialize, Serialize};
+/// # use serde::{Deserialize, Serialize};
 /// # use serde_with::{serde_as, json::JsonString};
 /// #
 /// #[serde_as]

diff --git a/serde_with/src/lib.rs b/serde_with/src/lib.rs
@@ -81,7 +81,7 @@
 //!
 //! ```rust
 //! # #[cfg(feature = "macros")]
-//! # use serde_derive::{Deserialize, Serialize};
+//! # use serde::{Deserialize, Serialize};
 //! # #[cfg(feature = "macros")]
 //! # use serde_with::{serde_as, DisplayFromStr};
 //! # #[cfg(feature = "macros")]
@@ -154,7 +154,7 @@
 //!
 //! ```rust
 //! # #[cfg(feature = "macros")]
-//! # use serde_derive::{Deserialize, Serialize};
+//! # use serde::{Deserialize, Serialize};
 //! # #[cfg(feature = "macros")]
 //! # use serde_with::skip_serializing_none;
 //! # #[cfg(feature = "macros")]
@@ -194,7 +194,7 @@
 //! ```rust
 //! # #[cfg(all(feature = "macros", feature = "hex"))]
 //! # use {
-//! #     serde_derive::{Deserialize, Serialize},
+//! #     serde::{Deserialize, Serialize},
 //! #     serde_with::{serde_as, DisplayFromStr, DurationSeconds, hex::Hex},
 //! #     std::time::Duration,
 //! #     std::collections::BTreeMap,
@@ -373,7 +373,7 @@ impl Separator for CommaSeparator {
 /// If the use of the use of the proc-macro is not acceptable, then `As` can be used directly with serde.
 ///
 /// ```rust
-/// # use serde_derive::{Deserialize, Serialize};
+/// # use serde::{Deserialize, Serialize};
 /// # use serde_with::{As, DisplayFromStr};
 /// #
 /// #[derive(Deserialize, Serialize)]
@@ -387,7 +387,7 @@ impl Separator for CommaSeparator {
 /// It implements [`DeserializeAs`][]/[`SerializeAs`][], when the underlying type implements `Deserialize`/`Serialize`.
 ///
 /// ```rust
-/// # use serde_derive::{Deserialize, Serialize};
+/// # use serde::{Deserialize, Serialize};
 /// # use serde_with::{As, DisplayFromStr, Same};
 /// # use std::collections::BTreeMap;
 /// #
@@ -458,7 +458,7 @@ pub struct Same;
 ///
 /// ```rust
 /// # #[cfg(feature = "macros")] {
-/// # use serde_derive::{Deserialize, Serialize};
+/// # use serde::{Deserialize, Serialize};
 /// # use serde_json::json;
 /// # use serde_with::{serde_as, DisplayFromStr};
 /// #
@@ -502,7 +502,7 @@ pub struct DisplayFromStr;
 ///
 /// ```
 /// # #[cfg(feature = "macros")] {
-/// # use serde_derive::{Deserialize, Serialize};
+/// # use serde::{Deserialize, Serialize};
 /// # use serde_json::json;
 /// # use serde_with::{serde_as, NoneAsEmptyString};
 /// #
@@ -550,7 +550,7 @@ pub struct NoneAsEmptyString;
 ///
 /// ```
 /// # #[cfg(feature = "macros")] {
-/// # use serde_derive::Deserialize;
+/// # use serde::Deserialize;
 /// # use serde_with::{serde_as, DefaultOnError};
 /// #
 /// #[serde_as]
@@ -584,7 +584,7 @@ pub struct NoneAsEmptyString;
 ///
 /// ```
 /// # #[cfg(feature = "macros")] {
-/// # use serde_derive::Deserialize;
+/// # use serde::Deserialize;
 /// # use serde_with::{serde_as, DefaultOnError};
 /// #
 /// #[serde_as]
@@ -606,7 +606,7 @@ pub struct NoneAsEmptyString;
 ///
 /// ```rust
 /// # #[cfg(feature = "macros")] {
-/// # use serde_derive::{Deserialize, Serialize};
+/// # use serde::{Deserialize, Serialize};
 /// # use serde_json::json;
 /// # use serde_with::{serde_as, DefaultOnError, DisplayFromStr};
 /// #
@@ -639,7 +639,7 @@ pub struct DefaultOnError<T = Same>(PhantomData<T>);
 ///
 /// ```
 /// # #[cfg(feature = "macros")] {
-/// # use serde_derive::Deserialize;
+/// # use serde::Deserialize;
 /// # use serde_with::{serde_as, DefaultOnNull};
 /// #
 /// #[serde_as]
@@ -664,7 +664,7 @@ pub struct DefaultOnError<T = Same>(PhantomData<T>);
 ///
 /// ```rust
 /// # #[cfg(feature = "macros")] {
-/// # use serde_derive::{Deserialize, Serialize};
+/// # use serde::{Deserialize, Serialize};
 /// # use serde_json::json;
 /// # use serde_with::{serde_as, DefaultOnNull, DisplayFromStr};
 /// #
@@ -693,7 +693,7 @@ pub struct DefaultOnNull<T = Same>(PhantomData<T>);
 /// # Example
 /// ```rust
 /// # #[cfg(feature = "macros")] {
-/// # use serde_derive::{Deserialize, Serialize};
+/// # use serde::{Deserialize, Serialize};
 /// # use serde_json::json;
 /// # use serde_with::{serde_as, BytesOrString};
 /// #
@@ -756,7 +756,7 @@ pub struct BytesOrString;
 ///
 /// ```rust
 /// # #[cfg(feature = "macros")] {
-/// # use serde_derive::{Deserialize, Serialize};
+/// # use serde::{Deserialize, Serialize};
 /// # use serde_json::json;
 /// # use serde_with::{serde_as, DurationSeconds};
 /// use std::time::Duration;
@@ -811,7 +811,7 @@ pub struct BytesOrString;
 ///
 /// ```rust
 /// # #[cfg(all(feature = "macros", feature = "chrono"))] {
-/// # use serde_derive::{Deserialize, Serialize};
+/// # use serde::{Deserialize, Serialize};
 /// # use serde_json::json;
 /// # use serde_with::{serde_as, DurationSeconds};
 /// # use chrono_crate::Duration;
@@ -896,7 +896,7 @@ pub struct DurationSeconds<
 ///
 /// ```rust
 /// # #[cfg(feature = "macros")] {
-/// # use serde_derive::{Deserialize, Serialize};
+/// # use serde::{Deserialize, Serialize};
 /// # use serde_json::json;
 /// # use serde_with::{serde_as, DurationSecondsWithFrac};
 /// use std::time::Duration;
@@ -945,7 +945,7 @@ pub struct DurationSeconds<
 ///
 /// ```rust
 /// # #[cfg(all(feature = "macros", feature = "chrono"))] {
-/// # use serde_derive::{Deserialize, Serialize};
+/// # use serde::{Deserialize, Serialize};
 /// # use serde_json::json;
 /// # use serde_with::{serde_as, DurationSecondsWithFrac};
 /// # use chrono_crate::Duration;
@@ -1078,7 +1078,7 @@ pub struct DurationNanoSecondsWithFrac<
 ///
 /// ```rust
 /// # #[cfg(feature = "macros")] {
-/// # use serde_derive::{Deserialize, Serialize};
+/// # use serde::{Deserialize, Serialize};
 /// # use serde_json::json;
 /// # use serde_with::{serde_as, TimestampSeconds};
 /// use std::time::{Duration, SystemTime};
@@ -1133,7 +1133,7 @@ pub struct DurationNanoSecondsWithFrac<
 ///
 /// ```rust
 /// # #[cfg(all(feature = "macros", feature = "chrono"))] {
-/// # use serde_derive::{Deserialize, Serialize};
+/// # use serde::{Deserialize, Serialize};
 /// # use serde_json::json;
 /// # use serde_with::{serde_as, TimestampSeconds};
 /// # use chrono_crate::{DateTime, Local, TimeZone, Utc};
@@ -1223,7 +1223,7 @@ pub struct TimestampSeconds<
 ///
 /// ```rust
 /// # #[cfg(feature = "macros")] {
-/// # use serde_derive::{Deserialize, Serialize};
+/// # use serde::{Deserialize, Serialize};
 /// # use serde_json::json;
 /// # use serde_with::{serde_as, TimestampSecondsWithFrac};
 /// use std::time::{Duration, SystemTime};
@@ -1272,7 +1272,7 @@ pub struct TimestampSeconds<
 ///
 /// ```rust
 /// # #[cfg(all(feature = "macros", feature = "chrono"))] {
-/// # use serde_derive::{Deserialize, Serialize};
+/// # use serde::{Deserialize, Serialize};
 /// # use serde_json::json;
 /// # use serde_with::{serde_as, TimestampSecondsWithFrac};
 /// # use chrono_crate::{DateTime, Local, TimeZone, Utc};