From 31a8154e016d4c9b2d0c4426194b9e3768a07477 Mon Sep 17 00:00:00 2001
From: Vinzent Steinberg <Vinzent.Steinberg@gmail.com>
Date: Mon, 8 Jul 2019 17:28:00 +0200
Subject: [PATCH] Fix serde1 feature and remove unneccessary crate import

---
 Cargo.toml           | 2 +-
 src/histogram.rs     | 1 +
 src/minmax.rs        | 2 ++
 src/moments/mod.rs   | 2 ++
 src/quantile.rs      | 1 +
 src/weighted_mean.rs | 1 +
 tests/proptest.rs    | 2 --
 7 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 1ffa503..919c624 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -29,7 +29,7 @@ name = "kurtosis"
 [dependencies]
 num-traits = "0.2"
 float-ord = "0.2"
-serde = { version = "1", optional = true }
+serde = { version = "1", features = ["derive"], optional = true }
 serde_derive = { version = "1", optional = true }
 serde-big-array = { version = "0.1.4", optional = true }
 
diff --git a/src/histogram.rs b/src/histogram.rs
index ebb70ec..17cfbb0 100644
--- a/src/histogram.rs
+++ b/src/histogram.rs
@@ -24,6 +24,7 @@ macro_rules! define_histogram {
     ($name:ident, $LEN:expr) => (
         mod $name {
             use $crate::Histogram as Trait;
+            #[cfg(feature = "serde1")] use ::serde::{Serialize, Deserialize};
             #[cfg(feature = "serde1")] serde_big_array::big_array! {
                 BigArray; LEN, (LEN + 1),
             }
diff --git a/src/minmax.rs b/src/minmax.rs
index f9b43b3..4125861 100644
--- a/src/minmax.rs
+++ b/src/minmax.rs
@@ -1,5 +1,7 @@
 use core;
 
+#[cfg(feature = "serde1")] use serde::{Serialize, Deserialize};
+
 use super::{Estimate, Merge};
 
 /// Calculate the minimum of `a` and `b`.
diff --git a/src/moments/mod.rs b/src/moments/mod.rs
index 81c5633..4678f31 100644
--- a/src/moments/mod.rs
+++ b/src/moments/mod.rs
@@ -1,6 +1,7 @@
 use core;
 
 use conv::ApproxFrom;
+#[cfg(feature = "serde1")] use serde::{Serialize, Deserialize};
 
 use super::{Estimate, Merge};
 
@@ -55,6 +56,7 @@ macro_rules! define_moments {
     ($name:ident, $MAX_MOMENT:expr) => (
         use ::conv::ApproxFrom;
         use ::num_traits::pow;
+        #[cfg(feature = "serde1")] use ::serde::{Serialize, Deserialize};
 
         /// An iterator over binomial coefficients.
         struct IterBinomial {
diff --git a/src/quantile.rs b/src/quantile.rs
index cf2f03b..9e62b96 100644
--- a/src/quantile.rs
+++ b/src/quantile.rs
@@ -3,6 +3,7 @@ use core::cmp::min;
 
 use conv::{ApproxFrom, ConvAsUtil, ConvUtil, ValueFrom};
 use float_ord::sort as sort_floats;
+#[cfg(feature = "serde1")] use serde::{Serialize, Deserialize};
 
 use super::Estimate;
 
diff --git a/src/weighted_mean.rs b/src/weighted_mean.rs
index ac9ca52..c7b6213 100644
--- a/src/weighted_mean.rs
+++ b/src/weighted_mean.rs
@@ -1,5 +1,6 @@
 use core;
 
+#[cfg(feature = "serde1")] use serde::{Serialize, Deserialize};
 use super::{MeanWithError, Estimate, Merge};
 
 
diff --git a/tests/proptest.rs b/tests/proptest.rs
index 3e0b7f9..abd55fe 100644
--- a/tests/proptest.rs
+++ b/tests/proptest.rs
@@ -1,7 +1,5 @@
 #![cfg_attr(feature = "cargo-clippy", allow(float_cmp, map_clone))]
 
-#[macro_use] extern crate proptest;
-
 use core::iter::Iterator;
 
 use average::Mean;