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

Bump serde to 1.0

Browse source
This commit is contained in:
Bastien Orivel 2017-06-14 18:31:09 +02:00 • committed by Simon Sapin
parent e1bce24129
commit 76d8573393
60 changed files with 487 additions and 474 deletions
Download patch file Download diff file Expand all files Collapse all files

18
components/gfx/Cargo.toml
View file

@ -11,16 +11,16 @@ name = "gfx"
path = "lib.rs"
[dependencies]
app_units = "0.4.1"
app_units = "0.5"
bitflags = "0.7"
euclid = "0.14.4"
euclid = "0.15"
fnv = "1.0"
fontsan = {git = "https://github.com/servo/fontsan"}
gfx_traits = {path = "../gfx_traits"}
harfbuzz-sys = "0.1"
heapsize = "0.4"
heapsize_derive = "0.1"
ipc-channel = "0.7"
ipc-channel = "0.8"
lazy_static = "0.2"
libc = "0.2"
log = "0.3.5"
@ -28,8 +28,8 @@ msg = {path = "../msg"}
net_traits = {path = "../net_traits"}
ordered-float = "0.4"
range = {path = "../range"}
serde = "0.9"
serde_derive = "0.9"
serde = "1.0"
serde_derive = "1.0"
servo_atoms = {path = "../atoms"}
servo_geometry = {path = "../geometry"}
servo_url = {path = "../url"}
@ -45,8 +45,8 @@ xi-unicode = "0.1.0"
[target.'cfg(target_os = "macos")'.dependencies]
byteorder = "1.0"
core-foundation = "0.3"
core-graphics = "0.7"
core-text = "4.0"
core-graphics = "0.8"
core-text = "5.0"
[target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
freetype = "0.2"
@ -55,11 +55,11 @@ freetype = "0.2"
servo-fontconfig = "0.2.1"
[target.'cfg(target_os = "android")'.dependencies]
xml5ever = {version = "0.7", features = ["unstable"]}
xml5ever = {version = "0.8", features = ["unstable"]}
[target.'cfg(any(target_feature = "sse2", target_feature = "neon"))'.dependencies]
simd = "0.2.0"
[target.'cfg(target_os = "windows")'.dependencies]
dwrote = "0.3"
dwrote = "0.4"
truetype = "0.26"

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

@ -128,12 +128,12 @@ impl Serialize for CachedCTFont {
}
}
impl Deserialize for CachedCTFont {
impl<'de> Deserialize<'de> for CachedCTFont {
fn deserialize<D>(deserializer: D) -> Result<CachedCTFont, D::Error>
where D: Deserializer {
where D: Deserializer<'de> {
struct NoneOptionVisitor;
impl Visitor for NoneOptionVisitor {
impl<'de> Visitor<'de> for NoneOptionVisitor {
type Value = CachedCTFont;
fn expecting(&self, fmt: &mut fmt::Formatter) -> fmt::Result {