Skip to content

Commit 77a10e2

Browse files
author
bors-servo
authored
Auto merge of #28 - Eijebong:serde1.0, r=emilio
Update to serde 1.0 and bump version
2 parents a4dc2ab + 9c68946 commit 77a10e2

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,6 +1,6 @@
11
[package]
22
name = "app_units"
3-
version = "0.4.2"
3+
version = "0.5.0"
44
authors = ["The Servo Project Developers"]
55
description = "Servo app units type (Au)"
66
documentation = "http://doc.servo.org/app_units/"
@@ -11,4 +11,4 @@ license = "MPL-2.0"
1111
heapsize = ">=0.3, < 0.5"
1212
num-traits = "0.1.32"
1313
rustc-serialize = "0.3"
14-
serde = "0.9"
14+
serde = "1.0"

src/app_unit.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ impl HeapSizeOf for Au {
2828
fn heap_size_of_children(&self) -> usize { 0 }
2929
}
3030

31-
impl Deserialize for Au {
32-
fn deserialize<D: Deserializer>(deserializer: D) -> Result<Au, D::Error> {
31+
impl<'de> Deserialize<'de> for Au {
32+
fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Au, D::Error> {
3333
Ok(Au(try!(i32::deserialize(deserializer))).clamp())
3434
}
3535
}

0 commit comments

Comments
 (0)