hodasemi/cgmath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #389 from bitshifter/serde_derive

Browse source 
Use serde_derive instead of serde_macros.
This commit is contained in:
Brendan Zabarauskas 2017-03-21 17:13:13 +11:00 committed by GitHub
commit 920e47526d
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Cargo.toml
View file

@ -29,7 +29,7 @@ name = "cgmath"
[features] [features]
unstable = [] unstable = []
default = ["rustc-serialize"] default = ["rustc-serialize"]
eders = ["serde", "serde_macros"] eders = ["serde", "serde_derive"]
use_simd = ["simd"] use_simd = ["simd"]
[dependencies] [dependencies]
@ -38,7 +38,7 @@ num-traits = "0.1"
rand = "0.3" rand = "0.3"
rustc-serialize = { version = "0.3", optional = true } rustc-serialize = { version = "0.3", optional = true }
serde = { version = "0.8", optional = true } serde = { version = "0.8", optional = true }
serde_macros = { version = "0.8", optional = true } serde_derive = { version = "0.8", optional = true }
simd = { version = "0.2", optional = true } simd = { version = "0.2", optional = true }
[dev-dependencies] [dev-dependencies]

6
src/lib.rs
View file

@ -49,8 +49,7 @@
//! ```rust //! ```rust
//! use cgmath::prelude::*; //! use cgmath::prelude::*;
//! ``` //! ```
#![cfg_attr(feature = "eders", feature(plugin, custom_derive))]
#![cfg_attr(feature = "eders", plugin(serde_macros))]
#![cfg_attr(feature = "use_simd", feature(specialization))] #![cfg_attr(feature = "use_simd", feature(specialization))]
#[macro_use] #[macro_use]
@ -61,6 +60,9 @@ extern crate rand;
#[cfg(feature = "rustc-serialize")] #[cfg(feature = "rustc-serialize")]
extern crate rustc_serialize; extern crate rustc_serialize;
#[cfg(feature = "eders")]
#[macro_use]
extern crate serde_derive;
#[cfg(feature = "eders")] #[cfg(feature = "eders")]
extern crate serde; extern crate serde;