corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

servo: Merge #15588 - Update serde to 0.9 (from servo:serde); r=SimonSapin

Browse Source 
Source-Repo: https://github.com/servo/servo
Source-Revision: 7f3a75fa804c0be67f1567ca4a2449cebefa9616
This commit is contained in:
Anthony Ramine
2017-02-18 12:10:26 -08:00
parent 3366dcbc57
commit c30a83618c
73 changed files with 634 additions and 608 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
servo/components/script_traits/lib.rs
View File

@@ -91,13 +91,13 @@ impl HeapSizeOf for UntrustedNodeAddress {
unsafe impl Send for UntrustedNodeAddress {}
impl Serialize for UntrustedNodeAddress {
fn serialize<S: Serializer>(&self, s: &mut S) -> Result<(), S::Error> {
fn serialize<S: Serializer>(&self, s: S) -> Result<S::Ok, S::Error> {
(self.0 as usize).serialize(s)
}
}
impl Deserialize for UntrustedNodeAddress {
fn deserialize<D: Deserializer>(d: &mut D) -> Result<UntrustedNodeAddress, D::Error> {
fn deserialize<D: Deserializer>(d: D) -> Result<UntrustedNodeAddress, D::Error> {
let value: usize = try!(Deserialize::deserialize(d));
Ok(UntrustedNodeAddress::from_id(value))
}