From 4f13a96ae605d0df03ddf7d4750885b483869b82 Mon Sep 17 00:00:00 2001 From: Cameron Hart Date: Sun, 18 Dec 2016 13:13:48 +1100 Subject: [PATCH] Use serde_derive instead of serde_macros. --- Cargo.toml | 4 ++-- src/lib.rs | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 12bd240..1e17bd1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ name = "cgmath" [features] unstable = [] default = ["rustc-serialize"] -eders = ["serde", "serde_macros"] +eders = ["serde", "serde_derive"] [dependencies] approx = "0.1" @@ -37,7 +37,7 @@ num-traits = "0.1" rand = "0.3" rustc-serialize = { version = "0.3", optional = true } serde = { version = "0.8", optional = true } -serde_macros = { version = "0.8", optional = true } +serde_derive = { version = "0.8", optional = true } [dev-dependencies] glium = "0.15" diff --git a/src/lib.rs b/src/lib.rs index 822857b..eaf8ecb 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -50,8 +50,7 @@ //! use cgmath::prelude::*; //! ``` -#![cfg_attr(feature = "eders", feature(plugin, custom_derive))] -#![cfg_attr(feature = "eders", plugin(serde_macros))] +#![cfg_attr(feature = "eders", feature(proc_macro))] #[macro_use] extern crate approx; @@ -61,6 +60,9 @@ extern crate rand; #[cfg(feature = "rustc-serialize")] extern crate rustc_serialize; +#[cfg(feature = "eders")] +#[macro_use] +extern crate serde_derive; #[cfg(feature = "eders")] extern crate serde;