fix: Force serde to always be on

BREAKING CHANGE: `serde` feature no longer exists.
cobalt-org · Sep 23, 2018 · 7f1e202 · 7f1e202
1 parent 2e4ab66
commit 7f1e202
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 15 deletions.
diff --git a/liquid-value/Cargo.toml b/liquid-value/Cargo.toml
@@ -14,13 +14,10 @@ license = "MIT"
 travis-ci = { repository = "cobalt-org/liquid-rust" }
 appveyor  = { repository = "johannhof/liquid-rust" }
 
-[features]
-default = ["serde"]
-
 [dependencies]
 # Exposed in API
 chrono = "0.4"
-serde = { version = "1.0", features = ["derive"], optional = true }
+serde = { version = "1.0", features = ["derive"] }
 
 [dev-dependencies]
 difference = "2.0"

diff --git a/liquid-value/src/lib.rs b/liquid-value/src/lib.rs
@@ -5,7 +5,6 @@
 #![warn(unreachable_pub)]
 #![warn(unused_extern_crates)]
 
-#[cfg(feature = "serde")]
 #[macro_use]
 extern crate serde;
 extern crate chrono;

diff --git a/liquid-value/src/scalar.rs b/liquid-value/src/scalar.rs
@@ -8,19 +8,17 @@ use chrono;
 pub type Date = chrono::DateTime<chrono::FixedOffset>;
 
 /// A Liquid scalar value
-#[derive(Clone, Debug)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct Scalar(ScalarEnum);
 
 /// An enum to represent different value types
-#[derive(Clone, Debug)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "serde", serde(untagged))]
+#[derive(Clone, Debug, Serialize, Deserialize)]
+#[serde(untagged)]
 enum ScalarEnum {
     Integer(i32),
     Float(f64),
     Bool(bool),
-    #[cfg_attr(feature = "serde", serde(with = "friendly_date"))]
+    #[serde(with = "friendly_date")]
     Date(Date),
     Str(borrow::Cow<'static, str>),
 }
@@ -219,7 +217,6 @@ impl fmt::Display for Scalar {
 
 const DATE_FORMAT: &str = "%Y-%m-%d %H:%M:%S %z";
 
-#[cfg(feature = "serde")]
 mod friendly_date {
     use super::*;
     use serde::{self, Deserialize, Deserializer, Serializer};

diff --git a/liquid-value/src/values.rs b/liquid-value/src/values.rs
@@ -18,9 +18,8 @@ type MapImpl<K, V> = BTreeMap<K, V>;
 type MapImpl<K, V> = HashMap<K, V>;
 
 /// An enum to represent different value types
-#[derive(Clone, Debug)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "serde", serde(untagged))]
+#[derive(Clone, Debug, Serialize, Deserialize)]
+#[serde(untagged)]
 pub enum Value {
     /// A scalar value.
     Scalar(Scalar),