Skip to content

Commit 7f1e202

Browse files
committed
fix: Force serde to always be on
BREAKING CHANGE: `serde` feature no longer exists.
1 parent 2e4ab66 commit 7f1e202

File tree

4 files changed

+7
-15
lines changed

4 files changed

+7
-15
lines changed

liquid-value/Cargo.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,10 @@ license = "MIT"
1414
travis-ci = { repository = "cobalt-org/liquid-rust" }
1515
appveyor = { repository = "johannhof/liquid-rust" }
1616

17-
[features]
18-
default = ["serde"]
19-
2017
[dependencies]
2118
# Exposed in API
2219
chrono = "0.4"
23-
serde = { version = "1.0", features = ["derive"], optional = true }
20+
serde = { version = "1.0", features = ["derive"] }
2421

2522
[dev-dependencies]
2623
difference = "2.0"

liquid-value/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#![warn(unreachable_pub)]
66
#![warn(unused_extern_crates)]
77

8-
#[cfg(feature = "serde")]
98
#[macro_use]
109
extern crate serde;
1110
extern crate chrono;

liquid-value/src/scalar.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,17 @@ use chrono;
88
pub type Date = chrono::DateTime<chrono::FixedOffset>;
99

1010
/// A Liquid scalar value
11-
#[derive(Clone, Debug)]
12-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
11+
#[derive(Clone, Debug, Serialize, Deserialize)]
1312
pub struct Scalar(ScalarEnum);
1413

1514
/// An enum to represent different value types
16-
#[derive(Clone, Debug)]
17-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
18-
#[cfg_attr(feature = "serde", serde(untagged))]
15+
#[derive(Clone, Debug, Serialize, Deserialize)]
16+
#[serde(untagged)]
1917
enum ScalarEnum {
2018
Integer(i32),
2119
Float(f64),
2220
Bool(bool),
23-
#[cfg_attr(feature = "serde", serde(with = "friendly_date"))]
21+
#[serde(with = "friendly_date")]
2422
Date(Date),
2523
Str(borrow::Cow<'static, str>),
2624
}
@@ -219,7 +217,6 @@ impl fmt::Display for Scalar {
219217

220218
const DATE_FORMAT: &str = "%Y-%m-%d %H:%M:%S %z";
221219

222-
#[cfg(feature = "serde")]
223220
mod friendly_date {
224221
use super::*;
225222
use serde::{self, Deserialize, Deserializer, Serializer};

liquid-value/src/values.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@ type MapImpl<K, V> = BTreeMap<K, V>;
1818
type MapImpl<K, V> = HashMap<K, V>;
1919

2020
/// An enum to represent different value types
21-
#[derive(Clone, Debug)]
22-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
23-
#[cfg_attr(feature = "serde", serde(untagged))]
21+
#[derive(Clone, Debug, Serialize, Deserialize)]
22+
#[serde(untagged)]
2423
pub enum Value {
2524
/// A scalar value.
2625
Scalar(Scalar),

0 commit comments

Comments
 (0)