From 6be419375bec9c6c581ac454fa6ba575dfb510f0 Mon Sep 17 00:00:00 2001 From: Ben Stuart Date: Wed, 7 Nov 2018 20:32:02 +0100 Subject: [PATCH] Rename serde to serde2, which is a workaround for a major cargo functionality oversight and bug https://github.com/rust-lang/cargo/issues/5730 --- serde/Cargo.toml | 8 +- serde/src/de/from_primitive.rs | 2 +- serde/src/de/ignored_any.rs | 4 +- serde/src/de/impls.rs | 36 ++-- serde/src/de/mod.rs | 112 +++++------ serde/src/de/value.rs | 8 +- serde/src/export.rs | 4 +- serde/src/integer128.rs | 16 +- serde/src/lib.rs | 54 ++--- serde/src/macros.rs | 16 +- serde/src/private/de.rs | 8 +- serde/src/private/ser.rs | 2 +- serde/src/ser/impls.rs | 12 +- serde/src/ser/impossible.rs | 6 +- serde/src/ser/mod.rs | 188 +++++++++--------- serde_derive/Cargo.toml | 6 +- serde_derive/src/de.rs | 2 +- serde_derive/src/lib.rs | 2 +- serde_derive/src/ser.rs | 2 +- serde_test/Cargo.toml | 8 +- serde_test/src/assert.rs | 28 +-- serde_test/src/configure.rs | 4 +- serde_test/src/de.rs | 2 +- serde_test/src/lib.rs | 18 +- serde_test/src/ser.rs | 2 +- serde_test/src/token.rs | 114 +++++------ test_suite/Cargo.toml | 10 +- test_suite/deps/Cargo.toml | 4 +- test_suite/no_std/Cargo.toml | 4 +- .../compile-fail/borrow/bad_lifetimes.rs | 2 +- .../compile-fail/borrow/duplicate_lifetime.rs | 2 +- .../compile-fail/borrow/duplicate_variant.rs | 2 +- .../compile-fail/borrow/empty_lifetimes.rs | 2 +- .../tests/compile-fail/borrow/no_lifetimes.rs | 2 +- .../compile-fail/borrow/struct_variant.rs | 2 +- .../compile-fail/borrow/wrong_lifetime.rs | 2 +- .../compile-fail/conflict/adjacent-tag.rs | 2 +- .../conflict/flatten-newtype-struct.rs | 2 +- .../conflict/flatten-skip-deserializing.rs | 2 +- .../conflict/flatten-skip-serializing-if.rs | 2 +- .../conflict/flatten-skip-serializing.rs | 2 +- .../conflict/flatten-tuple-struct.rs | 2 +- .../compile-fail/conflict/internal-tag.rs | 2 +- .../compile-fail/default-attribute/enum.rs | 2 +- .../nameless_struct_fields.rs | 2 +- .../duplicate-attribute/rename-and-ser.rs | 2 +- .../duplicate-attribute/rename-rename-de.rs | 2 +- .../rename-ser-rename-ser.rs | 2 +- .../duplicate-attribute/rename-ser-rename.rs | 2 +- .../duplicate-attribute/rename-ser-ser.rs | 2 +- .../duplicate-attribute/two-rename-ser.rs | 2 +- .../with-and-serialize-with.rs | 2 +- .../internal-tuple-variant.rs | 2 +- .../internally-tagged-struct.rs | 2 +- .../untagged-and-internal.rs | 2 +- .../enum-representation/untagged-struct.rs | 2 +- .../tests/compile-fail/identifier/both.rs | 2 +- .../compile-fail/identifier/field_struct.rs | 2 +- .../compile-fail/identifier/field_tuple.rs | 2 +- .../identifier/newtype_not_last.rs | 2 +- .../tests/compile-fail/identifier/not_unit.rs | 2 +- .../compile-fail/identifier/other_not_last.rs | 2 +- .../compile-fail/identifier/serialize.rs | 2 +- .../compile-fail/identifier/variant_struct.rs | 2 +- .../compile-fail/identifier/variant_tuple.rs | 2 +- .../precondition/deserialize_de_lifetime.rs | 2 +- .../precondition/deserialize_dst.rs | 2 +- .../tests/compile-fail/remote/bad_getter.rs | 2 +- .../tests/compile-fail/remote/bad_remote.rs | 2 +- .../tests/compile-fail/remote/enum_getter.rs | 2 +- .../compile-fail/remote/missing_field.rs | 2 +- .../compile-fail/remote/nonremote_getter.rs | 2 +- .../compile-fail/remote/unknown_field.rs | 2 +- .../tests/compile-fail/remote/wrong_de.rs | 2 +- .../tests/compile-fail/remote/wrong_getter.rs | 2 +- .../tests/compile-fail/remote/wrong_ser.rs | 2 +- .../compile-fail/transparent/at_most_one.rs | 2 +- .../transparent/de_at_least_one.rs | 2 +- .../transparent/ser_at_least_one.rs | 2 +- .../tests/compile-fail/type-attribute/from.rs | 2 +- .../tests/compile-fail/type-attribute/into.rs | 2 +- .../unknown-attribute/container.rs | 2 +- .../compile-fail/unknown-attribute/field.rs | 2 +- .../compile-fail/unknown-attribute/variant.rs | 2 +- .../with-variant/skip_de_newtype_field.rs | 2 +- .../with-variant/skip_de_struct_field.rs | 2 +- .../with-variant/skip_de_tuple_field.rs | 2 +- .../with-variant/skip_de_whole_variant.rs | 2 +- .../with-variant/skip_ser_newtype_field.rs | 2 +- .../with-variant/skip_ser_newtype_field_if.rs | 2 +- .../with-variant/skip_ser_struct_field.rs | 2 +- .../with-variant/skip_ser_struct_field_if.rs | 2 +- .../with-variant/skip_ser_tuple_field.rs | 2 +- .../with-variant/skip_ser_tuple_field_if.rs | 2 +- .../with-variant/skip_ser_whole_variant.rs | 2 +- test_suite/tests/test_annotations.rs | 6 +- test_suite/tests/test_borrow.rs | 6 +- test_suite/tests/test_de.rs | 6 +- test_suite/tests/test_gen.rs | 4 +- test_suite/tests/test_identifier.rs | 4 +- test_suite/tests/test_macros.rs | 6 +- test_suite/tests/test_remote.rs | 2 +- test_suite/tests/test_roundtrip.rs | 2 +- test_suite/tests/test_ser.rs | 4 +- test_suite/tests/test_unstable.rs | 4 +- test_suite/tests/test_value.rs | 4 +- 106 files changed, 431 insertions(+), 431 deletions(-) diff --git a/serde/Cargo.toml b/serde/Cargo.toml index ff471ba9b..92a92fc6b 100644 --- a/serde/Cargo.toml +++ b/serde/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "serde" +name = "serde2" version = "1.0.80" # remember to update html_root_url authors = ["Erick Tryzelaar ", "David Tolnay "] license = "MIT/Apache-2.0" @@ -18,10 +18,10 @@ travis-ci = { repository = "serde-rs/serde" } appveyor = { repository = "serde-rs/serde" } [dependencies] -serde_derive = { version = "1.0", optional = true, path = "../serde_derive" } +serde2_derive = { version = "1.0", optional = true, path = "../serde_derive" } [dev-dependencies] -serde_derive = { version = "1.0", path = "../serde_derive" } +serde2_derive = { version = "1.0", path = "../serde_derive" } ### FEATURES ################################################################# @@ -53,7 +53,7 @@ default = ["std"] # #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] # struct ... # -derive = ["serde_derive"] +derive = ["serde2_derive"] # Provide impls for common standard library types like Vec and HashMap. # Requires a dependency on the Rust standard library. diff --git a/serde/src/de/from_primitive.rs b/serde/src/de/from_primitive.rs index a8120fed3..296b5602d 100644 --- a/serde/src/de/from_primitive.rs +++ b/serde/src/de/from_primitive.rs @@ -179,7 +179,7 @@ impl_from_primitive_for_uint!(u64); impl_from_primitive_for_float!(f32); impl_from_primitive_for_float!(f64); -serde_if_integer128! { +serde2_if_integer128! { impl FromPrimitive for i128 { #[inline] fn from_i8(n: i8) -> Option { diff --git a/serde/src/de/ignored_any.rs b/serde/src/de/ignored_any.rs index 1e92146ed..ec7bd2e25 100644 --- a/serde/src/de/ignored_any.rs +++ b/serde/src/de/ignored_any.rs @@ -12,7 +12,7 @@ use de::{Deserialize, Deserializer, Error, MapAccess, SeqAccess, Visitor}; /// An efficient way of discarding data from a deserializer. /// -/// Think of this like `serde_json::Value` in that it can be deserialized from +/// Think of this like `serde2_json::Value` in that it can be deserialized from /// any type, except that it does not store any information about the data that /// gets deserialized. /// @@ -20,7 +20,7 @@ use de::{Deserialize, Deserializer, Error, MapAccess, SeqAccess, Visitor}; /// use std::fmt; /// use std::marker::PhantomData; /// -/// use serde::de::{ +/// use serde2::de::{ /// self, Deserialize, DeserializeSeed, Deserializer, IgnoredAny, SeqAccess, Visitor, /// }; /// diff --git a/serde/src/de/impls.rs b/serde/src/de/impls.rs index ad36b60b7..c6af60590 100644 --- a/serde/src/de/impls.rs +++ b/serde/src/de/impls.rs @@ -176,7 +176,7 @@ impl_deserialize_num!(usize, deserialize_u64, integer); impl_deserialize_num!(f32, deserialize_f32, integer, float); impl_deserialize_num!(f64, deserialize_f64, integer, float); -serde_if_integer128! { +serde2_if_integer128! { impl<'de> Deserialize<'de> for i128 { #[inline] fn deserialize(deserializer: D) -> Result @@ -1597,10 +1597,10 @@ impl<'de> Deserialize<'de> for PathBuf { //////////////////////////////////////////////////////////////////////////////// -// If this were outside of the serde crate, it would just use: +// If this were outside of the serde2 crate, it would just use: // // #[derive(Deserialize)] -// #[serde(variant_identifier)] +// #[serde2(variant_identifier)] #[cfg(all(feature = "std", any(unix, windows)))] variant_identifier!{ OsStringKind (Unix; b"Unix"; 0, Windows; b"Windows"; 1) @@ -1685,7 +1685,7 @@ forwarded_impl! { /// deduplicate `Arc` references to the same data. Every deserialized `Arc` /// will end up with a strong count of 1. /// - /// [`"rc"`]: https://serde.rs/feature-flags.html#-features-rc + /// [`"rc"`]: https://serde2.rs/feature-flags.html#-features-rc (T), Arc, Arc::new } @@ -1701,7 +1701,7 @@ forwarded_impl! { /// deduplicate `Rc` references to the same data. Every deserialized `Rc` /// will end up with a strong count of 1. /// - /// [`"rc"`]: https://serde.rs/feature-flags.html#-features-rc + /// [`"rc"`]: https://serde2.rs/feature-flags.html#-features-rc (T), Rc, Rc::new } @@ -1725,7 +1725,7 @@ where /// This impl requires the [`"rc"`] Cargo feature of Serde. The resulting /// `Weak` has a reference count of 0 and cannot be upgraded. /// -/// [`"rc"`]: https://serde.rs/feature-flags.html#-features-rc +/// [`"rc"`]: https://serde2.rs/feature-flags.html#-features-rc #[cfg(all(feature = "rc", any(feature = "std", feature = "alloc")))] impl<'de, T: ?Sized> Deserialize<'de> for RcWeak where @@ -1743,7 +1743,7 @@ where /// This impl requires the [`"rc"`] Cargo feature of Serde. The resulting /// `Weak` has a reference count of 0 and cannot be upgraded. /// -/// [`"rc"`]: https://serde.rs/feature-flags.html#-features-rc +/// [`"rc"`]: https://serde2.rs/feature-flags.html#-features-rc #[cfg(all(feature = "rc", any(feature = "std", feature = "alloc")))] impl<'de, T: ?Sized> Deserialize<'de> for ArcWeak where @@ -1797,7 +1797,7 @@ box_forwarded_impl! { /// deduplicate `Rc` references to the same data. Every deserialized `Rc` /// will end up with a strong count of 1. /// - /// [`"rc"`]: https://serde.rs/feature-flags.html#-features-rc + /// [`"rc"`]: https://serde2.rs/feature-flags.html#-features-rc Rc } @@ -1813,7 +1813,7 @@ box_forwarded_impl! { /// deduplicate `Arc` references to the same data. Every deserialized `Arc` /// will end up with a strong count of 1. /// - /// [`"rc"`]: https://serde.rs/feature-flags.html#-features-rc + /// [`"rc"`]: https://serde2.rs/feature-flags.html#-features-rc Arc } @@ -1844,7 +1844,7 @@ forwarded_impl!((T), RwLock, RwLock::new); // This is a cleaned-up version of the impl generated by: // // #[derive(Deserialize)] -// #[serde(deny_unknown_fields)] +// #[serde2(deny_unknown_fields)] // struct Duration { // secs: u64, // nanos: u32, @@ -1855,10 +1855,10 @@ impl<'de> Deserialize<'de> for Duration { where D: Deserializer<'de>, { - // If this were outside of the serde crate, it would just use: + // If this were outside of the serde2 crate, it would just use: // // #[derive(Deserialize)] - // #[serde(field_identifier, rename_all = "lowercase")] + // #[serde2(field_identifier, rename_all = "lowercase")] enum Field { Secs, Nanos, @@ -2110,7 +2110,7 @@ impl<'de> Deserialize<'de> for SystemTime { // Similar to: // // #[derive(Deserialize)] -// #[serde(deny_unknown_fields)] +// #[serde2(deny_unknown_fields)] // struct Range { // start: u64, // end: u32, @@ -2163,10 +2163,10 @@ mod range { pub const FIELDS: &'static [&'static str] = &["start", "end"]; - // If this were outside of the serde crate, it would just use: + // If this were outside of the serde2 crate, it would just use: // // #[derive(Deserialize)] - // #[serde(field_identifier, rename_all = "lowercase")] + // #[serde2(field_identifier, rename_all = "lowercase")] enum Field { Start, End, @@ -2318,7 +2318,7 @@ nonzero_integers! { // Currently 128-bit integers do not work on Emscripten targets so we need an // additional `#[cfg]` -serde_if_integer128! { +serde2_if_integer128! { nonzero_integers! { NonZeroU128, } @@ -2335,10 +2335,10 @@ where where D: Deserializer<'de>, { - // If this were outside of the serde crate, it would just use: + // If this were outside of the serde2 crate, it would just use: // // #[derive(Deserialize)] - // #[serde(variant_identifier)] + // #[serde2(variant_identifier)] enum Field { Ok, Err, diff --git a/serde/src/de/mod.rs b/serde/src/de/mod.rs index e2db02188..89e2cf4b8 100644 --- a/serde/src/de/mod.rs +++ b/serde/src/de/mod.rs @@ -22,7 +22,7 @@ //! standard library types. The complete list is below. All of these can be //! deserialized using Serde out of the box. //! -//! Additionally, Serde provides a procedural macro called [`serde_derive`] to +//! Additionally, Serde provides a procedural macro called [`serde2_derive`] to //! automatically generate [`Deserialize`] implementations for structs and enums //! in your program. See the [derive section of the manual] for how to use this. //! @@ -38,7 +38,7 @@ //! # The Deserializer trait //! //! [`Deserializer`] implementations are provided by third-party crates, for -//! example [`serde_json`], [`serde_yaml`] and [`bincode`]. +//! example [`serde2_json`], [`serde2_yaml`] and [`bincode`]. //! //! A partial list of well-maintained formats is given on the [Serde //! website][data formats]. @@ -107,17 +107,17 @@ //! - SocketAddrV4 //! - SocketAddrV6 //! -//! [Implementing `Deserialize`]: https://serde.rs/impl-deserialize.html +//! [Implementing `Deserialize`]: https://serde2.rs/impl-deserialize.html //! [`Deserialize`]: ../trait.Deserialize.html //! [`Deserializer`]: ../trait.Deserializer.html //! [`LinkedHashMap`]: https://docs.rs/linked-hash-map/*/linked_hash_map/struct.LinkedHashMap.html //! [`bincode`]: https://github.com/TyOverby/bincode //! [`linked-hash-map`]: https://crates.io/crates/linked-hash-map -//! [`serde_derive`]: https://crates.io/crates/serde_derive -//! [`serde_json`]: https://github.com/serde-rs/json -//! [`serde_yaml`]: https://github.com/dtolnay/serde-yaml -//! [derive section of the manual]: https://serde.rs/derive.html -//! [data formats]: https://serde.rs/#data-formats +//! [`serde2_derive`]: https://crates.io/crates/serde2_derive +//! [`serde2_json`]: https://github.com/serde2-rs/json +//! [`serde2_yaml`]: https://github.com/dtolnay/serde2-yaml +//! [derive section of the manual]: https://serde2.rs/derive.html +//! [data formats]: https://serde2.rs/#data-formats use lib::*; @@ -143,7 +143,7 @@ macro_rules! declare_error_trait { /// Every `Deserializer` declares an `Error` type that encompasses both /// general-purpose deserialization errors as well as errors specific to the /// particular deserialization format. For example the `Error` type of - /// `serde_json` can represent errors like an invalid JSON escape sequence or an + /// `serde2_json` can represent errors like an invalid JSON escape sequence or an /// unterminated string literal, in addition to the error cases that are part of /// this trait. /// @@ -155,7 +155,7 @@ macro_rules! declare_error_trait { /// The [example data format] presented on the website shows an error /// type appropriate for a basic JSON data format. /// - /// [example data format]: https://serde.rs/data-format.html + /// [example data format]: https://serde2.rs/data-format.html pub trait Error: Sized $(+ $($supertrait)::+)* { /// Raised when there is general error when deserializing a type. /// @@ -174,7 +174,7 @@ macro_rules! declare_error_trait { /// # } /// # } /// # - /// use serde::de::{self, Deserialize, Deserializer}; + /// use serde2::de::{self, Deserialize, Deserializer}; /// /// impl<'de> Deserialize<'de> for IpAddr { /// fn deserialize(deserializer: D) -> Result @@ -301,7 +301,7 @@ declare_error_trait!(Error: Sized + Debug + Display); /// ```rust /// # use std::fmt; /// # -/// # use serde::de::{self, Unexpected, Visitor}; +/// # use serde2::de::{self, Unexpected, Visitor}; /// # /// # struct Example; /// # @@ -426,7 +426,7 @@ impl<'a> fmt::Display for Unexpected<'a> { /// ```rust /// # use std::fmt; /// # -/// # use serde::de::{self, Unexpected, Visitor}; +/// # use serde2::de::{self, Unexpected, Visitor}; /// # /// # struct Example; /// # @@ -449,7 +449,7 @@ impl<'a> fmt::Display for Unexpected<'a> { /// Outside of a `Visitor`, `&"..."` can be used. /// /// ```rust -/// # use serde::de::{self, Unexpected}; +/// # use serde2::de::{self, Unexpected}; /// # /// # fn example() -> Result<(), E> /// # where @@ -495,7 +495,7 @@ impl<'a> Display for Expected + 'a { /// standard library types. The complete list is [here][de]. All of these can /// be deserialized using Serde out of the box. /// -/// Additionally, Serde provides a procedural macro called `serde_derive` to +/// Additionally, Serde provides a procedural macro called `serde2_derive` to /// automatically generate `Deserialize` implementations for structs and enums /// in your program. See the [derive section of the manual][derive] for how to /// use this. @@ -509,9 +509,9 @@ impl<'a> Display for Expected + 'a { /// `LinkedHashMap` type that is deserializable by Serde because the crate /// provides an implementation of `Deserialize` for it. /// -/// [de]: https://docs.serde.rs/serde/de/index.html -/// [derive]: https://serde.rs/derive.html -/// [impl-deserialize]: https://serde.rs/impl-deserialize.html +/// [de]: https://docs.serde2.rs/serde2/de/index.html +/// [derive]: https://serde2.rs/derive.html +/// [impl-deserialize]: https://serde2.rs/impl-deserialize.html /// /// # Lifetime /// @@ -519,14 +519,14 @@ impl<'a> Display for Expected + 'a { /// borrowed by `Self` when deserialized. See the page [Understanding /// deserializer lifetimes] for a more detailed explanation of these lifetimes. /// -/// [Understanding deserializer lifetimes]: https://serde.rs/lifetimes.html +/// [Understanding deserializer lifetimes]: https://serde2.rs/lifetimes.html pub trait Deserialize<'de>: Sized { /// Deserialize this value from the given Serde deserializer. /// /// See the [Implementing `Deserialize`][impl-deserialize] section of the /// manual for more information about how to implement this method. /// - /// [impl-deserialize]: https://serde.rs/impl-deserialize.html + /// [impl-deserialize]: https://serde2.rs/impl-deserialize.html fn deserialize(deserializer: D) -> Result where D: Deserializer<'de>; @@ -570,7 +570,7 @@ pub trait Deserialize<'de>: Sized { /// owned data. /// /// ```rust -/// # use serde::de::{Deserialize, DeserializeOwned}; +/// # use serde2::de::{Deserialize, DeserializeOwned}; /// # use std::io::{Read, Result}; /// # /// # trait Ignore { @@ -591,7 +591,7 @@ pub trait Deserialize<'de>: Sized { /// bounds is explained in more detail on the page [Understanding deserializer /// lifetimes]. /// -/// [Understanding deserializer lifetimes]: https://serde.rs/lifetimes.html +/// [Understanding deserializer lifetimes]: https://serde2.rs/lifetimes.html pub trait DeserializeOwned: for<'de> Deserialize<'de> {} impl DeserializeOwned for T where T: for<'de> Deserialize<'de> {} @@ -609,7 +609,7 @@ impl DeserializeOwned for T where T: for<'de> Deserialize<'de> {} /// The canonical API for stateless deserialization looks like this: /// /// ```rust -/// # use serde::Deserialize; +/// # use serde2::Deserialize; /// # /// # enum Error {} /// # @@ -623,7 +623,7 @@ impl DeserializeOwned for T where T: for<'de> Deserialize<'de> {} /// of accepting a seed as input: /// /// ```rust -/// # use serde::de::DeserializeSeed; +/// # use serde2::de::DeserializeSeed; /// # /// # enum Error {} /// # @@ -644,7 +644,7 @@ impl DeserializeOwned for T where T: for<'de> Deserialize<'de> {} /// borrowed by `Self::Value` when deserialized. See the page [Understanding /// deserializer lifetimes] for a more detailed explanation of these lifetimes. /// -/// [Understanding deserializer lifetimes]: https://serde.rs/lifetimes.html +/// [Understanding deserializer lifetimes]: https://serde2.rs/lifetimes.html /// /// # Example /// @@ -659,7 +659,7 @@ impl DeserializeOwned for T where T: for<'de> Deserialize<'de> {} /// use std::fmt; /// use std::marker::PhantomData; /// -/// use serde::de::{Deserialize, DeserializeSeed, Deserializer, SeqAccess, Visitor}; +/// use serde2::de::{Deserialize, DeserializeSeed, Deserializer, SeqAccess, Visitor}; /// /// // A DeserializeSeed implementation that uses stateful deserialization to /// // append array elements onto the end of an existing vector. The preexisting @@ -854,16 +854,16 @@ where /// it is seeing a map. If the data format supports /// `Deserializer::deserialize_any`, it will drive the Visitor using whatever /// type it sees in the input. JSON uses this approach when deserializing -/// `serde_json::Value` which is an enum that can represent any JSON +/// `serde2_json::Value` which is an enum that can represent any JSON /// document. Without knowing what is in a JSON document, we can deserialize -/// it to `serde_json::Value` by going through +/// it to `serde2_json::Value` by going through /// `Deserializer::deserialize_any`. /// /// 2. The various `deserialize_*` methods. Non-self-describing formats like /// Bincode need to be told what is in the input in order to deserialize it. /// The `deserialize_*` methods are hints to the deserializer for how to /// interpret the next piece of input. Non-self-describing formats are not -/// able to deserialize something like `serde_json::Value` which relies on +/// able to deserialize something like `serde2_json::Value` which relies on /// `Deserializer::deserialize_any`. /// /// When implementing `Deserialize`, you should avoid relying on @@ -873,7 +873,7 @@ where /// deserialize from self-describing formats only, ruling out Bincode and many /// others. /// -/// [Serde data model]: https://serde.rs/data-model.html +/// [Serde data model]: https://serde2.rs/data-model.html /// /// # Lifetime /// @@ -881,14 +881,14 @@ where /// borrowed from the input when deserializing. See the page [Understanding /// deserializer lifetimes] for a more detailed explanation of these lifetimes. /// -/// [Understanding deserializer lifetimes]: https://serde.rs/lifetimes.html +/// [Understanding deserializer lifetimes]: https://serde2.rs/lifetimes.html /// /// # Example implementation /// /// The [example data format] presented on the website contains example code for /// a basic JSON `Deserializer`. /// -/// [example data format]: https://serde.rs/data-format.html +/// [example data format]: https://serde2.rs/data-format.html pub trait Deserializer<'de>: Sized { /// The error type that can be returned if some error occurs during /// deserialization. @@ -932,7 +932,7 @@ pub trait Deserializer<'de>: Sized { where V: Visitor<'de>; - serde_if_integer128! { + serde2_if_integer128! { /// Hint that the `Deserialize` type is expecting an `i128` value. /// /// This method is available only on Rust compiler versions >=1.26. The @@ -966,7 +966,7 @@ pub trait Deserializer<'de>: Sized { where V: Visitor<'de>; - serde_if_integer128! { + serde2_if_integer128! { /// Hint that the `Deserialize` type is expecting an `u128` value. /// /// This method is available only on Rust compiler versions >=1.26. The @@ -1175,7 +1175,7 @@ pub trait Deserializer<'de>: Sized { /// # } /// # } /// # - /// use serde::de::{self, Deserialize, Deserializer}; + /// use serde2::de::{self, Deserialize, Deserializer}; /// /// impl<'de> Deserialize<'de> for Timestamp { /// fn deserialize(deserializer: D) -> Result @@ -1218,14 +1218,14 @@ pub trait Deserializer<'de>: Sized { /// that may be borrowed by `Self::Value`. See the page [Understanding /// deserializer lifetimes] for a more detailed explanation of these lifetimes. /// -/// [Understanding deserializer lifetimes]: https://serde.rs/lifetimes.html +/// [Understanding deserializer lifetimes]: https://serde2.rs/lifetimes.html /// /// # Example /// /// ```rust /// # use std::fmt; /// # -/// # use serde::de::{self, Unexpected, Visitor}; +/// # use serde2::de::{self, Unexpected, Visitor}; /// # /// /// A visitor that deserializes a long string - a string containing at least /// /// some minimum number of bytes. @@ -1270,7 +1270,7 @@ pub trait Visitor<'de>: Sized { /// # max: usize, /// # } /// # - /// # impl<'de> serde::de::Visitor<'de> for S { + /// # impl<'de> serde2::de::Visitor<'de> for S { /// # type Value = (); /// # /// fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { @@ -1336,7 +1336,7 @@ pub trait Visitor<'de>: Sized { Err(Error::invalid_type(Unexpected::Signed(v), &self)) } - serde_if_integer128! { + serde2_if_integer128! { /// The input contains a `i128`. /// /// This method is available only on Rust compiler versions >=1.26. The @@ -1396,7 +1396,7 @@ pub trait Visitor<'de>: Sized { Err(Error::invalid_type(Unexpected::Unsigned(v), &self)) } - serde_if_integer128! { + serde2_if_integer128! { /// The input contains a `u128`. /// /// This method is available only on Rust compiler versions >=1.26. The @@ -1665,14 +1665,14 @@ pub trait Visitor<'de>: Sized { /// borrowed by deserialized sequence elements. See the page [Understanding /// deserializer lifetimes] for a more detailed explanation of these lifetimes. /// -/// [Understanding deserializer lifetimes]: https://serde.rs/lifetimes.html +/// [Understanding deserializer lifetimes]: https://serde2.rs/lifetimes.html /// /// # Example implementation /// /// The [example data format] presented on the website demonstrates an /// implementation of `SeqAccess` for a basic JSON data format. /// -/// [example data format]: https://serde.rs/data-format.html +/// [example data format]: https://serde2.rs/data-format.html pub trait SeqAccess<'de> { /// The error type that can be returned if some error occurs during /// deserialization. @@ -1747,14 +1747,14 @@ where /// borrowed by deserialized map entries. See the page [Understanding /// deserializer lifetimes] for a more detailed explanation of these lifetimes. /// -/// [Understanding deserializer lifetimes]: https://serde.rs/lifetimes.html +/// [Understanding deserializer lifetimes]: https://serde2.rs/lifetimes.html /// /// # Example implementation /// /// The [example data format] presented on the website demonstrates an /// implementation of `MapAccess` for a basic JSON data format. /// -/// [example data format]: https://serde.rs/data-format.html +/// [example data format]: https://serde2.rs/data-format.html pub trait MapAccess<'de> { /// The error type that can be returned if some error occurs during /// deserialization. @@ -1939,14 +1939,14 @@ where /// borrowed by the deserialized enum variant. See the page [Understanding /// deserializer lifetimes] for a more detailed explanation of these lifetimes. /// -/// [Understanding deserializer lifetimes]: https://serde.rs/lifetimes.html +/// [Understanding deserializer lifetimes]: https://serde2.rs/lifetimes.html /// /// # Example implementation /// /// The [example data format] presented on the website demonstrates an /// implementation of `EnumAccess` for a basic JSON data format. /// -/// [example data format]: https://serde.rs/data-format.html +/// [example data format]: https://serde2.rs/data-format.html pub trait EnumAccess<'de>: Sized { /// The error type that can be returned if some error occurs during /// deserialization. @@ -1986,14 +1986,14 @@ pub trait EnumAccess<'de>: Sized { /// borrowed by the deserialized enum variant. See the page [Understanding /// deserializer lifetimes] for a more detailed explanation of these lifetimes. /// -/// [Understanding deserializer lifetimes]: https://serde.rs/lifetimes.html +/// [Understanding deserializer lifetimes]: https://serde2.rs/lifetimes.html /// /// # Example implementation /// /// The [example data format] presented on the website demonstrates an /// implementation of `VariantAccess` for a basic JSON data format. /// -/// [example data format]: https://serde.rs/data-format.html +/// [example data format]: https://serde2.rs/data-format.html pub trait VariantAccess<'de>: Sized { /// The error type that can be returned if some error occurs during /// deserialization. Must match the error type of our `EnumAccess`. @@ -2005,7 +2005,7 @@ pub trait VariantAccess<'de>: Sized { /// `invalid_type` error should be constructed: /// /// ```rust - /// # use serde::de::{self, value, DeserializeSeed, Visitor, VariantAccess, Unexpected}; + /// # use serde2::de::{self, value, DeserializeSeed, Visitor, VariantAccess, Unexpected}; /// # /// # struct X; /// # @@ -2045,7 +2045,7 @@ pub trait VariantAccess<'de>: Sized { /// `invalid_type` error should be constructed: /// /// ```rust - /// # use serde::de::{self, value, DeserializeSeed, Visitor, VariantAccess, Unexpected}; + /// # use serde2::de::{self, value, DeserializeSeed, Visitor, VariantAccess, Unexpected}; /// # /// # struct X; /// # @@ -2101,7 +2101,7 @@ pub trait VariantAccess<'de>: Sized { /// `invalid_type` error should be constructed: /// /// ```rust - /// # use serde::de::{self, value, DeserializeSeed, Visitor, VariantAccess, Unexpected}; + /// # use serde2::de::{self, value, DeserializeSeed, Visitor, VariantAccess, Unexpected}; /// # /// # struct X; /// # @@ -2148,7 +2148,7 @@ pub trait VariantAccess<'de>: Sized { /// `invalid_type` error should be constructed: /// /// ```rust - /// # use serde::de::{self, value, DeserializeSeed, Visitor, VariantAccess, Unexpected}; + /// # use serde2::de::{self, value, DeserializeSeed, Visitor, VariantAccess, Unexpected}; /// # /// # struct X; /// # @@ -2203,18 +2203,18 @@ pub trait VariantAccess<'de>: Sized { /// borrowed from the resulting `Deserializer`. See the page [Understanding /// deserializer lifetimes] for a more detailed explanation of these lifetimes. /// -/// [Understanding deserializer lifetimes]: https://serde.rs/lifetimes.html +/// [Understanding deserializer lifetimes]: https://serde2.rs/lifetimes.html /// /// # Example /// /// ```rust /// #[macro_use] -/// extern crate serde_derive; +/// extern crate serde2_derive; /// -/// extern crate serde; +/// extern crate serde2; /// /// use std::str::FromStr; -/// use serde::de::{value, Deserialize, IntoDeserializer}; +/// use serde2::de::{value, Deserialize, IntoDeserializer}; /// /// #[derive(Deserialize)] /// enum Setting { diff --git a/serde/src/de/value.rs b/serde/src/de/value.rs index fe097042b..c8beb3001 100644 --- a/serde/src/de/value.rs +++ b/serde/src/de/value.rs @@ -11,12 +11,12 @@ //! //! ```rust //! #[macro_use] -//! extern crate serde_derive; +//! extern crate serde2_derive; //! -//! extern crate serde; +//! extern crate serde2; //! //! use std::str::FromStr; -//! use serde::de::{value, Deserialize, IntoDeserializer}; +//! use serde2::de::{value, Deserialize, IntoDeserializer}; //! //! #[derive(Deserialize)] //! enum Setting { @@ -280,7 +280,7 @@ primitive_deserializer!(f32, "an `f32`.", F32Deserializer, visit_f32); primitive_deserializer!(f64, "an `f64`.", F64Deserializer, visit_f64); primitive_deserializer!(char, "a `char`.", CharDeserializer, visit_char); -serde_if_integer128! { +serde2_if_integer128! { primitive_deserializer!(i128, "an `i128`.", I128Deserializer, visit_i128); primitive_deserializer!(u128, "a `u128`.", U128Deserializer, visit_u128); } diff --git a/serde/src/export.rs b/serde/src/export.rs index 0f7cd1a21..059ea7570 100644 --- a/serde/src/export.rs +++ b/serde/src/export.rs @@ -29,8 +29,8 @@ mod string { // The generated code calls this like: // - // let value = &_serde::export::from_utf8_lossy(bytes); - // Err(_serde::de::Error::unknown_variant(value, VARIANTS)) + // let value = &_serde2::export::from_utf8_lossy(bytes); + // Err(_serde2::de::Error::unknown_variant(value, VARIANTS)) // // so it is okay for the return type to be different from the std case as long // as the above works. diff --git a/serde/src/integer128.rs b/serde/src/integer128.rs index 71db24655..11f67484d 100644 --- a/serde/src/integer128.rs +++ b/serde/src/integer128.rs @@ -11,10 +11,10 @@ /// /// ```rust /// #[macro_use] -/// extern crate serde; +/// extern crate serde2; /// -/// use serde::Serializer; -/// # use serde::private::ser::Error; +/// use serde2::Serializer; +/// # use serde2::private::ser::Error; /// # /// # struct MySerializer; /// @@ -29,7 +29,7 @@ /// /// /* ... */ /// -/// serde_if_integer128! { +/// serde2_if_integer128! { /// fn serialize_i128(self, v: i128) -> Result { /// /* ... */ /// # unimplemented!() @@ -55,7 +55,7 @@ /// transparently into just the input tokens. /// /// ```rust -/// macro_rules! serde_if_integer128 { +/// macro_rules! serde2_if_integer128 { /// ($($tt:tt)*) => { /// $($tt)* /// }; @@ -66,13 +66,13 @@ /// nothing. /// /// ```rust -/// macro_rules! serde_if_integer128 { +/// macro_rules! serde2_if_integer128 { /// ($($tt:tt)*) => {}; /// } /// ``` #[cfg(integer128)] #[macro_export] -macro_rules! serde_if_integer128 { +macro_rules! serde2_if_integer128 { ($($tt:tt)*) => { $($tt)* }; @@ -81,6 +81,6 @@ macro_rules! serde_if_integer128 { #[cfg(not(integer128))] #[macro_export] #[doc(hidden)] -macro_rules! serde_if_integer128 { +macro_rules! serde2_if_integer128 { ($($tt:tt)*) => {}; } diff --git a/serde/src/lib.rs b/serde/src/lib.rs index 99f585eb5..e06c88054 100644 --- a/serde/src/lib.rs +++ b/serde/src/lib.rs @@ -17,10 +17,10 @@ //! these two groups interact with each other, allowing any supported data //! structure to be serialized and deserialized using any supported data format. //! -//! See the Serde website [https://serde.rs/] for additional documentation and +//! See the Serde website [https://serde2.rs/] for additional documentation and //! usage examples. //! -//! [https://serde.rs/]: https://serde.rs/ +//! [https://serde2.rs/]: https://serde2.rs/ //! //! ## Design //! @@ -62,33 +62,33 @@ //! - [Redis], deserialize values from Redis when using [redis-rs]. //! *(deserialization only)* //! -//! [JSON]: https://github.com/serde-rs/json +//! [JSON]: https://github.com/serde2-rs/json //! [Bincode]: https://github.com/TyOverby/bincode //! [CBOR]: https://github.com/pyfisch/cbor -//! [YAML]: https://github.com/dtolnay/serde-yaml +//! [YAML]: https://github.com/dtolnay/serde2-yaml //! [MessagePack]: https://github.com/3Hren/msgpack-rust //! [TOML]: https://github.com/alexcrichton/toml-rs -//! [Pickle]: https://github.com/birkenfeld/serde-pickle +//! [Pickle]: https://github.com/birkenfeld/serde2-pickle //! [Hjson]: https://github.com/laktak/hjson-rust //! [BSON]: https://github.com/zonyitoo/bson-rs //! [Avro]: https://github.com/flavray/avro-rs -//! [URL]: https://github.com/nox/serde_urlencoded -//! [XML]: https://github.com/RReverser/serde-xml-rs +//! [URL]: https://github.com/nox/serde2_urlencoded +//! [XML]: https://github.com/RReverser/serde2-xml-rs //! [Envy]: https://github.com/softprops/envy -//! [Redis]: https://github.com/OneSignal/serde-redis +//! [Redis]: https://github.com/OneSignal/serde2-redis //! [Cargo]: http://doc.crates.io/manifest.html //! [redis-rs]: https://crates.io/crates/redis //////////////////////////////////////////////////////////////////////////////// // Serde types in rustdoc of other crates get linked to here. -#![doc(html_root_url = "https://docs.rs/serde/1.0.80")] +#![doc(html_root_url = "https://docs.rs/serde2/1.0.80")] // Support using Serde without the standard library! #![cfg_attr(not(feature = "std"), no_std)] // Unstable functionality only if the user asks for it. For tracking and // discussion of these features please refer to this issue: // -// https://github.com/serde-rs/serde/issues/812 +// https://github.com/serde2-rs/serde2/issues/812 #![cfg_attr(feature = "unstable", feature(specialization, never_type))] #![cfg_attr(feature = "alloc", feature(alloc))] #![cfg_attr(feature = "cargo-clippy", allow(renamed_and_removed_lints))] @@ -261,45 +261,45 @@ pub mod private; // // This is a workaround for https://github.com/rust-lang/cargo/issues/1286. // Without this re-export, crates that put Serde derives behind a cfg_attr would -// need to use some silly feature name that depends on both serde and -// serde_derive. +// need to use some silly feature name that depends on both serde2 and +// serde2_derive. // // [features] -// serde-impls = ["serde", "serde_derive"] +// serde2-impls = ["serde2", "serde2_derive"] // // [dependencies] -// serde = { version = "1.0", optional = true } -// serde_derive = { version = "1.0", optional = true } +// serde2 = { version = "1.0", optional = true } +// serde2_derive = { version = "1.0", optional = true } // // # Used like this: -// # #[cfg(feature = "serde-impls")] +// # #[cfg(feature = "serde2-impls")] // # #[macro_use] -// # extern crate serde_derive; +// # extern crate serde2_derive; // # -// # #[cfg_attr(feature = "serde-impls", derive(Serialize, Deserialize))] +// # #[cfg_attr(feature = "serde2-impls", derive(Serialize, Deserialize))] // # struct S { /* ... */ } // -// The re-exported derives allow crates to use "serde" as the name of their +// The re-exported derives allow crates to use "serde2" as the name of their // Serde feature which is more intuitive. // // [dependencies] -// serde = { version = "1.0", optional = true, features = ["derive"] } +// serde2 = { version = "1.0", optional = true, features = ["derive"] } // // # Used like this: -// # #[cfg(feature = "serde")] +// # #[cfg(feature = "serde2")] // # #[macro_use] -// # extern crate serde; +// # extern crate serde2; // # -// # #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +// # #[cfg_attr(feature = "serde2", derive(Serialize, Deserialize))] // # struct S { /* ... */ } // // The reason re-exporting is not enabled by default is that disabling it would // be annoying for crates that provide handwritten impls or data formats. They // would need to disable default features and then explicitly re-enable std. -#[cfg(feature = "serde_derive")] +#[cfg(feature = "serde2_derive")] #[allow(unused_imports)] #[macro_use] -extern crate serde_derive; -#[cfg(feature = "serde_derive")] +extern crate serde2_derive; +#[cfg(feature = "serde2_derive")] #[doc(hidden)] -pub use serde_derive::*; +pub use serde2_derive::*; diff --git a/serde/src/macros.rs b/serde/src/macros.rs index 9d099670a..6b8eed2b7 100644 --- a/serde/src/macros.rs +++ b/serde/src/macros.rs @@ -21,9 +21,9 @@ /// /// ```rust /// # #[macro_use] -/// # extern crate serde; +/// # extern crate serde2; /// # -/// # use serde::de::{value, Deserializer, Visitor}; +/// # use serde2::de::{value, Deserializer, Visitor}; /// # /// # struct MyDeserializer; /// # @@ -61,9 +61,9 @@ /// /// ```rust /// # #[macro_use] -/// # extern crate serde; +/// # extern crate serde2; /// # -/// # use serde::de::{value, Deserializer, Visitor}; +/// # use serde2::de::{value, Deserializer, Visitor}; /// # /// # struct MyDeserializer; /// # @@ -96,11 +96,11 @@ /// /// ```rust /// # #[macro_use] -/// # extern crate serde; +/// # extern crate serde2; /// # /// # use std::marker::PhantomData; /// # -/// # use serde::de::{value, Deserializer, Visitor}; +/// # use serde2::de::{value, Deserializer, Visitor}; /// # /// # struct MyDeserializer(PhantomData); /// # @@ -175,7 +175,7 @@ macro_rules! forward_to_deserialize_any_helper { forward_to_deserialize_any_method!{deserialize_i64<$l, $v>()} }; (i128<$l:tt, $v:ident>) => { - serde_if_integer128! { + serde2_if_integer128! { forward_to_deserialize_any_method!{deserialize_i128<$l, $v>()} } }; @@ -192,7 +192,7 @@ macro_rules! forward_to_deserialize_any_helper { forward_to_deserialize_any_method!{deserialize_u64<$l, $v>()} }; (u128<$l:tt, $v:ident>) => { - serde_if_integer128! { + serde2_if_integer128! { forward_to_deserialize_any_method!{deserialize_u128<$l, $v>()} } }; diff --git a/serde/src/private/de.rs b/serde/src/private/de.rs index 4b0f2c4c2..ad361c969 100644 --- a/serde/src/private/de.rs +++ b/serde/src/private/de.rs @@ -225,7 +225,7 @@ mod content { // rather than for this entire mechanism. // // This issue is tracking making some of this stuff public: - // https://github.com/serde-rs/serde/issues/741 + // https://github.com/serde2-rs/serde2/issues/741 use lib::*; @@ -238,7 +238,7 @@ mod content { /// Used from generated code to buffer the contents of the Deserializer when /// deserializing untagged enums and internally tagged enums. /// - /// Not public API. Use serde-value instead. + /// Not public API. Use serde2-value instead. #[derive(Debug)] pub enum Content<'de> { Bool(bool), @@ -1295,7 +1295,7 @@ mod content { // struct Info; // // #[derive(Deserialize)] - // #[serde(tag = "topic")] + // #[serde2(tag = "topic")] // enum Message { // Info(Info), // } @@ -2523,7 +2523,7 @@ mod content { // the newtype fallthrough case of `field_identifier`. // // #[derive(Deserialize)] -// #[serde(field_identifier)] +// #[serde2(field_identifier)] // enum F { // A, // B, diff --git a/serde/src/private/ser.rs b/serde/src/private/ser.rs index d58c5409a..a5cdce07e 100644 --- a/serde/src/private/ser.rs +++ b/serde/src/private/ser.rs @@ -15,7 +15,7 @@ use self::content::{ Content, ContentSerializer, SerializeStructVariantAsMapValue, SerializeTupleVariantAsMapValue, }; -/// Used to check that serde(getter) attributes return the expected type. +/// Used to check that serde2(getter) attributes return the expected type. /// Not public API. pub fn constrain(t: &T) -> &T { t diff --git a/serde/src/ser/impls.rs b/serde/src/ser/impls.rs index cafd53cd9..4a2dfb19f 100644 --- a/serde/src/ser/impls.rs +++ b/serde/src/ser/impls.rs @@ -41,7 +41,7 @@ primitive_impl!(f32, serialize_f32); primitive_impl!(f64, serialize_f64); primitive_impl!(char, serialize_char); -serde_if_integer128! { +serde2_if_integer128! { primitive_impl!(i128, serialize_i128); primitive_impl!(u128, serialize_u128); } @@ -391,7 +391,7 @@ deref_impl! { /// data structure. Serialization will not attempt to deduplicate these /// repeated data. /// - /// [`"rc"`]: https://serde.rs/feature-flags.html#-features-rc + /// [`"rc"`]: https://serde2.rs/feature-flags.html#-features-rc Serialize for Rc where T: Serialize } @@ -404,7 +404,7 @@ deref_impl! { /// data structure. Serialization will not attempt to deduplicate these /// repeated data. /// - /// [`"rc"`]: https://serde.rs/feature-flags.html#-features-rc + /// [`"rc"`]: https://serde2.rs/feature-flags.html#-features-rc Serialize for Arc where T: Serialize } @@ -415,7 +415,7 @@ deref_impl!(<'a, T: ?Sized> Serialize for Cow<'a, T> where T: Serialize + ToOwne /// This impl requires the [`"rc"`] Cargo feature of Serde. /// -/// [`"rc"`]: https://serde.rs/feature-flags.html#-features-rc +/// [`"rc"`]: https://serde2.rs/feature-flags.html#-features-rc #[cfg(all(feature = "rc", any(feature = "std", feature = "alloc")))] impl Serialize for RcWeak where @@ -431,7 +431,7 @@ where /// This impl requires the [`"rc"`] Cargo feature of Serde. /// -/// [`"rc"`]: https://serde.rs/feature-flags.html#-features-rc +/// [`"rc"`]: https://serde2.rs/feature-flags.html#-features-rc #[cfg(all(feature = "rc", any(feature = "std", feature = "alloc")))] impl Serialize for ArcWeak where @@ -474,7 +474,7 @@ nonzero_integers! { // Currently 128-bit integers do not work on Emscripten targets so we need an // additional `#[cfg]` -serde_if_integer128! { +serde2_if_integer128! { nonzero_integers! { NonZeroU128, } diff --git a/serde/src/ser/impossible.rs b/serde/src/ser/impossible.rs index 988ed0c17..3c8b73f3f 100644 --- a/serde/src/ser/impossible.rs +++ b/serde/src/ser/impossible.rs @@ -25,10 +25,10 @@ use ser::{ /// /// ```rust /// # #[macro_use] -/// # extern crate serde; +/// # extern crate serde2; /// # -/// # use serde::ser::{Serializer, Impossible}; -/// # use serde::private::ser::Error; +/// # use serde2::ser::{Serializer, Impossible}; +/// # use serde2::private::ser::Error; /// # /// # struct MySerializer; /// # diff --git a/serde/src/ser/mod.rs b/serde/src/ser/mod.rs index 76d544855..27d448691 100644 --- a/serde/src/ser/mod.rs +++ b/serde/src/ser/mod.rs @@ -22,7 +22,7 @@ //! standard library types. The complete list is below. All of these can be //! serialized using Serde out of the box. //! -//! Additionally, Serde provides a procedural macro called [`serde_derive`] to +//! Additionally, Serde provides a procedural macro called [`serde2_derive`] to //! automatically generate [`Serialize`] implementations for structs and enums //! in your program. See the [derive section of the manual] for how to use this. //! @@ -38,7 +38,7 @@ //! # The Serializer trait //! //! [`Serializer`] implementations are provided by third-party crates, for -//! example [`serde_json`], [`serde_yaml`] and [`bincode`]. +//! example [`serde2_json`], [`serde2_yaml`] and [`bincode`]. //! //! A partial list of well-maintained formats is given on the [Serde //! website][data formats]. @@ -102,17 +102,17 @@ //! - SocketAddrV4 //! - SocketAddrV6 //! -//! [Implementing `Serialize`]: https://serde.rs/impl-serialize.html +//! [Implementing `Serialize`]: https://serde2.rs/impl-serialize.html //! [`LinkedHashMap`]: https://docs.rs/linked-hash-map/*/linked_hash_map/struct.LinkedHashMap.html //! [`Serialize`]: ../trait.Serialize.html //! [`Serializer`]: ../trait.Serializer.html //! [`bincode`]: https://github.com/TyOverby/bincode //! [`linked-hash-map`]: https://crates.io/crates/linked-hash-map -//! [`serde_derive`]: https://crates.io/crates/serde_derive -//! [`serde_json`]: https://github.com/serde-rs/json -//! [`serde_yaml`]: https://github.com/dtolnay/serde-yaml -//! [derive section of the manual]: https://serde.rs/derive.html -//! [data formats]: https://serde.rs/#data-formats +//! [`serde2_derive`]: https://crates.io/crates/serde2_derive +//! [`serde2_json`]: https://github.com/serde2-rs/json +//! [`serde2_yaml`]: https://github.com/dtolnay/serde2-yaml +//! [derive section of the manual]: https://serde2.rs/derive.html +//! [data formats]: https://serde2.rs/#data-formats use lib::*; @@ -134,7 +134,7 @@ macro_rules! declare_error_trait { /// The [example data format] presented on the website shows an error /// type appropriate for a basic JSON data format. /// - /// [example data format]: https://serde.rs/data-format.html + /// [example data format]: https://serde2.rs/data-format.html pub trait Error: Sized $(+ $($supertrait)::+)* { /// Used when a [`Serialize`] implementation encounters any error /// while serializing a type. @@ -154,7 +154,7 @@ macro_rules! declare_error_trait { /// # } /// # } /// # - /// use serde::ser::{self, Serialize, Serializer}; + /// use serde2::ser::{self, Serialize, Serializer}; /// /// impl Serialize for Path { /// fn serialize(&self, serializer: S) -> Result @@ -193,7 +193,7 @@ declare_error_trait!(Error: Sized + Debug + Display); /// standard library types. The complete list is [here][ser]. All of these can /// be serialized using Serde out of the box. /// -/// Additionally, Serde provides a procedural macro called [`serde_derive`] to +/// Additionally, Serde provides a procedural macro called [`serde2_derive`] to /// automatically generate `Serialize` implementations for structs and enums in /// your program. See the [derive section of the manual] for how to use this. /// @@ -206,12 +206,12 @@ declare_error_trait!(Error: Sized + Debug + Display); /// [`LinkedHashMap`] type that is serializable by Serde because the crate /// provides an implementation of `Serialize` for it. /// -/// [Implementing `Serialize`]: https://serde.rs/impl-serialize.html +/// [Implementing `Serialize`]: https://serde2.rs/impl-serialize.html /// [`LinkedHashMap`]: https://docs.rs/linked-hash-map/*/linked_hash_map/struct.LinkedHashMap.html /// [`linked-hash-map`]: https://crates.io/crates/linked-hash-map -/// [`serde_derive`]: https://crates.io/crates/serde_derive -/// [derive section of the manual]: https://serde.rs/derive.html -/// [ser]: https://docs.serde.rs/serde/ser/index.html +/// [`serde2_derive`]: https://crates.io/crates/serde2_derive +/// [derive section of the manual]: https://serde2.rs/derive.html +/// [ser]: https://docs.serde2.rs/serde2/ser/index.html pub trait Serialize { /// Serialize this value into the given Serde serializer. /// @@ -219,7 +219,7 @@ pub trait Serialize { /// information about how to implement this method. /// /// ```rust - /// use serde::ser::{Serialize, SerializeStruct, Serializer}; + /// use serde2::ser::{Serialize, SerializeStruct, Serializer}; /// /// struct Person { /// name: String, @@ -242,7 +242,7 @@ pub trait Serialize { /// } /// ``` /// - /// [Implementing `Serialize`]: https://serde.rs/impl-serialize.html + /// [Implementing `Serialize`]: https://serde2.rs/impl-serialize.html fn serialize(&self, serializer: S) -> Result where S: Serializer; @@ -315,18 +315,18 @@ pub trait Serialize { /// Many Serde serializers produce text or binary data as output, for example /// JSON or Bincode. This is not a requirement of the `Serializer` trait, and /// there are serializers that do not produce text or binary output. One example -/// is the `serde_json::value::Serializer` (distinct from the main `serde_json` -/// serializer) that produces a `serde_json::Value` data structure in memory as +/// is the `serde2_json::value::Serializer` (distinct from the main `serde2_json` +/// serializer) that produces a `serde2_json::Value` data structure in memory as /// output. /// -/// [Serde data model]: https://serde.rs/data-model.html +/// [Serde data model]: https://serde2.rs/data-model.html /// /// # Example implementation /// /// The [example data format] presented on the website contains example code for /// a basic JSON `Serializer`. /// -/// [example data format]: https://serde.rs/data-format.html +/// [example data format]: https://serde2.rs/data-format.html pub trait Serializer: Sized { /// The output type produced by this `Serializer` during successful /// serialization. Most serializers that produce text or binary output @@ -387,9 +387,9 @@ pub trait Serializer: Sized { /// /// ```rust /// # #[macro_use] - /// # extern crate serde; + /// # extern crate serde2; /// # - /// # use serde::Serializer; + /// # use serde2::Serializer; /// # /// # __private_serialize!(); /// # @@ -414,9 +414,9 @@ pub trait Serializer: Sized { /// /// ```rust /// # #[macro_use] - /// # extern crate serde; + /// # extern crate serde2; /// # - /// # use serde::Serializer; + /// # use serde2::Serializer; /// # /// # __private_serialize!(); /// # @@ -441,9 +441,9 @@ pub trait Serializer: Sized { /// /// ```rust /// # #[macro_use] - /// # extern crate serde; + /// # extern crate serde2; /// # - /// # use serde::Serializer; + /// # use serde2::Serializer; /// # /// # __private_serialize!(); /// # @@ -468,9 +468,9 @@ pub trait Serializer: Sized { /// /// ```rust /// # #[macro_use] - /// # extern crate serde; + /// # extern crate serde2; /// # - /// # use serde::Serializer; + /// # use serde2::Serializer; /// # /// # __private_serialize!(); /// # @@ -491,9 +491,9 @@ pub trait Serializer: Sized { /// /// ```rust /// # #[macro_use] - /// # extern crate serde; + /// # extern crate serde2; /// # - /// # use serde::Serializer; + /// # use serde2::Serializer; /// # /// # __private_serialize!(); /// # @@ -510,14 +510,14 @@ pub trait Serializer: Sized { /// ``` fn serialize_i64(self, v: i64) -> Result; - serde_if_integer128! { + serde2_if_integer128! { /// Serialize an `i128` value. /// /// ```rust /// # #[macro_use] - /// # extern crate serde; + /// # extern crate serde2; /// # - /// # use serde::Serializer; + /// # use serde2::Serializer; /// # /// # __private_serialize!(); /// # @@ -549,9 +549,9 @@ pub trait Serializer: Sized { /// /// ```rust /// # #[macro_use] - /// # extern crate serde; + /// # extern crate serde2; /// # - /// # use serde::Serializer; + /// # use serde2::Serializer; /// # /// # __private_serialize!(); /// # @@ -576,9 +576,9 @@ pub trait Serializer: Sized { /// /// ```rust /// # #[macro_use] - /// # extern crate serde; + /// # extern crate serde2; /// # - /// # use serde::Serializer; + /// # use serde2::Serializer; /// # /// # __private_serialize!(); /// # @@ -603,9 +603,9 @@ pub trait Serializer: Sized { /// /// ```rust /// # #[macro_use] - /// # extern crate serde; + /// # extern crate serde2; /// # - /// # use serde::Serializer; + /// # use serde2::Serializer; /// # /// # __private_serialize!(); /// # @@ -626,9 +626,9 @@ pub trait Serializer: Sized { /// /// ```rust /// # #[macro_use] - /// # extern crate serde; + /// # extern crate serde2; /// # - /// # use serde::Serializer; + /// # use serde2::Serializer; /// # /// # __private_serialize!(); /// # @@ -645,14 +645,14 @@ pub trait Serializer: Sized { /// ``` fn serialize_u64(self, v: u64) -> Result; - serde_if_integer128! { + serde2_if_integer128! { /// Serialize a `u128` value. /// /// ```rust /// # #[macro_use] - /// # extern crate serde; + /// # extern crate serde2; /// # - /// # use serde::Serializer; + /// # use serde2::Serializer; /// # /// # __private_serialize!(); /// # @@ -684,9 +684,9 @@ pub trait Serializer: Sized { /// /// ```rust /// # #[macro_use] - /// # extern crate serde; + /// # extern crate serde2; /// # - /// # use serde::Serializer; + /// # use serde2::Serializer; /// # /// # __private_serialize!(); /// # @@ -707,9 +707,9 @@ pub trait Serializer: Sized { /// /// ```rust /// # #[macro_use] - /// # extern crate serde; + /// # extern crate serde2; /// # - /// # use serde::Serializer; + /// # use serde2::Serializer; /// # /// # __private_serialize!(); /// # @@ -733,9 +733,9 @@ pub trait Serializer: Sized { /// /// ```rust /// # #[macro_use] - /// # extern crate serde; + /// # extern crate serde2; /// # - /// # use serde::Serializer; + /// # use serde2::Serializer; /// # /// # __private_serialize!(); /// # @@ -756,9 +756,9 @@ pub trait Serializer: Sized { /// /// ```rust /// # #[macro_use] - /// # extern crate serde; + /// # extern crate serde2; /// # - /// # use serde::Serializer; + /// # use serde2::Serializer; /// # /// # __private_serialize!(); /// # @@ -785,10 +785,10 @@ pub trait Serializer: Sized { /// /// ```rust /// # #[macro_use] - /// # extern crate serde; + /// # extern crate serde2; /// # - /// # use serde::ser::{Serializer, SerializeSeq}; - /// # use serde::private::ser::Error; + /// # use serde2::ser::{Serializer, SerializeSeq}; + /// # use serde2::private::ser::Error; /// # /// # struct MySerializer; /// # @@ -818,9 +818,9 @@ pub trait Serializer: Sized { /// Serialize a [`None`] value. /// /// ```rust - /// # extern crate serde; + /// # extern crate serde2; /// # - /// # use serde::{Serialize, Serializer}; + /// # use serde2::{Serialize, Serializer}; /// # /// # enum Option { /// # Some(T), @@ -853,9 +853,9 @@ pub trait Serializer: Sized { /// Serialize a [`Some(T)`] value. /// /// ```rust - /// # extern crate serde; + /// # extern crate serde2; /// # - /// # use serde::{Serialize, Serializer}; + /// # use serde2::{Serialize, Serializer}; /// # /// # enum Option { /// # Some(T), @@ -891,9 +891,9 @@ pub trait Serializer: Sized { /// /// ```rust /// # #[macro_use] - /// # extern crate serde; + /// # extern crate serde2; /// # - /// # use serde::Serializer; + /// # use serde2::Serializer; /// # /// # __private_serialize!(); /// # @@ -915,7 +915,7 @@ pub trait Serializer: Sized { /// A reasonable implementation would be to forward to `serialize_unit`. /// /// ```rust - /// use serde::{Serialize, Serializer}; + /// use serde2::{Serialize, Serializer}; /// /// struct Nothing; /// @@ -937,7 +937,7 @@ pub trait Serializer: Sized { /// variant. /// /// ```rust - /// use serde::{Serialize, Serializer}; + /// use serde2::{Serialize, Serializer}; /// /// enum E { /// A, @@ -970,7 +970,7 @@ pub trait Serializer: Sized { /// be to forward to `value.serialize(self)`. /// /// ```rust - /// use serde::{Serialize, Serializer}; + /// use serde2::{Serialize, Serializer}; /// /// struct Millimeters(u8); /// @@ -998,7 +998,7 @@ pub trait Serializer: Sized { /// variant. The `value` is the data contained within this newtype variant. /// /// ```rust - /// use serde::{Serialize, Serializer}; + /// use serde2::{Serialize, Serializer}; /// /// enum E { /// M(String), @@ -1055,7 +1055,7 @@ pub trait Serializer: Sized { /// # } /// # } /// # - /// use serde::ser::{Serialize, Serializer, SerializeSeq}; + /// use serde2::ser::{Serialize, Serializer, SerializeSeq}; /// /// impl Serialize for Vec /// where @@ -1081,7 +1081,7 @@ pub trait Serializer: Sized { /// then a call to `end`. /// /// ```rust - /// use serde::ser::{Serialize, Serializer, SerializeTuple}; + /// use serde2::ser::{Serialize, Serializer, SerializeTuple}; /// /// # mod fool { /// # trait Serialize {} @@ -1111,7 +1111,7 @@ pub trait Serializer: Sized { /// ``` /// /// ```rust - /// use serde::ser::{Serialize, SerializeTuple, Serializer}; + /// use serde2::ser::{Serialize, SerializeTuple, Serializer}; /// /// const VRAM_SIZE: usize = 386; /// struct Vram([u16; VRAM_SIZE]); @@ -1139,7 +1139,7 @@ pub trait Serializer: Sized { /// of data fields that will be serialized. /// /// ```rust - /// use serde::ser::{Serialize, SerializeTupleStruct, Serializer}; + /// use serde2::ser::{Serialize, SerializeTupleStruct, Serializer}; /// /// struct Rgb(u8, u8, u8); /// @@ -1171,7 +1171,7 @@ pub trait Serializer: Sized { /// and the `len` is the number of data fields that will be serialized. /// /// ```rust - /// use serde::ser::{Serialize, SerializeTupleVariant, Serializer}; + /// use serde2::ser::{Serialize, SerializeTupleVariant, Serializer}; /// /// enum E { /// T(u8, u8), @@ -1236,7 +1236,7 @@ pub trait Serializer: Sized { /// # } /// # } /// # - /// use serde::ser::{Serialize, Serializer, SerializeMap}; + /// use serde2::ser::{Serialize, Serializer, SerializeMap}; /// /// impl Serialize for HashMap /// where @@ -1265,7 +1265,7 @@ pub trait Serializer: Sized { /// data fields that will be serialized. /// /// ```rust - /// use serde::ser::{Serialize, SerializeStruct, Serializer}; + /// use serde2::ser::{Serialize, SerializeStruct, Serializer}; /// /// struct Rgb { /// r: u8, @@ -1301,7 +1301,7 @@ pub trait Serializer: Sized { /// and the `len` is the number of data fields that will be serialized. /// /// ```rust - /// use serde::ser::{Serialize, SerializeStructVariant, Serializer}; + /// use serde2::ser::{Serialize, SerializeStructVariant, Serializer}; /// /// enum E { /// S { r: u8, g: u8, b: u8 }, @@ -1343,7 +1343,7 @@ pub trait Serializer: Sized { /// method. /// /// ```rust - /// use serde::{Serialize, Serializer}; + /// use serde2::{Serialize, Serializer}; /// /// struct SecretlyOneHigher { /// data: Vec, @@ -1380,7 +1380,7 @@ pub trait Serializer: Sized { /// method. /// /// ```rust - /// use serde::{Serialize, Serializer}; + /// use serde2::{Serialize, Serializer}; /// use std::collections::BTreeSet; /// /// struct MapToUnit { @@ -1427,7 +1427,7 @@ pub trait Serializer: Sized { /// # fn offset(&self) -> () { () } /// # } /// # - /// use serde::{Serialize, Serializer}; + /// use serde2::{Serialize, Serializer}; /// /// impl Serialize for DateTime { /// fn serialize(&self, serializer: S) -> Result @@ -1468,7 +1468,7 @@ pub trait Serializer: Sized { /// # fn offset(&self) -> () { () } /// # } /// # - /// use serde::{Serialize, Serializer}; + /// use serde2::{Serialize, Serializer}; /// /// impl Serialize for DateTime { /// fn serialize(&self, serializer: S) -> Result @@ -1510,7 +1510,7 @@ pub trait Serializer: Sized { /// # } /// # } /// # - /// use serde::{Serialize, Serializer}; + /// use serde2::{Serialize, Serializer}; /// /// impl Serialize for Timestamp { /// fn serialize(&self, serializer: S) -> Result @@ -1563,7 +1563,7 @@ pub trait Serializer: Sized { /// # } /// # } /// # -/// use serde::ser::{Serialize, Serializer, SerializeSeq}; +/// use serde2::ser::{Serialize, Serializer, SerializeSeq}; /// /// impl Serialize for Vec /// where @@ -1587,7 +1587,7 @@ pub trait Serializer: Sized { /// The [example data format] presented on the website demonstrates an /// implementation of `SerializeSeq` for a basic JSON data format. /// -/// [example data format]: https://serde.rs/data-format.html +/// [example data format]: https://serde2.rs/data-format.html pub trait SerializeSeq { /// Must match the `Ok` type of our `Serializer`. type Ok; @@ -1609,7 +1609,7 @@ pub trait SerializeSeq { /// # Example use /// /// ```rust -/// use serde::ser::{Serialize, Serializer, SerializeTuple}; +/// use serde2::ser::{Serialize, Serializer, SerializeTuple}; /// /// # mod fool { /// # trait Serialize {} @@ -1657,7 +1657,7 @@ pub trait SerializeSeq { /// # } /// # } /// # -/// use serde::ser::{Serialize, Serializer, SerializeTuple}; +/// use serde2::ser::{Serialize, Serializer, SerializeTuple}; /// /// # mod fool { /// # trait Serialize {} @@ -1687,7 +1687,7 @@ pub trait SerializeSeq { /// The [example data format] presented on the website demonstrates an /// implementation of `SerializeTuple` for a basic JSON data format. /// -/// [example data format]: https://serde.rs/data-format.html +/// [example data format]: https://serde2.rs/data-format.html pub trait SerializeTuple { /// Must match the `Ok` type of our `Serializer`. type Ok; @@ -1709,7 +1709,7 @@ pub trait SerializeTuple { /// # Example use /// /// ```rust -/// use serde::ser::{Serialize, SerializeTupleStruct, Serializer}; +/// use serde2::ser::{Serialize, SerializeTupleStruct, Serializer}; /// /// struct Rgb(u8, u8, u8); /// @@ -1732,7 +1732,7 @@ pub trait SerializeTuple { /// The [example data format] presented on the website demonstrates an /// implementation of `SerializeTupleStruct` for a basic JSON data format. /// -/// [example data format]: https://serde.rs/data-format.html +/// [example data format]: https://serde2.rs/data-format.html pub trait SerializeTupleStruct { /// Must match the `Ok` type of our `Serializer`. type Ok; @@ -1754,7 +1754,7 @@ pub trait SerializeTupleStruct { /// # Example use /// /// ```rust -/// use serde::ser::{Serialize, SerializeTupleVariant, Serializer}; +/// use serde2::ser::{Serialize, SerializeTupleVariant, Serializer}; /// /// enum E { /// T(u8, u8), @@ -1790,7 +1790,7 @@ pub trait SerializeTupleStruct { /// The [example data format] presented on the website demonstrates an /// implementation of `SerializeTupleVariant` for a basic JSON data format. /// -/// [example data format]: https://serde.rs/data-format.html +/// [example data format]: https://serde2.rs/data-format.html pub trait SerializeTupleVariant { /// Must match the `Ok` type of our `Serializer`. type Ok; @@ -1831,7 +1831,7 @@ pub trait SerializeTupleVariant { /// # } /// # } /// # -/// use serde::ser::{Serialize, Serializer, SerializeMap}; +/// use serde2::ser::{Serialize, Serializer, SerializeMap}; /// /// impl Serialize for HashMap /// where @@ -1856,7 +1856,7 @@ pub trait SerializeTupleVariant { /// The [example data format] presented on the website demonstrates an /// implementation of `SerializeMap` for a basic JSON data format. /// -/// [example data format]: https://serde.rs/data-format.html +/// [example data format]: https://serde2.rs/data-format.html pub trait SerializeMap { /// Must match the `Ok` type of our `Serializer`. type Ok; @@ -1923,7 +1923,7 @@ pub trait SerializeMap { /// # Example use /// /// ```rust -/// use serde::ser::{Serialize, SerializeStruct, Serializer}; +/// use serde2::ser::{Serialize, SerializeStruct, Serializer}; /// /// struct Rgb { /// r: u8, @@ -1950,7 +1950,7 @@ pub trait SerializeMap { /// The [example data format] presented on the website demonstrates an /// implementation of `SerializeStruct` for a basic JSON data format. /// -/// [example data format]: https://serde.rs/data-format.html +/// [example data format]: https://serde2.rs/data-format.html pub trait SerializeStruct { /// Must match the `Ok` type of our `Serializer`. type Ok; @@ -1983,7 +1983,7 @@ pub trait SerializeStruct { /// # Example use /// /// ```rust -/// use serde::ser::{Serialize, SerializeStructVariant, Serializer}; +/// use serde2::ser::{Serialize, SerializeStructVariant, Serializer}; /// /// enum E { /// S { r: u8, g: u8, b: u8 }, @@ -2016,7 +2016,7 @@ pub trait SerializeStruct { /// The [example data format] presented on the website demonstrates an /// implementation of `SerializeStructVariant` for a basic JSON data format. /// -/// [example data format]: https://serde.rs/data-format.html +/// [example data format]: https://serde2.rs/data-format.html pub trait SerializeStructVariant { /// Must match the `Ok` type of our `Serializer`. type Ok; diff --git a/serde_derive/Cargo.toml b/serde_derive/Cargo.toml index 948ecff48..c8dafd78e 100644 --- a/serde_derive/Cargo.toml +++ b/serde_derive/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "serde_derive" +name = "serde2_derive" version = "1.0.80" # remember to update html_root_url authors = ["Erick Tryzelaar ", "David Tolnay "] license = "MIT/Apache-2.0" @@ -20,7 +20,7 @@ default = [] deserialize_in_place = [] [lib] -name = "serde_derive" +name = "serde2_derive" proc-macro = true [dependencies] @@ -29,4 +29,4 @@ quote = "0.6.3" syn = { version = "0.15", features = ["visit"] } [dev-dependencies] -serde = { version = "1.0", path = "../serde" } +serde2 = { version = "1.0", path = "../serde" } diff --git a/serde_derive/src/de.rs b/serde_derive/src/de.rs index de15af87b..ed028df14 100644 --- a/serde_derive/src/de.rs +++ b/serde_derive/src/de.rs @@ -77,7 +77,7 @@ pub fn expand_derive_deserialize(input: &syn::DeriveInput) -> Result Result", "David Tolnay "] license = "MIT/Apache-2.0" @@ -12,11 +12,11 @@ readme = "crates-io.md" include = ["Cargo.toml", "src/**/*.rs", "crates-io.md", "README.md", "LICENSE-APACHE", "LICENSE-MIT"] [dependencies] -serde = { version = "1.0.60", path = "../serde" } +serde2 = { version = "1.0.60", path = "../serde" } [dev-dependencies] -serde = { version = "1.0", path = "../serde", features = ["rc"] } -serde_derive = { version = "1.0", path = "../serde_derive" } +serde2 = { version = "1.0", path = "../serde", features = ["rc"] } +serde2_derive = { version = "1.0", path = "../serde_derive" } [badges] travis-ci = { repository = "serde-rs/serde" } diff --git a/serde_test/src/assert.rs b/serde_test/src/assert.rs index fec6c9dc7..fc8919abd 100644 --- a/serde_test/src/assert.rs +++ b/serde_test/src/assert.rs @@ -18,10 +18,10 @@ use std::fmt::Debug; /// /// ```rust /// # #[macro_use] -/// # extern crate serde_derive; +/// # extern crate serde2_derive; /// # -/// # extern crate serde; -/// # extern crate serde_test; +/// # extern crate serde2; +/// # extern crate serde2_test as serde_test; /// # /// # use serde_test::{assert_tokens, Token}; /// # @@ -55,10 +55,10 @@ where /// /// ```rust /// # #[macro_use] -/// # extern crate serde_derive; +/// # extern crate serde2_derive; /// # -/// # extern crate serde; -/// # extern crate serde_test; +/// # extern crate serde2; +/// # extern crate serde2_test as serde_test; /// # /// # use serde_test::{assert_ser_tokens, Token}; /// # @@ -100,9 +100,9 @@ where /// /// ```rust /// # #[macro_use] -/// # extern crate serde_derive; +/// # extern crate serde2_derive; /// # -/// # extern crate serde_test; +/// # extern crate serde2_test as serde_test; /// # /// # fn main() { /// use std::sync::{Arc, Mutex}; @@ -155,10 +155,10 @@ where /// /// ```rust /// # #[macro_use] -/// # extern crate serde_derive; +/// # extern crate serde2_derive; /// # -/// # extern crate serde; -/// # extern crate serde_test; +/// # extern crate serde2; +/// # extern crate serde2_test as serde_test; /// # /// # use serde_test::{assert_de_tokens, Token}; /// # @@ -215,10 +215,10 @@ where /// /// ```rust /// # #[macro_use] -/// # extern crate serde_derive; +/// # extern crate serde2_derive; /// # -/// # extern crate serde; -/// # extern crate serde_test; +/// # extern crate serde2; +/// # extern crate serde2_test as serde_test; /// # /// # use serde_test::{assert_de_tokens_error, Token}; /// # diff --git a/serde_test/src/configure.rs b/serde_test/src/configure.rs index 2f978f2a5..cb31cb343 100644 --- a/serde_test/src/configure.rs +++ b/serde_test/src/configure.rs @@ -15,8 +15,8 @@ pub struct Compact(T); /// compact form. /// /// ``` -/// extern crate serde; -/// extern crate serde_test; +/// extern crate serde2 as serde; +/// extern crate serde2_test as serde_test; /// /// use serde::{Deserialize, Deserializer, Serialize, Serializer}; /// use serde_test::{assert_tokens, Configure, Token}; diff --git a/serde_test/src/de.rs b/serde_test/src/de.rs index e317f654c..076bbe1be 100644 --- a/serde_test/src/de.rs +++ b/serde_test/src/de.rs @@ -378,7 +378,7 @@ impl<'de, 'a> de::Deserializer<'de> for &'a mut Deserializer<'de> { fn is_human_readable(&self) -> bool { panic!( "Types which have different human-readable and compact representations \ - must explicitly mark their test cases with `serde_test::Configure`" + must explicitly mark their test cases with `serde2_test::Configure`" ); } } diff --git a/serde_test/src/lib.rs b/serde_test/src/lib.rs index 8986101a8..1b1ed2cfe 100644 --- a/serde_test/src/lib.rs +++ b/serde_test/src/lib.rs @@ -14,7 +14,7 @@ //! //! The `Serialize` impl for a value can be characterized by the sequence of //! [`Serializer`] calls that are made in the course of serializing the value, -//! so `serde_test` provides a [`Token`] abstraction which corresponds roughly +//! so `serde2_test` provides a [`Token`] abstraction which corresponds roughly //! to `Serializer` method calls. There is an [`assert_ser_tokens`] function to //! test that a value serializes to a particular sequence of method calls, an //! [`assert_de_tokens`] function to test that a value can be deserialized from @@ -23,17 +23,17 @@ //! conditions. //! //! [`Serializer`]: https://docs.serde.rs/serde/ser/trait.Serializer.html -//! [`Token`]: https://docs.serde.rs/serde_test/enum.Token.html -//! [`assert_ser_tokens`]: https://docs.serde.rs/serde_test/fn.assert_ser_tokens.html -//! [`assert_de_tokens`]: https://docs.serde.rs/serde_test/fn.assert_de_tokens.html -//! [`assert_tokens`]: https://docs.serde.rs/serde_test/fn.assert_tokens.html +//! [`Token`]: https://docs.serde.rs/serde2_test/enum.Token.html +//! [`assert_ser_tokens`]: https://docs.serde.rs/serde2_test/fn.assert_ser_tokens.html +//! [`assert_de_tokens`]: https://docs.serde.rs/serde2_test/fn.assert_de_tokens.html +//! [`assert_tokens`]: https://docs.serde.rs/serde2_test/fn.assert_tokens.html //! //! Here is an example from the [`linked-hash-map`] crate. //! //! [`linked-hash-map`]: https://github.com/contain-rs/linked-hash-map //! //! ```rust -//! # extern crate serde; +//! # extern crate serde2 as serde; //! # //! # macro_rules! ignore { //! # ($($tt:tt)+) => {} @@ -44,7 +44,7 @@ //! use linked_hash_map::LinkedHashMap; //! # } //! -//! extern crate serde_test; +//! extern crate serde2_test as serde_test; //! use serde_test::{Token, assert_tokens}; //! //! # use std::fmt; @@ -161,7 +161,7 @@ //! # } //! ``` -#![doc(html_root_url = "https://docs.rs/serde_test/1.0.80")] +#![doc(html_root_url = "https://docs.rs/serde2_test/1.0.80")] #![cfg_attr(feature = "cargo-clippy", allow(renamed_and_removed_lints))] #![cfg_attr(feature = "cargo-clippy", deny(clippy, clippy_pedantic))] // Whitelisted clippy lints @@ -180,7 +180,7 @@ )] #[macro_use] -extern crate serde; +extern crate serde2 as serde; mod de; mod error; diff --git a/serde_test/src/ser.rs b/serde_test/src/ser.rs index a0159c2cf..1b734dfb0 100644 --- a/serde_test/src/ser.rs +++ b/serde_test/src/ser.rs @@ -317,7 +317,7 @@ impl<'s, 'a> ser::Serializer for &'s mut Serializer<'a> { fn is_human_readable(&self) -> bool { panic!( "Types which have different human-readable and compact representations \ - must explicitly mark their test cases with `serde_test::Configure`" + must explicitly mark their test cases with `serde2_test::Configure`" ); } } diff --git a/serde_test/src/token.rs b/serde_test/src/token.rs index 976bbe36f..dfb0d5e32 100644 --- a/serde_test/src/token.rs +++ b/serde_test/src/token.rs @@ -13,7 +13,7 @@ pub enum Token { /// A serialized `bool`. /// /// ```rust - /// # use serde_test::{assert_tokens, Token}; + /// # use serde2_test::{assert_tokens, Token}; /// # /// assert_tokens(&true, &[Token::Bool(true)]); /// ``` @@ -22,7 +22,7 @@ pub enum Token { /// A serialized `i8`. /// /// ```rust - /// # use serde_test::{assert_tokens, Token}; + /// # use serde2_test::{assert_tokens, Token}; /// # /// assert_tokens(&0i8, &[Token::I8(0)]); /// ``` @@ -31,7 +31,7 @@ pub enum Token { /// A serialized `i16`. /// /// ```rust - /// # use serde_test::{assert_tokens, Token}; + /// # use serde2_test::{assert_tokens, Token}; /// # /// assert_tokens(&0i16, &[Token::I16(0)]); /// ``` @@ -40,7 +40,7 @@ pub enum Token { /// A serialized `i32`. /// /// ```rust - /// # use serde_test::{assert_tokens, Token}; + /// # use serde2_test::{assert_tokens, Token}; /// # /// assert_tokens(&0i32, &[Token::I32(0)]); /// ``` @@ -49,7 +49,7 @@ pub enum Token { /// A serialized `i64`. /// /// ```rust - /// # use serde_test::{assert_tokens, Token}; + /// # use serde2_test::{assert_tokens, Token}; /// # /// assert_tokens(&0i64, &[Token::I64(0)]); /// ``` @@ -58,7 +58,7 @@ pub enum Token { /// A serialized `u8`. /// /// ```rust - /// # use serde_test::{assert_tokens, Token}; + /// # use serde2_test::{assert_tokens, Token}; /// # /// assert_tokens(&0u8, &[Token::U8(0)]); /// ``` @@ -67,7 +67,7 @@ pub enum Token { /// A serialized `u16`. /// /// ```rust - /// # use serde_test::{assert_tokens, Token}; + /// # use serde2_test::{assert_tokens, Token}; /// # /// assert_tokens(&0u16, &[Token::U16(0)]); /// ``` @@ -76,7 +76,7 @@ pub enum Token { /// A serialized `u32`. /// /// ```rust - /// # use serde_test::{assert_tokens, Token}; + /// # use serde2_test::{assert_tokens, Token}; /// # /// assert_tokens(&0u32, &[Token::U32(0)]); /// ``` @@ -85,7 +85,7 @@ pub enum Token { /// A serialized `u64`. /// /// ```rust - /// # use serde_test::{assert_tokens, Token}; + /// # use serde2_test::{assert_tokens, Token}; /// # /// assert_tokens(&0u64, &[Token::U64(0)]); /// ``` @@ -94,7 +94,7 @@ pub enum Token { /// A serialized `f32`. /// /// ```rust - /// # use serde_test::{assert_tokens, Token}; + /// # use serde2_test::{assert_tokens, Token}; /// # /// assert_tokens(&0f32, &[Token::F32(0.0)]); /// ``` @@ -103,7 +103,7 @@ pub enum Token { /// A serialized `f64`. /// /// ```rust - /// # use serde_test::{assert_tokens, Token}; + /// # use serde2_test::{assert_tokens, Token}; /// # /// assert_tokens(&0f64, &[Token::F64(0.0)]); /// ``` @@ -112,7 +112,7 @@ pub enum Token { /// A serialized `char`. /// /// ```rust - /// # use serde_test::{assert_tokens, Token}; + /// # use serde2_test::{assert_tokens, Token}; /// # /// assert_tokens(&'\n', &[Token::Char('\n')]); /// ``` @@ -121,7 +121,7 @@ pub enum Token { /// A serialized `str`. /// /// ```rust - /// # use serde_test::{assert_tokens, Token}; + /// # use serde2_test::{assert_tokens, Token}; /// # /// let s = String::from("transient"); /// assert_tokens(&s, &[Token::Str("transient")]); @@ -131,7 +131,7 @@ pub enum Token { /// A borrowed `str`. /// /// ```rust - /// # use serde_test::{assert_tokens, Token}; + /// # use serde2_test::{assert_tokens, Token}; /// # /// let s: &str = "borrowed"; /// assert_tokens(&s, &[Token::BorrowedStr("borrowed")]); @@ -141,7 +141,7 @@ pub enum Token { /// A serialized `String`. /// /// ```rust - /// # use serde_test::{assert_tokens, Token}; + /// # use serde2_test::{assert_tokens, Token}; /// # /// let s = String::from("owned"); /// assert_tokens(&s, &[Token::String("owned")]); @@ -160,7 +160,7 @@ pub enum Token { /// A serialized `Option` containing none. /// /// ```rust - /// # use serde_test::{assert_tokens, Token}; + /// # use serde2_test::{assert_tokens, Token}; /// # /// let opt = None::; /// assert_tokens(&opt, &[Token::None]); @@ -172,7 +172,7 @@ pub enum Token { /// The tokens of the value follow after this header. /// /// ```rust - /// # use serde_test::{assert_tokens, Token}; + /// # use serde2_test::{assert_tokens, Token}; /// # /// let opt = Some('c'); /// assert_tokens(&opt, &[ @@ -185,7 +185,7 @@ pub enum Token { /// A serialized `()`. /// /// ```rust - /// # use serde_test::{assert_tokens, Token}; + /// # use serde2_test::{assert_tokens, Token}; /// # /// assert_tokens(&(), &[Token::Unit]); /// ``` @@ -195,12 +195,12 @@ pub enum Token { /// /// ```rust /// # #[macro_use] - /// # extern crate serde_derive; + /// # extern crate serde2_derive; /// # - /// # extern crate serde; - /// # extern crate serde_test; + /// # extern crate serde2; + /// # extern crate serde2_test; /// # - /// # use serde_test::{assert_tokens, Token}; + /// # use serde2_test::{assert_tokens, Token}; /// # /// # fn main() { /// #[derive(Serialize, Deserialize, PartialEq, Debug)] @@ -215,12 +215,12 @@ pub enum Token { /// /// ```rust /// # #[macro_use] - /// # extern crate serde_derive; + /// # extern crate serde2_derive; /// # - /// # extern crate serde; - /// # extern crate serde_test; + /// # extern crate serde2; + /// # extern crate serde2_test; /// # - /// # use serde_test::{assert_tokens, Token}; + /// # use serde2_test::{assert_tokens, Token}; /// # /// # fn main() { /// #[derive(Serialize, Deserialize, PartialEq, Debug)] @@ -243,12 +243,12 @@ pub enum Token { /// /// ```rust /// # #[macro_use] - /// # extern crate serde_derive; + /// # extern crate serde2_derive; /// # - /// # extern crate serde; - /// # extern crate serde_test; + /// # extern crate serde2; + /// # extern crate serde2_test; /// # - /// # use serde_test::{assert_tokens, Token}; + /// # use serde2_test::{assert_tokens, Token}; /// # /// # fn main() { /// #[derive(Serialize, Deserialize, PartialEq, Debug)] @@ -269,12 +269,12 @@ pub enum Token { /// /// ```rust /// # #[macro_use] - /// # extern crate serde_derive; + /// # extern crate serde2_derive; /// # - /// # extern crate serde; - /// # extern crate serde_test; + /// # extern crate serde2; + /// # extern crate serde2_test; /// # - /// # use serde_test::{assert_tokens, Token}; + /// # use serde2_test::{assert_tokens, Token}; /// # /// # fn main() { /// #[derive(Serialize, Deserialize, PartialEq, Debug)] @@ -300,7 +300,7 @@ pub enum Token { /// `SeqEnd`. /// /// ```rust - /// # use serde_test::{assert_tokens, Token}; + /// # use serde2_test::{assert_tokens, Token}; /// # /// let vec = vec!['a', 'b', 'c']; /// assert_tokens(&vec, &[ @@ -321,7 +321,7 @@ pub enum Token { /// After this header are the elements of the tuple, followed by `TupleEnd`. /// /// ```rust - /// # use serde_test::{assert_tokens, Token}; + /// # use serde2_test::{assert_tokens, Token}; /// # /// let tuple = ('a', 100); /// assert_tokens(&tuple, &[ @@ -343,12 +343,12 @@ pub enum Token { /// /// ```rust /// # #[macro_use] - /// # extern crate serde_derive; + /// # extern crate serde2_derive; /// # - /// # extern crate serde; - /// # extern crate serde_test; + /// # extern crate serde2; + /// # extern crate serde2_test; /// # - /// # use serde_test::{assert_tokens, Token}; + /// # use serde2_test::{assert_tokens, Token}; /// # /// # fn main() { /// #[derive(Serialize, Deserialize, PartialEq, Debug)] @@ -375,12 +375,12 @@ pub enum Token { /// /// ```rust /// # #[macro_use] - /// # extern crate serde_derive; + /// # extern crate serde2_derive; /// # - /// # extern crate serde; - /// # extern crate serde_test; + /// # extern crate serde2; + /// # extern crate serde2_test; /// # - /// # use serde_test::{assert_tokens, Token}; + /// # use serde2_test::{assert_tokens, Token}; /// # /// # fn main() { /// #[derive(Serialize, Deserialize, PartialEq, Debug)] @@ -411,7 +411,7 @@ pub enum Token { /// After this header are the entries of the map, followed by `MapEnd`. /// /// ```rust - /// # use serde_test::{assert_tokens, Token}; + /// # use serde2_test::{assert_tokens, Token}; /// # /// use std::collections::BTreeMap; /// @@ -439,12 +439,12 @@ pub enum Token { /// /// ```rust /// # #[macro_use] - /// # extern crate serde_derive; + /// # extern crate serde2_derive; /// # - /// # extern crate serde; - /// # extern crate serde_test; + /// # extern crate serde2; + /// # extern crate serde2_test; /// # - /// # use serde_test::{assert_tokens, Token}; + /// # use serde2_test::{assert_tokens, Token}; /// # /// # fn main() { /// #[derive(Serialize, Deserialize, PartialEq, Debug)] @@ -476,12 +476,12 @@ pub enum Token { /// /// ```rust /// # #[macro_use] - /// # extern crate serde_derive; + /// # extern crate serde2_derive; /// # - /// # extern crate serde; - /// # extern crate serde_test; + /// # extern crate serde2; + /// # extern crate serde2_test; /// # - /// # use serde_test::{assert_tokens, Token}; + /// # use serde2_test::{assert_tokens, Token}; /// # /// # fn main() { /// #[derive(Serialize, Deserialize, PartialEq, Debug)] @@ -511,12 +511,12 @@ pub enum Token { /// /// ```rust /// # #[macro_use] - /// # extern crate serde_derive; + /// # extern crate serde2_derive; /// # - /// # extern crate serde; - /// # extern crate serde_test; + /// # extern crate serde2; + /// # extern crate serde2_test; /// # - /// # use serde_test::{assert_tokens, Token}; + /// # use serde2_test::{assert_tokens, Token}; /// # /// # fn main() { /// #[derive(Serialize, Deserialize, PartialEq, Debug)] diff --git a/test_suite/Cargo.toml b/test_suite/Cargo.toml index 7d93fe455..362cc6d21 100644 --- a/test_suite/Cargo.toml +++ b/test_suite/Cargo.toml @@ -1,18 +1,18 @@ [package] -name = "serde_test_suite" +name = "serde2_test_suite" version = "0.0.0" authors = ["Erick Tryzelaar ", "David Tolnay "] publish = false [features] -unstable = ["serde/unstable", "compiletest_rs"] +unstable = ["serde2/unstable", "compiletest_rs"] [dev-dependencies] fnv = "1.0" rustc-serialize = "0.3.16" -serde = { path = "../serde", features = ["rc"] } -serde_derive = { path = "../serde_derive", features = ["deserialize_in_place"] } -serde_test = { path = "../serde_test" } +serde2 = { path = "../serde", features = ["rc"] } +serde2_derive = { path = "../serde_derive", features = ["deserialize_in_place"] } +serde2_test = { path = "../serde_test" } [dependencies] compiletest_rs = { version = "0.3", optional = true, features = ["stable"] } diff --git a/test_suite/deps/Cargo.toml b/test_suite/deps/Cargo.toml index fbe2f2cda..dbc200f7d 100644 --- a/test_suite/deps/Cargo.toml +++ b/test_suite/deps/Cargo.toml @@ -7,5 +7,5 @@ publish = false [workspace] [dependencies] -serde = { path = "../../serde" } -serde_derive = { path = "../../serde_derive" } +serde2 = { path = "../../serde" } +serde2_derive = { path = "../../serde_derive" } diff --git a/test_suite/no_std/Cargo.toml b/test_suite/no_std/Cargo.toml index 7c0040666..fb389b52b 100644 --- a/test_suite/no_std/Cargo.toml +++ b/test_suite/no_std/Cargo.toml @@ -5,7 +5,7 @@ publish = false [dependencies] libc = { version = "0.2", default-features = false } -serde = { path = "../../serde", default-features = false } -serde_derive = { path = "../../serde_derive" } +serde2 = { path = "../../serde", default-features = false } +serde2_derive = { path = "../../serde_derive" } [workspace] diff --git a/test_suite/tests/compile-fail/borrow/bad_lifetimes.rs b/test_suite/tests/compile-fail/borrow/bad_lifetimes.rs index 174998cde..e842a370a 100644 --- a/test_suite/tests/compile-fail/borrow/bad_lifetimes.rs +++ b/test_suite/tests/compile-fail/borrow/bad_lifetimes.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Deserialize)] struct Test<'a> { diff --git a/test_suite/tests/compile-fail/borrow/duplicate_lifetime.rs b/test_suite/tests/compile-fail/borrow/duplicate_lifetime.rs index b32160a65..1af5614a8 100644 --- a/test_suite/tests/compile-fail/borrow/duplicate_lifetime.rs +++ b/test_suite/tests/compile-fail/borrow/duplicate_lifetime.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Deserialize)] struct Test<'a> { diff --git a/test_suite/tests/compile-fail/borrow/duplicate_variant.rs b/test_suite/tests/compile-fail/borrow/duplicate_variant.rs index 93f300b45..21aaefb5b 100644 --- a/test_suite/tests/compile-fail/borrow/duplicate_variant.rs +++ b/test_suite/tests/compile-fail/borrow/duplicate_variant.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Deserialize)] struct Str<'a>(&'a str); diff --git a/test_suite/tests/compile-fail/borrow/empty_lifetimes.rs b/test_suite/tests/compile-fail/borrow/empty_lifetimes.rs index a19028da2..ccf7291b9 100644 --- a/test_suite/tests/compile-fail/borrow/empty_lifetimes.rs +++ b/test_suite/tests/compile-fail/borrow/empty_lifetimes.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Deserialize)] struct Test<'a> { diff --git a/test_suite/tests/compile-fail/borrow/no_lifetimes.rs b/test_suite/tests/compile-fail/borrow/no_lifetimes.rs index b883997c6..dcdf8a50e 100644 --- a/test_suite/tests/compile-fail/borrow/no_lifetimes.rs +++ b/test_suite/tests/compile-fail/borrow/no_lifetimes.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Deserialize)] struct Test { diff --git a/test_suite/tests/compile-fail/borrow/struct_variant.rs b/test_suite/tests/compile-fail/borrow/struct_variant.rs index 9264efdca..5bc7cbb50 100644 --- a/test_suite/tests/compile-fail/borrow/struct_variant.rs +++ b/test_suite/tests/compile-fail/borrow/struct_variant.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Deserialize)] struct Str<'a>(&'a str); diff --git a/test_suite/tests/compile-fail/borrow/wrong_lifetime.rs b/test_suite/tests/compile-fail/borrow/wrong_lifetime.rs index 421449537..c87e37ecb 100644 --- a/test_suite/tests/compile-fail/borrow/wrong_lifetime.rs +++ b/test_suite/tests/compile-fail/borrow/wrong_lifetime.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Deserialize)] struct Test<'a> { diff --git a/test_suite/tests/compile-fail/conflict/adjacent-tag.rs b/test_suite/tests/compile-fail/conflict/adjacent-tag.rs index e4d308c6e..7d706a091 100644 --- a/test_suite/tests/compile-fail/conflict/adjacent-tag.rs +++ b/test_suite/tests/compile-fail/conflict/adjacent-tag.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Serialize)] #[serde(tag = "conflict", content = "conflict")] diff --git a/test_suite/tests/compile-fail/conflict/flatten-newtype-struct.rs b/test_suite/tests/compile-fail/conflict/flatten-newtype-struct.rs index 46fdf6918..86c2cf523 100644 --- a/test_suite/tests/compile-fail/conflict/flatten-newtype-struct.rs +++ b/test_suite/tests/compile-fail/conflict/flatten-newtype-struct.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Serialize)] struct Foo(#[serde(flatten)] HashMap); diff --git a/test_suite/tests/compile-fail/conflict/flatten-skip-deserializing.rs b/test_suite/tests/compile-fail/conflict/flatten-skip-deserializing.rs index a9e246e2d..1e41d0de6 100644 --- a/test_suite/tests/compile-fail/conflict/flatten-skip-deserializing.rs +++ b/test_suite/tests/compile-fail/conflict/flatten-skip-deserializing.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Deserialize)] struct Foo { diff --git a/test_suite/tests/compile-fail/conflict/flatten-skip-serializing-if.rs b/test_suite/tests/compile-fail/conflict/flatten-skip-serializing-if.rs index d5dd1d36a..735187c4c 100644 --- a/test_suite/tests/compile-fail/conflict/flatten-skip-serializing-if.rs +++ b/test_suite/tests/compile-fail/conflict/flatten-skip-serializing-if.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Serialize)] struct Foo { diff --git a/test_suite/tests/compile-fail/conflict/flatten-skip-serializing.rs b/test_suite/tests/compile-fail/conflict/flatten-skip-serializing.rs index f116c777c..252f5ccd1 100644 --- a/test_suite/tests/compile-fail/conflict/flatten-skip-serializing.rs +++ b/test_suite/tests/compile-fail/conflict/flatten-skip-serializing.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Serialize)] struct Foo { diff --git a/test_suite/tests/compile-fail/conflict/flatten-tuple-struct.rs b/test_suite/tests/compile-fail/conflict/flatten-tuple-struct.rs index 392139be3..ffdbb2061 100644 --- a/test_suite/tests/compile-fail/conflict/flatten-tuple-struct.rs +++ b/test_suite/tests/compile-fail/conflict/flatten-tuple-struct.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Serialize)] struct Foo(u32, #[serde(flatten)] HashMap); diff --git a/test_suite/tests/compile-fail/conflict/internal-tag.rs b/test_suite/tests/compile-fail/conflict/internal-tag.rs index 2b95d19ac..46617c010 100644 --- a/test_suite/tests/compile-fail/conflict/internal-tag.rs +++ b/test_suite/tests/compile-fail/conflict/internal-tag.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Serialize)] #[serde(tag = "conflict")] diff --git a/test_suite/tests/compile-fail/default-attribute/enum.rs b/test_suite/tests/compile-fail/default-attribute/enum.rs index d05bbd484..e50125f83 100644 --- a/test_suite/tests/compile-fail/default-attribute/enum.rs +++ b/test_suite/tests/compile-fail/default-attribute/enum.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Deserialize)] #[serde(default)] diff --git a/test_suite/tests/compile-fail/default-attribute/nameless_struct_fields.rs b/test_suite/tests/compile-fail/default-attribute/nameless_struct_fields.rs index fbcd0f58d..7df7c4e32 100644 --- a/test_suite/tests/compile-fail/default-attribute/nameless_struct_fields.rs +++ b/test_suite/tests/compile-fail/default-attribute/nameless_struct_fields.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Deserialize)] #[serde(default)] diff --git a/test_suite/tests/compile-fail/duplicate-attribute/rename-and-ser.rs b/test_suite/tests/compile-fail/duplicate-attribute/rename-and-ser.rs index 9c4a185c3..f435851e6 100644 --- a/test_suite/tests/compile-fail/duplicate-attribute/rename-and-ser.rs +++ b/test_suite/tests/compile-fail/duplicate-attribute/rename-and-ser.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Serialize)] struct S { diff --git a/test_suite/tests/compile-fail/duplicate-attribute/rename-rename-de.rs b/test_suite/tests/compile-fail/duplicate-attribute/rename-rename-de.rs index 4cd9aa92e..a860dba20 100644 --- a/test_suite/tests/compile-fail/duplicate-attribute/rename-rename-de.rs +++ b/test_suite/tests/compile-fail/duplicate-attribute/rename-rename-de.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Serialize)] struct S { diff --git a/test_suite/tests/compile-fail/duplicate-attribute/rename-ser-rename-ser.rs b/test_suite/tests/compile-fail/duplicate-attribute/rename-ser-rename-ser.rs index c2bca9be7..0ae60604a 100644 --- a/test_suite/tests/compile-fail/duplicate-attribute/rename-ser-rename-ser.rs +++ b/test_suite/tests/compile-fail/duplicate-attribute/rename-ser-rename-ser.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Serialize)] struct S { diff --git a/test_suite/tests/compile-fail/duplicate-attribute/rename-ser-rename.rs b/test_suite/tests/compile-fail/duplicate-attribute/rename-ser-rename.rs index cce37abfd..73d24e558 100644 --- a/test_suite/tests/compile-fail/duplicate-attribute/rename-ser-rename.rs +++ b/test_suite/tests/compile-fail/duplicate-attribute/rename-ser-rename.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Serialize)] struct S { diff --git a/test_suite/tests/compile-fail/duplicate-attribute/rename-ser-ser.rs b/test_suite/tests/compile-fail/duplicate-attribute/rename-ser-ser.rs index 38d3f6b71..3f8780ed4 100644 --- a/test_suite/tests/compile-fail/duplicate-attribute/rename-ser-ser.rs +++ b/test_suite/tests/compile-fail/duplicate-attribute/rename-ser-ser.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Serialize)] struct S { diff --git a/test_suite/tests/compile-fail/duplicate-attribute/two-rename-ser.rs b/test_suite/tests/compile-fail/duplicate-attribute/two-rename-ser.rs index 63ab511f6..b9574ec5b 100644 --- a/test_suite/tests/compile-fail/duplicate-attribute/two-rename-ser.rs +++ b/test_suite/tests/compile-fail/duplicate-attribute/two-rename-ser.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Serialize)] struct S { diff --git a/test_suite/tests/compile-fail/duplicate-attribute/with-and-serialize-with.rs b/test_suite/tests/compile-fail/duplicate-attribute/with-and-serialize-with.rs index c128ef10f..33439041a 100644 --- a/test_suite/tests/compile-fail/duplicate-attribute/with-and-serialize-with.rs +++ b/test_suite/tests/compile-fail/duplicate-attribute/with-and-serialize-with.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Serialize)] struct S { diff --git a/test_suite/tests/compile-fail/enum-representation/internal-tuple-variant.rs b/test_suite/tests/compile-fail/enum-representation/internal-tuple-variant.rs index eb7786331..6db50f2dd 100644 --- a/test_suite/tests/compile-fail/enum-representation/internal-tuple-variant.rs +++ b/test_suite/tests/compile-fail/enum-representation/internal-tuple-variant.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Serialize)] #[serde(tag = "type")] diff --git a/test_suite/tests/compile-fail/enum-representation/internally-tagged-struct.rs b/test_suite/tests/compile-fail/enum-representation/internally-tagged-struct.rs index e9660e1b3..a481d09fd 100644 --- a/test_suite/tests/compile-fail/enum-representation/internally-tagged-struct.rs +++ b/test_suite/tests/compile-fail/enum-representation/internally-tagged-struct.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Serialize)] #[serde(tag = "type")] diff --git a/test_suite/tests/compile-fail/enum-representation/untagged-and-internal.rs b/test_suite/tests/compile-fail/enum-representation/untagged-and-internal.rs index b272c0b71..90b8a3c1b 100644 --- a/test_suite/tests/compile-fail/enum-representation/untagged-and-internal.rs +++ b/test_suite/tests/compile-fail/enum-representation/untagged-and-internal.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Serialize)] #[serde(untagged)] diff --git a/test_suite/tests/compile-fail/enum-representation/untagged-struct.rs b/test_suite/tests/compile-fail/enum-representation/untagged-struct.rs index 6a7dd3e2e..10ddb421d 100644 --- a/test_suite/tests/compile-fail/enum-representation/untagged-struct.rs +++ b/test_suite/tests/compile-fail/enum-representation/untagged-struct.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Serialize)] #[serde(untagged)] diff --git a/test_suite/tests/compile-fail/identifier/both.rs b/test_suite/tests/compile-fail/identifier/both.rs index c6fda3d68..0ec871f29 100644 --- a/test_suite/tests/compile-fail/identifier/both.rs +++ b/test_suite/tests/compile-fail/identifier/both.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Deserialize)] #[serde(field_identifier, variant_identifier)] diff --git a/test_suite/tests/compile-fail/identifier/field_struct.rs b/test_suite/tests/compile-fail/identifier/field_struct.rs index e6a8dc37d..cbe23b1f4 100644 --- a/test_suite/tests/compile-fail/identifier/field_struct.rs +++ b/test_suite/tests/compile-fail/identifier/field_struct.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Deserialize)] #[serde(field_identifier)] diff --git a/test_suite/tests/compile-fail/identifier/field_tuple.rs b/test_suite/tests/compile-fail/identifier/field_tuple.rs index e1dc53431..62d9c3fcf 100644 --- a/test_suite/tests/compile-fail/identifier/field_tuple.rs +++ b/test_suite/tests/compile-fail/identifier/field_tuple.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Deserialize)] #[serde(field_identifier)] diff --git a/test_suite/tests/compile-fail/identifier/newtype_not_last.rs b/test_suite/tests/compile-fail/identifier/newtype_not_last.rs index f9c1f470a..f0d567da2 100644 --- a/test_suite/tests/compile-fail/identifier/newtype_not_last.rs +++ b/test_suite/tests/compile-fail/identifier/newtype_not_last.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Deserialize)] #[serde(field_identifier)] diff --git a/test_suite/tests/compile-fail/identifier/not_unit.rs b/test_suite/tests/compile-fail/identifier/not_unit.rs index a80d8bf26..d425381c8 100644 --- a/test_suite/tests/compile-fail/identifier/not_unit.rs +++ b/test_suite/tests/compile-fail/identifier/not_unit.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Deserialize)] #[serde(field_identifier)] diff --git a/test_suite/tests/compile-fail/identifier/other_not_last.rs b/test_suite/tests/compile-fail/identifier/other_not_last.rs index b8c814322..e2f4185c6 100644 --- a/test_suite/tests/compile-fail/identifier/other_not_last.rs +++ b/test_suite/tests/compile-fail/identifier/other_not_last.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Deserialize)] #[serde(field_identifier)] diff --git a/test_suite/tests/compile-fail/identifier/serialize.rs b/test_suite/tests/compile-fail/identifier/serialize.rs index 111f88750..28645c981 100644 --- a/test_suite/tests/compile-fail/identifier/serialize.rs +++ b/test_suite/tests/compile-fail/identifier/serialize.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Serialize)] #[serde(field_identifier)] diff --git a/test_suite/tests/compile-fail/identifier/variant_struct.rs b/test_suite/tests/compile-fail/identifier/variant_struct.rs index fdb7484fc..5b5e85fc9 100644 --- a/test_suite/tests/compile-fail/identifier/variant_struct.rs +++ b/test_suite/tests/compile-fail/identifier/variant_struct.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Deserialize)] #[serde(variant_identifier)] diff --git a/test_suite/tests/compile-fail/identifier/variant_tuple.rs b/test_suite/tests/compile-fail/identifier/variant_tuple.rs index a5c708b2d..a942fb91b 100644 --- a/test_suite/tests/compile-fail/identifier/variant_tuple.rs +++ b/test_suite/tests/compile-fail/identifier/variant_tuple.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Deserialize)] #[serde(variant_identifier)] diff --git a/test_suite/tests/compile-fail/precondition/deserialize_de_lifetime.rs b/test_suite/tests/compile-fail/precondition/deserialize_de_lifetime.rs index 90d6aa6b7..7ffdb10e9 100644 --- a/test_suite/tests/compile-fail/precondition/deserialize_de_lifetime.rs +++ b/test_suite/tests/compile-fail/precondition/deserialize_de_lifetime.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Deserialize)] struct S<'de> { diff --git a/test_suite/tests/compile-fail/precondition/deserialize_dst.rs b/test_suite/tests/compile-fail/precondition/deserialize_dst.rs index 2ff159f1d..9aeaddb52 100644 --- a/test_suite/tests/compile-fail/precondition/deserialize_dst.rs +++ b/test_suite/tests/compile-fail/precondition/deserialize_dst.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Deserialize)] struct S { diff --git a/test_suite/tests/compile-fail/remote/bad_getter.rs b/test_suite/tests/compile-fail/remote/bad_getter.rs index a20ebd748..b501cbe37 100644 --- a/test_suite/tests/compile-fail/remote/bad_getter.rs +++ b/test_suite/tests/compile-fail/remote/bad_getter.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; mod remote { pub struct S { diff --git a/test_suite/tests/compile-fail/remote/bad_remote.rs b/test_suite/tests/compile-fail/remote/bad_remote.rs index 62578a2d8..ed7a98f2d 100644 --- a/test_suite/tests/compile-fail/remote/bad_remote.rs +++ b/test_suite/tests/compile-fail/remote/bad_remote.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; mod remote { pub struct S { diff --git a/test_suite/tests/compile-fail/remote/enum_getter.rs b/test_suite/tests/compile-fail/remote/enum_getter.rs index 7c2589120..ca0ce70e5 100644 --- a/test_suite/tests/compile-fail/remote/enum_getter.rs +++ b/test_suite/tests/compile-fail/remote/enum_getter.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; mod remote { pub enum E { diff --git a/test_suite/tests/compile-fail/remote/missing_field.rs b/test_suite/tests/compile-fail/remote/missing_field.rs index ec1759a60..e8cddf648 100644 --- a/test_suite/tests/compile-fail/remote/missing_field.rs +++ b/test_suite/tests/compile-fail/remote/missing_field.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; mod remote { pub struct S { diff --git a/test_suite/tests/compile-fail/remote/nonremote_getter.rs b/test_suite/tests/compile-fail/remote/nonremote_getter.rs index 541e79861..264e05881 100644 --- a/test_suite/tests/compile-fail/remote/nonremote_getter.rs +++ b/test_suite/tests/compile-fail/remote/nonremote_getter.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Serialize)] struct S { diff --git a/test_suite/tests/compile-fail/remote/unknown_field.rs b/test_suite/tests/compile-fail/remote/unknown_field.rs index 7bcb82589..9af1091b5 100644 --- a/test_suite/tests/compile-fail/remote/unknown_field.rs +++ b/test_suite/tests/compile-fail/remote/unknown_field.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; mod remote { pub struct S { diff --git a/test_suite/tests/compile-fail/remote/wrong_de.rs b/test_suite/tests/compile-fail/remote/wrong_de.rs index c154d932d..d69cbf1e2 100644 --- a/test_suite/tests/compile-fail/remote/wrong_de.rs +++ b/test_suite/tests/compile-fail/remote/wrong_de.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; mod remote { pub struct S(pub u16); diff --git a/test_suite/tests/compile-fail/remote/wrong_getter.rs b/test_suite/tests/compile-fail/remote/wrong_getter.rs index 51107687f..d0f68d658 100644 --- a/test_suite/tests/compile-fail/remote/wrong_getter.rs +++ b/test_suite/tests/compile-fail/remote/wrong_getter.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; mod remote { pub struct S { diff --git a/test_suite/tests/compile-fail/remote/wrong_ser.rs b/test_suite/tests/compile-fail/remote/wrong_ser.rs index 22513da73..76b8d3666 100644 --- a/test_suite/tests/compile-fail/remote/wrong_ser.rs +++ b/test_suite/tests/compile-fail/remote/wrong_ser.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; mod remote { pub struct S { diff --git a/test_suite/tests/compile-fail/transparent/at_most_one.rs b/test_suite/tests/compile-fail/transparent/at_most_one.rs index 0ec4e0835..0136648d4 100644 --- a/test_suite/tests/compile-fail/transparent/at_most_one.rs +++ b/test_suite/tests/compile-fail/transparent/at_most_one.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Serialize)] #[serde(transparent)] diff --git a/test_suite/tests/compile-fail/transparent/de_at_least_one.rs b/test_suite/tests/compile-fail/transparent/de_at_least_one.rs index a911e0cbb..1bfe39283 100644 --- a/test_suite/tests/compile-fail/transparent/de_at_least_one.rs +++ b/test_suite/tests/compile-fail/transparent/de_at_least_one.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Deserialize)] #[serde(transparent)] diff --git a/test_suite/tests/compile-fail/transparent/ser_at_least_one.rs b/test_suite/tests/compile-fail/transparent/ser_at_least_one.rs index ae392e8e0..98ba2721d 100644 --- a/test_suite/tests/compile-fail/transparent/ser_at_least_one.rs +++ b/test_suite/tests/compile-fail/transparent/ser_at_least_one.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Serialize)] #[serde(transparent)] diff --git a/test_suite/tests/compile-fail/type-attribute/from.rs b/test_suite/tests/compile-fail/type-attribute/from.rs index ce51c4365..d21385968 100644 --- a/test_suite/tests/compile-fail/type-attribute/from.rs +++ b/test_suite/tests/compile-fail/type-attribute/from.rs @@ -7,7 +7,7 @@ // except according to those terms. #[macro_use] -extern crate serde_derive; +extern crate serde2_derive; #[derive(Deserialize)] #[serde(from = "Option