Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Update serde to 0.9.0
  • Loading branch information
nox committed Feb 16, 2017
commit 1d3d182d424b3b44799765596c36aa24cf192d76
8 changes: 3 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]

name = "cssparser"
version = "0.9.0"
version = "0.10.0"
authors = [ "Simon Sapin <simon.sapin@exyr.org>" ]

description = "Rust implementation of CSS Syntax Level 3"
Expand All @@ -23,16 +23,14 @@ tempdir = "0.3"
encoding_rs = "0.3.2"

[dependencies]
heapsize = {version = ">=0.1.1, <0.4.0", optional = true}
heapsize = {version = "0.3", optional = true}
matches = "0.1"
serde = {version = ">=0.6.6, <0.9", optional = true}
serde = {version = "0.9", optional = true}

[build-dependencies]
syn = { version = "0.10.6", features = ["full", "visit"]}
quote = "0.3"

[features]
serde-serialization = [ "serde" ]
heap_size = [ "heapsize" ]
bench = []
dummy_match_byte = []
4 changes: 2 additions & 2 deletions src/color.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ impl RGBA {

#[cfg(feature = "serde")]
impl Serialize for RGBA {
fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where S: Serializer
{
(self.red, self.green, self.blue, self.alpha).serialize(serializer)
Expand All @@ -81,7 +81,7 @@ impl Serialize for RGBA {

#[cfg(feature = "serde")]
impl Deserialize for RGBA {
fn deserialize<D>(deserializer: &mut D) -> Result<Self, D::Error>
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where D: Deserializer
{
let (r, g, b, a) = try!(Deserialize::deserialize(deserializer));
Expand Down