Add serde to rand_core

Author: pitdicker

Cargo.toml

@@ -22,7 +22,7 @@ alloc = ["rand_core/alloc"]  # enables Vec and Box support without std
 
 i128_support = [] # enables i128 and u128 support
 
-serde-1 = ["serde", "serde_derive"]
+serde-1 = ["serde", "serde_derive", "rand_core/serde-1"]
 
 
 [target.'cfg(unix)'.dependencies]

rand_core/Cargo.toml

@@ -18,3 +18,8 @@ categories = ["algorithms"]
 # default = ["std"]
 std = []    # use std library; should be default but for above bug
 alloc = []  # enables Vec and Box support without std
+serde-1 = ["serde", "serde_derive"] # enables serde for BlockRng wrapper
+
+[dependencies]
+serde = {version="1",optional=true}
+serde_derive = {version="1", optional=true}

rand_core/src/impls.rs

@@ -184,6 +184,7 @@ pub fn next_u64_via_fill<R: RngCore + ?Sized>(rng: &mut R) -> u64 {
 /// [`RngCore`]: ../RngCore.t.html
 /// [`SeedableRng`]: ../SeedableRng.t.html
 #[derive(Clone)]
+#[cfg_attr(feature="serde-1", derive(Serialize,Deserialize))]
 pub struct BlockRng<R: BlockRngCore + ?Sized> {
     pub results: R::Results,
     pub index: usize,
@@ -346,6 +347,7 @@ impl<R: BlockRngCore + SeedableRng> SeedableRng for BlockRng<R> {
 /// [`RngCore`]: ../RngCore.t.html
 /// [`BlockRng`]: .BlockRng.s.html
 #[derive(Clone)]
+#[cfg_attr(feature="serde-1", derive(Serialize,Deserialize))]
 pub struct BlockRng64<R: BlockRngCore + ?Sized> {
     pub results: R::Results,
     pub index: usize,

rand_core/src/lib.rs

@@ -39,6 +39,8 @@
 
 #[cfg(feature="std")] extern crate core;
 #[cfg(all(feature = "alloc", not(feature="std")))] extern crate alloc;
+#[cfg(feature="serde-1")] extern crate serde;
+#[cfg(feature="serde-1")] #[macro_use] extern crate serde_derive;
 
 
 use core::default::Default;