Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compile serde_derive separately from serde #87

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,16 @@ keywords = ["data-structure", "no_std"]
categories = ["data-structures", "no-std"]

[dependencies]
serde = { version = "1.0", optional = true, features = ["derive"] }
serde_crate = { package = "serde", version = "1.0.186", optional = true }
serde_derive = { version = "1.0.0", optional = true }

[features]
default = ["use_std"]
serde = ["serde_crate", "serde_derive"]
use_std = []

[dev-dependencies]
serde_crate = { package = "serde", version = "1.0.0", features = ["derive"] }
serde_json = "1.0.0"

[package.metadata.release]
Expand Down
6 changes: 5 additions & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,11 @@ pub use crate::Either::{Left, Right};
/// The `Either` type is symmetric and treats its variants the same way, without
/// preference.
/// (For representing success or error, use the regular `Result` enum instead.)
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
#[cfg_attr(
feature = "serde",
derive(serde_derive::Serialize, serde_derive::Deserialize),
serde(crate = "serde_crate")
)]
#[derive(Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)]
pub enum Either<L, R> {
/// A value of type `L`.
Expand Down
10 changes: 7 additions & 3 deletions src/serde_untagged.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@
//! but in typical cases Vec<String> would suffice, too.
//!
//! ```rust
//! # use serde_crate as serde;
//! # fn main() -> Result<(), Box<dyn std::error::Error>> {
//! use either::Either;
//! use std::collections::HashMap;
//!
//! #[derive(serde::Serialize, serde::Deserialize, Debug)]
//! # #[serde(crate = "serde")]
//! #[serde(transparent)]
//! struct IntOrString {
//! #[serde(with = "either::serde_untagged")]
Expand All @@ -33,10 +35,12 @@
//! # }
//! ```

use serde::{Deserialize, Deserializer, Serialize, Serializer};
use serde_crate::de::{Deserialize, Deserializer};
use serde_crate::ser::{Serialize, Serializer};
use serde_derive::{Deserialize, Serialize};

#[derive(serde::Serialize, serde::Deserialize)]
#[serde(untagged)]
#[derive(Serialize, Deserialize)]
#[serde(crate = "serde_crate", untagged)]
enum Either<L, R> {
Left(L),
Right(R),
Expand Down
8 changes: 6 additions & 2 deletions src/serde_untagged_optional.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@
//! but in typical cases Vec<String> would suffice, too.
//!
//! ```rust
//! # use serde_crate as serde;
//! # fn main() -> Result<(), Box<dyn std::error::Error>> {
//! use either::Either;
//! use std::collections::HashMap;
//!
//! #[derive(serde::Serialize, serde::Deserialize, Debug)]
//! # #[serde(crate = "serde")]
//! #[serde(transparent)]
//! struct IntOrString {
//! #[serde(with = "either::serde_untagged_optional")]
Expand All @@ -33,10 +35,12 @@
//! # }
//! ```

use serde::{Deserialize, Deserializer, Serialize, Serializer};
use serde_crate::de::{Deserialize, Deserializer};
use serde_crate::ser::{Serialize, Serializer};
use serde_derive::{Deserialize, Serialize};

#[derive(Serialize, Deserialize)]
#[serde(untagged)]
#[serde(crate = "serde_crate", untagged)]
enum Either<L, R> {
Left(L),
Right(R),
Expand Down