diff --git a/benches/bench_enum.rs b/benches/bench_enum.rs index ff1a1ae2..b13a5e27 100644 --- a/benches/bench_enum.rs +++ b/benches/bench_enum.rs @@ -25,7 +25,7 @@ enum Animal { ////////////////////////////////////////////////////////////////////////////// #[deriving(Show)] -enum Error { +pub enum Error { EndOfStream, SyntaxError, OtherError(String), diff --git a/benches/bench_map.rs b/benches/bench_map.rs index 17c69b61..7e84e3b0 100644 --- a/benches/bench_map.rs +++ b/benches/bench_map.rs @@ -18,7 +18,7 @@ use serde::de::{Deserializer, Deserializable}; ////////////////////////////////////////////////////////////////////////////// #[deriving(Show)] -enum Error { +pub enum Error { EndOfStream, SyntaxError, OtherError(String), diff --git a/benches/bench_struct.rs b/benches/bench_struct.rs index f266bb77..0cc97819 100644 --- a/benches/bench_struct.rs +++ b/benches/bench_struct.rs @@ -35,7 +35,7 @@ struct Outer { ////////////////////////////////////////////////////////////////////////////// #[deriving(Show)] -enum Error { +pub enum Error { EndOfStream, SyntaxError, OtherError(String), diff --git a/benches/bench_vec.rs b/benches/bench_vec.rs index 46e57bc0..d447450d 100644 --- a/benches/bench_vec.rs +++ b/benches/bench_vec.rs @@ -17,7 +17,7 @@ use serde::de::{Deserializer, Deserializable}; ////////////////////////////////////////////////////////////////////////////// #[deriving(Show)] -enum Error { +pub enum Error { EndOfStream, SyntaxError, OtherError(String), diff --git a/src/de.rs b/src/de.rs index 49cd4769..8f82b000 100644 --- a/src/de.rs +++ b/src/de.rs @@ -9,7 +9,6 @@ // except according to those terms. use std::collections::{HashMap, HashSet, TreeMap, TreeSet}; -use std::gc::{GC, Gc}; use std::hash::Hash; use std::num; use std::rc::Rc; @@ -628,17 +627,6 @@ impl< } } -impl< - D: Deserializer, - E, - T: Deserializable + 'static -> Deserializable for Gc { - #[inline] - fn deserialize_token(d: &mut D, token: Token) -> Result, E> { - Ok(box (GC) try!(Deserializable::deserialize_token(d, token))) - } -} - impl< D: Deserializer, E, diff --git a/src/ser.rs b/src/ser.rs index 314de15f..d12c44b3 100644 --- a/src/ser.rs +++ b/src/ser.rs @@ -9,7 +9,6 @@ // except according to those terms. use std::collections::{HashMap, HashSet, TreeMap, TreeSet}; -use std::gc::Gc; use std::hash::Hash; use std::rc::Rc; use std::sync::Arc; @@ -182,7 +181,6 @@ macro_rules! impl_serializable_box { impl_serializable_box!(&'a T) impl_serializable_box!(Box) -impl_serializable_box!(Gc) impl_serializable_box!(Rc) impl<