Skip to content

Commit 60f4951

Browse files
author
bors-servo
authored
Auto merge of servo#149 - Eijebong:serde1.0, r=SimonSapin
Update to serde 1.0 and bump version <!-- Reviewable:start --> This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/rust-cssparser/149) <!-- Reviewable:end -->
2 parents 06e204e + a736736 commit 60f4951

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22

33
name = "cssparser"
4-
version = "0.14.0"
4+
version = "0.15.0"
55
authors = [ "Simon Sapin <simon.sapin@exyr.org>" ]
66

77
description = "Rust implementation of CSS Syntax Level 3"
@@ -25,7 +25,7 @@ heapsize = {version = ">= 0.3, < 0.5", optional = true}
2525
matches = "0.1"
2626
phf = "0.7"
2727
procedural-masquerade = {path = "./procedural-masquerade", version = "0.1"}
28-
serde = {version = "0.9", optional = true}
28+
serde = {version = "1.0", optional = true}
2929

3030
[build-dependencies]
3131
syn = "0.11"

src/color.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ impl Serialize for RGBA {
8585
}
8686

8787
#[cfg(feature = "serde")]
88-
impl Deserialize for RGBA {
88+
impl<'de> Deserialize<'de> for RGBA {
8989
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
90-
where D: Deserializer
90+
where D: Deserializer<'de>
9191
{
9292
let (r, g, b, a) = try!(Deserialize::deserialize(deserializer));
9393
Ok(RGBA::new(r, g, b, a))

0 commit comments

Comments
 (0)