Skip to content

Commit 0fccde8

Browse files
author
bors-servo
authored
Auto merge of #1392 - servo:serdeup, r=glennw,SimonSapin
Bump serde to 1.0 This is a rebase of #1359 with `bitflags` added to the tidy duplicate crates exception list, and version numbers incremented some more to catch up with `master`. Original work by @Eijebong. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/1392) <!-- Reviewable:end -->
2 parents 891670e + da57667 commit 0fccde8

File tree

13 files changed

+173
-147
lines changed

13 files changed

+173
-147
lines changed

‎Cargo.lock

Lines changed: 127 additions & 98 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎servo-tidy.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ skip-check-licenses = false
44

55
[ignore]
66
# Ignored packages with duplicated versions
7-
packages = ["yaml-rust"]
7+
packages = ["yaml-rust", "bitflags"]
88
# Files that are ignored for all tidy and lint checks.
99
files = [
1010
# servo-tidy does not properly support workspaces yet.

‎webrender/Cargo.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "webrender"
3-
version = "0.42.0"
3+
version = "0.43.0"
44
authors = ["Glenn Watson <[email protected]>"]
55
license = "MPL-2.0"
66
repository = "https://github.com/servo/webrender"
@@ -13,36 +13,36 @@ profiler = ["thread_profiler/thread_profiler"]
1313
webgl = ["offscreen_gl_context", "webrender_traits/webgl"]
1414

1515
[dependencies]
16-
app_units = "0.4"
17-
bincode = "1.0.0-alpha6"
16+
app_units = "0.5"
17+
bincode = "0.8"
1818
bit-set = "0.4"
1919
byteorder = "1.0"
20-
euclid = "0.14.4"
20+
euclid = "0.15"
2121
fnv = "1.0"
2222
gleam = "0.4.3"
2323
lazy_static = "0.2"
2424
log = "0.3"
2525
num-traits = "0.1.32"
26-
offscreen_gl_context = {version = "0.9.0", features = ["serde", "osmesa"], optional = true}
26+
offscreen_gl_context = {version = "0.11", features = ["serde", "osmesa"], optional = true}
2727
time = "0.1"
2828
rayon = "0.8"
2929
webrender_traits = {path = "../webrender_traits"}
3030
bitflags = "0.7"
3131
gamma-lut = "0.2"
3232
thread_profiler = "0.1.1"
33-
plane-split = "0.5"
33+
plane-split = "0.6"
3434

3535
[dev-dependencies]
3636
angle = {git = "https://github.com/servo/angle", branch = "servo"}
3737
rand = "0.3" # for the benchmarks
38-
servo-glutin = "0.10.1" # for the example apps
38+
servo-glutin = "0.11" # for the example apps
3939

4040
[target.'cfg(any(target_os = "android", all(unix, not(target_os = "macos"))))'.dependencies]
4141
freetype = { version = "0.2", default-features = false }
4242

4343
[target.'cfg(target_os = "windows")'.dependencies]
44-
dwrote = "0.3"
44+
dwrote = "0.4"
4545

4646
[target.'cfg(target_os = "macos")'.dependencies]
47-
core-graphics = "0.7.0"
48-
core-text = "4.0"
47+
core-graphics = "0.8.0"
48+
core-text = "5.0"

‎webrender/src/platform/macos/font.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ struct GlyphMetrics {
6363
// this function from Skia which is used to check if a glyph
6464
// can be rendered with subpixel AA.
6565
fn supports_subpixel_aa() -> bool {
66-
let mut cg_context = CGContext::create_bitmap_context(1, 1, 8, 4,
66+
let mut cg_context = CGContext::create_bitmap_context(None, 1, 1, 8, 4,
6767
&CGColorSpace::create_device_rgb(),
6868
kCGImageAlphaNoneSkipFirst |
6969
kCGBitmapByteOrder32Little);
@@ -289,7 +289,7 @@ impl FontContext {
289289
FontRenderMode::Alpha | FontRenderMode::Mono => kCGImageAlphaPremultipliedLast,
290290
};
291291

292-
let mut cg_context = CGContext::create_bitmap_context(metrics.rasterized_width as usize,
292+
let mut cg_context = CGContext::create_bitmap_context(None, metrics.rasterized_width as usize,
293293
metrics.rasterized_height as usize,
294294
8,
295295
metrics.rasterized_width as usize * 4,

‎webrender_traits/Cargo.toml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "webrender_traits"
3-
version = "0.42.0"
3+
version = "0.43.0"
44
authors = ["Glenn Watson <[email protected]>"]
55
license = "MPL-2.0"
66
repository = "https://github.com/servo/webrender"
@@ -11,21 +11,20 @@ ipc = ["ipc-channel"]
1111
webgl = ["offscreen_gl_context"]
1212

1313
[dependencies]
14-
app_units = "0.4"
15-
bincode = "1.0.0-alpha2"
14+
app_units = "0.5"
15+
bincode = "0.8"
1616
byteorder = "1.0"
17-
euclid = "0.14.4"
17+
euclid = "0.15"
1818
gleam = "0.4.5"
1919
heapsize = ">= 0.3.6, < 0.5"
20-
ipc-channel = {version = "0.7.2", optional = true}
21-
offscreen_gl_context = {version = "0.9", features = ["serde"], optional = true}
22-
serde = "0.9"
23-
serde_derive = "0.9"
20+
ipc-channel = {version = "0.8", optional = true}
21+
offscreen_gl_context = {version = "0.11", features = ["serde"], optional = true}
22+
serde = { version = "1.0", features = ["rc", "derive"] }
2423
time = "0.1"
2524

2625
[target.'cfg(target_os = "macos")'.dependencies]
2726
core-foundation = "0.3"
28-
core-graphics = "0.7"
27+
core-graphics = "0.8"
2928

3029
[target.'cfg(target_os = "windows")'.dependencies]
31-
dwrote = "0.3"
30+
dwrote = "0.4"

‎webrender_traits/src/channel_ipc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ impl PayloadReceiverHelperMethods for PayloadReceiver {
3434
}
3535
}
3636

37-
pub fn msg_channel<T: Serialize + Deserialize>() -> Result<(MsgSender<T>, MsgReceiver<T>), Error> {
37+
pub fn msg_channel<T: Serialize + for<'de> Deserialize<'de>>() -> Result<(MsgSender<T>, MsgReceiver<T>), Error> {
3838
ipc::channel()
3939
}
4040

‎webrender_traits/src/channel_mpsc.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,16 +83,16 @@ impl<T> Serialize for MsgSender<T> {
8383
}
8484
}
8585

86-
impl<T> Deserialize for MsgReceiver<T> {
86+
impl<'de, T> Deserialize<'de> for MsgReceiver<T> {
8787
fn deserialize<D>(_: D) -> Result<MsgReceiver<T>, D::Error>
88-
where D: Deserializer {
88+
where D: Deserializer<'de> {
8989
unreachable!();
9090
}
9191
}
9292

93-
impl<T> Deserialize for MsgSender<T> {
93+
impl<'de, T> Deserialize<'de> for MsgSender<T> {
9494
fn deserialize<D>(_: D) -> Result<MsgSender<T>, D::Error>
95-
where D: Deserializer {
95+
where D: Deserializer<'de> {
9696
unreachable!();
9797
}
9898
}

‎webrender_traits/src/display_list.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ impl BuiltDisplayList {
125125
BuiltDisplayListIter::new(self)
126126
}
127127

128-
pub fn get<T: Deserialize>(&self, range: ItemRange<T>) -> AuxIter<T> {
128+
pub fn get<'de, T: Deserialize<'de>>(&self, range: ItemRange<T>) -> AuxIter<T> {
129129
AuxIter::new(&self.data[range.start .. range.start + range.length])
130130
}
131131
}
@@ -212,7 +212,7 @@ impl<'a> BuiltDisplayListIter<'a> {
212212

213213
/// Returns the byte-range the slice occupied, and the number of elements
214214
/// in the slice.
215-
fn skip_slice<T: Deserialize>(&mut self) -> (ItemRange<T>, usize) {
215+
fn skip_slice<T: for<'de> Deserialize<'de>>(&mut self) -> (ItemRange<T>, usize) {
216216
let base = self.list.data.as_ptr() as usize;
217217
let start = self.data.as_ptr() as usize;
218218

@@ -333,7 +333,7 @@ impl<'a, 'b> DisplayItemRef<'a, 'b> {
333333
}
334334
}
335335

336-
impl<'a, T: Deserialize> AuxIter<'a, T> {
336+
impl<'de, 'a, T: Deserialize<'de>> AuxIter<'a, T> {
337337
pub fn new(mut data: &'a [u8]) -> Self {
338338

339339
let size: usize = if data.len() == 0 {
@@ -351,7 +351,7 @@ impl<'a, T: Deserialize> AuxIter<'a, T> {
351351
}
352352
}
353353

354-
impl<'a, T: Deserialize> Iterator for AuxIter<'a, T> {
354+
impl<'a, T: for<'de> Deserialize<'de>> Iterator for AuxIter<'a, T> {
355355
type Item = T;
356356

357357
fn next(&mut self) -> Option<T> {
@@ -369,7 +369,7 @@ impl<'a, T: Deserialize> Iterator for AuxIter<'a, T> {
369369
}
370370
}
371371

372-
impl<'a, T: Deserialize> ::std::iter::ExactSizeIterator for AuxIter<'a, T> { }
372+
impl<'a, T: for<'de> Deserialize<'de>> ::std::iter::ExactSizeIterator for AuxIter<'a, T> { }
373373

374374

375375
// This is purely for the JSON writer in wrench

‎webrender_traits/src/font.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ impl Serialize for NativeFontHandle {
2626
}
2727

2828
#[cfg(target_os = "macos")]
29-
impl Deserialize for NativeFontHandle {
30-
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer {
29+
impl<'de> Deserialize<'de> for NativeFontHandle {
30+
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
3131
let postscript_name: String = try!(Deserialize::deserialize(deserializer));
3232

3333
match CGFont::from_name(&CFString::new(&*postscript_name)) {

‎webrender_traits/src/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@ extern crate heapsize;
1818
extern crate ipc_channel;
1919
#[cfg(feature = "webgl")]
2020
extern crate offscreen_gl_context;
21-
extern crate serde;
2221
#[macro_use]
23-
extern crate serde_derive;
22+
extern crate serde;
2423
extern crate time;
2524

2625
#[cfg(target_os = "macos")]

‎webrender_traits/src/webgl.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,9 @@ macro_rules! define_resource_id {
176176
($name:ident) => {
177177
define_resource_id_struct!($name);
178178

179-
impl ::serde::Deserialize for $name {
179+
impl<'de> ::serde::Deserialize<'de> for $name {
180180
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
181-
where D: ::serde::Deserializer
181+
where D: ::serde::Deserializer<'de>
182182
{
183183
let id = try!(u32::deserialize(deserializer));
184184
if id == 0 {

‎wrench/Cargo.toml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,32 @@ license = "MPL-2.0"
77

88
[dependencies]
99
base64 = "0.3"
10-
bincode = "1.0.0-alpha2"
10+
bincode = "0.8"
1111
byteorder = "1.0"
1212
env_logger = { version = "0.4", optional = true }
13-
euclid = "0.14.4"
13+
euclid = "0.15"
1414
gleam = "0.4"
15-
servo-glutin = "0.10.1"
16-
app_units = "0.4"
15+
servo-glutin = "0.11"
16+
app_units = "0.5"
1717
image = "0.12"
1818
clap = { version = "2", features = ["yaml"] }
1919
lazy_static = "0.2"
2020
yaml-rust = { git = "https://github.com/vvuk/yaml-rust", features = ["preserve_order"] }
21-
serde_json = "0.9"
21+
serde_json = "1.0"
2222
time = "0.1"
2323
crossbeam = "0.2"
2424
osmesa-sys = { version = "0.1.2", optional = true }
2525
osmesa-src = { git = "https://github.com/servo/osmesa-src", optional = true }
2626
webrender = {path = "../webrender"}
2727
webrender_traits = {path = "../webrender_traits"}
28-
serde_derive = "0.9"
29-
serde = "0.9"
28+
serde = {version = "1.0", features = ["derive"] }
3029

3130
[features]
3231
headless = [ "osmesa-sys", "osmesa-src" ]
3332
logging = [ "env_logger" ]
3433

3534
[target.'cfg(target_os = "windows")'.dependencies]
36-
dwrote = "0.3"
35+
dwrote = "0.4"
3736

3837
[target.'cfg(any(target_os = "linux", target_os = "macos"))'.dependencies]
39-
font-loader = "0.2.0"
38+
font-loader = "0.3.0"

‎wrench/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ extern crate lazy_static;
2424
#[cfg(feature = "headless")]
2525
extern crate osmesa_sys;
2626
#[macro_use]
27-
extern crate serde_derive;
27+
extern crate serde;
2828
extern crate serde_json;
2929
extern crate time;
3030
extern crate webrender;

0 commit comments

Comments
 (0)