Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Bump serde to 0.7

Browse source
This commit is contained in:
Anthony Ramine 2016-03-14 09:43:41 -07:00 • committed by Ms2ger
parent 7214fba45b
commit 46c505e47b
27 changed files with 370 additions and 375 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/gfx/Cargo.toml
View file

@ -20,11 +20,11 @@ heapsize_plugin = "0.1.2"
lazy_static = "0.1"
libc = "0.2"
log = "0.3.5"
mime = "0.1"
mime = "0.2"
rand = "0.3"
rustc-serialize = "0.3"
serde = "0.6"
serde_macros = "0.6"
serde = "0.7"
serde_macros = "0.7"
servo-skia = "0.20130412.0"
smallvec = "0.1"
string_cache = {version = "0.2.11", features = ["heap_size"]}
@ -78,7 +78,7 @@ git = "https://github.com/servo/webrender_traits"
[target.x86_64-apple-darwin.dependencies]
core-foundation = "0.2"
core-graphics = "0.2"
core-graphics = "0.3"
core-text = "1.1"
[target.i686-unknown-linux-gnu.dependencies]

4
components/gfx/display_list/mod.rs
View file

@ -168,14 +168,14 @@ impl<K, V> DerefMut for FnvHashMap<K, V> {
impl<K, V> Serialize for FnvHashMap<K, V> where K: Eq + Hash + Serialize, V: Serialize {
#[inline]
fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error> where S: Serializer {
serializer.visit_map(MapIteratorVisitor::new(self.iter(), Some(self.len())))
serializer.serialize_map(MapIteratorVisitor::new(self.iter(), Some(self.len())))
}
}
impl<K, V> Deserialize for FnvHashMap<K, V> where K: Eq + Hash + Deserialize, V: Deserialize {
#[inline]
fn deserialize<D>(deserializer: &mut D) -> Result<Self, D::Error> where D: Deserializer {
deserializer.visit_map(FnvHashMapVisitor::new())
deserializer.deserialize_map(FnvHashMapVisitor::new())
}
}
/// A visitor that produces a map.

4
components/gfx/platform/macos/font_template.rs
View file

@ -112,7 +112,7 @@ impl Deref for CachedCTFont {
impl Serialize for CachedCTFont {
fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error> where S: Serializer {
serializer.visit_none()
serializer.serialize_none()
}
}
@ -130,7 +130,7 @@ impl Deserialize for CachedCTFont {
}
}
deserializer.visit_option(NoneOptionVisitor)
deserializer.deserialize_option(NoneOptionVisitor)
}
}