From 8feaed7802760291391258029b6fc1408b20baa1 Mon Sep 17 00:00:00 2001 From: Boris Chiou Date: Tue, 10 Jul 2018 10:40:55 -0700 Subject: [PATCH] Bump euclid, serde, and plane-split. We bump euclid for direct-composition, examples, webrender, webrender_api, and wrench. Also, bump plane-split so we could drop the old version of euclid. --- Cargo.lock | 140 +++++++++++++++++----------------- direct-composition/Cargo.toml | 2 +- examples/Cargo.toml | 2 +- webrender/Cargo.toml | 4 +- webrender/src/batch.rs | 6 +- webrender/src/picture.rs | 2 +- webrender/src/util.rs | 18 +++-- webrender_api/Cargo.toml | 6 +- wrench/Cargo.toml | 2 +- 9 files changed, 94 insertions(+), 88 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 946b9c9242..27d703b138 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -30,7 +30,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -71,7 +71,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -247,7 +247,7 @@ dependencies = [ name = "direct-composition" version = "0.1.0" dependencies = [ - "euclid 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "glutin 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", "mozangle 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -292,8 +292,8 @@ dependencies = [ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.66 (git+https://github.com/servo/serde?branch=deserialize_from_enums8)", + "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -316,11 +316,11 @@ dependencies = [ [[package]] name = "euclid" -version = "0.17.3" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -526,7 +526,7 @@ dependencies = [ "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -619,20 +619,20 @@ dependencies = [ [[package]] name = "lyon_geom" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "arrayvec 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "lyon_path" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "lyon_geom 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "lyon_geom 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -850,65 +850,62 @@ dependencies = [ [[package]] name = "pathfinder_font_renderer" -version = "0.4.0" -source = "git+https://github.com/pcwalton/pathfinder#2ec2adf1c73d72e0d7fe44978d987dca6feda6f9" +version = "0.5.0" +source = "git+https://github.com/pcwalton/pathfinder#2e5b70805f8241ea6508eeca615c251170dca104" dependencies = [ "app_units 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 10.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "dwrite-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)", "freetype 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "lyon_geom 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lyon_path 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.66 (git+https://github.com/servo/serde?branch=deserialize_from_enums8)", + "lyon_path 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", "uuid-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "pathfinder_gfx_utils" -version = "0.1.0" -source = "git+https://github.com/pcwalton/pathfinder#2ec2adf1c73d72e0d7fe44978d987dca6feda6f9" +version = "0.2.0" +source = "git+https://github.com/pcwalton/pathfinder#2e5b70805f8241ea6508eeca615c251170dca104" dependencies = [ - "euclid 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "pathfinder_partitioner" -version = "0.1.0" -source = "git+https://github.com/pcwalton/pathfinder#2ec2adf1c73d72e0d7fe44978d987dca6feda6f9" +version = "0.2.0" +source = "git+https://github.com/pcwalton/pathfinder#2e5b70805f8241ea6508eeca615c251170dca104" dependencies = [ "arrayvec 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "bit-vec 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)", "half 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "lyon_geom 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lyon_path 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "pathfinder_path_utils 0.1.0 (git+https://github.com/pcwalton/pathfinder)", - "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.66 (git+https://github.com/servo/serde?branch=deserialize_from_enums8)", + "lyon_geom 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lyon_path 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pathfinder_path_utils 0.2.0 (git+https://github.com/pcwalton/pathfinder)", + "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "pathfinder_path_utils" -version = "0.1.0" -source = "git+https://github.com/pcwalton/pathfinder#2ec2adf1c73d72e0d7fe44978d987dca6feda6f9" +version = "0.2.0" +source = "git+https://github.com/pcwalton/pathfinder#2e5b70805f8241ea6508eeca615c251170dca104" dependencies = [ "arrayvec 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)", - "lyon_geom 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lyon_path 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.66 (git+https://github.com/servo/serde?branch=deserialize_from_enums8)", + "lyon_path 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -923,11 +920,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "plane-split" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "binary-space-partition 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1051,7 +1048,7 @@ name = "ron" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1071,10 +1068,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde" -version = "1.0.66" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde_derive 1.0.66 (git+https://github.com/servo/serde?branch=deserialize_from_enums8)", + "serde_derive 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1082,13 +1079,13 @@ name = "serde_bytes" version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "serde_derive" -version = "1.0.66" -source = "git+https://github.com/servo/serde?branch=deserialize_from_enums8#c4457d804b38b14e699b45c01d1909f93f25ab5e" +version = "1.0.70" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1102,7 +1099,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "itoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1413,7 +1410,7 @@ dependencies = [ "core-graphics 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 10.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "dwrote 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)", "freetype 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1422,15 +1419,15 @@ dependencies = [ "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "mozangle 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", - "pathfinder_font_renderer 0.4.0 (git+https://github.com/pcwalton/pathfinder)", - "pathfinder_gfx_utils 0.1.0 (git+https://github.com/pcwalton/pathfinder)", - "pathfinder_partitioner 0.1.0 (git+https://github.com/pcwalton/pathfinder)", - "pathfinder_path_utils 0.1.0 (git+https://github.com/pcwalton/pathfinder)", - "plane-split 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "pathfinder_font_renderer 0.5.0 (git+https://github.com/pcwalton/pathfinder)", + "pathfinder_gfx_utils 0.2.0 (git+https://github.com/pcwalton/pathfinder)", + "pathfinder_partitioner 0.2.0 (git+https://github.com/pcwalton/pathfinder)", + "pathfinder_path_utils 0.2.0 (git+https://github.com/pcwalton/pathfinder)", + "plane-split 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "png 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "ron 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "thread_profiler 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1445,7 +1442,7 @@ version = "0.1.0" dependencies = [ "app_units 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "glutin 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1464,11 +1461,11 @@ dependencies = [ "core-foundation 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", "dwrote 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", "serde_bytes 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.66 (git+https://github.com/servo/serde?branch=deserialize_from_enums8)", + "serde_derive 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1544,7 +1541,7 @@ dependencies = [ "crossbeam 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "dwrote 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)", "font-loader 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "glutin 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1555,7 +1552,7 @@ dependencies = [ "osmesa-src 17.4.0-devel (git+https://github.com/jrmuizel/osmesa-src?branch=serialize)", "osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "ron 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "webrender 0.57.2", @@ -1620,6 +1617,11 @@ name = "yaml-rust" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" +[[patch.unused]] +name = "serde_derive" +version = "1.0.66" +source = "git+https://github.com/servo/serde?branch=deserialize_from_enums8#c4457d804b38b14e699b45c01d1909f93f25ab5e" + [metadata] "checksum adler32 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6cbd0b9af8587c72beadc9f72d35b9fbb070982c9e6203e46e93f10df25f8f45" "checksum aho-corasick 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d6531d44de723825aa81398a6415283229725a00fa30713812ab9323faa82fc4" @@ -1659,7 +1661,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum dwrote 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b26e30aaa6bf31ec830db15fec14ed04f0f2ecfcc486ecfce88c55d3389b237f" "checksum either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3be565ca5c557d7f59e7cfcf1844f9e3033650c929c6566f511e8005f205c1d0" "checksum env_logger 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0e6e40ebb0e66918a37b38c7acab4e10d299e0463fe2af5d29b9cc86710cfd2a" -"checksum euclid 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c95fd0d455f114291a3109286bd387bd423770058474a2d3f38b712cd661df60" +"checksum euclid 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)" = "59b34ec7d95d70d5cda27301d6182bc17abce8b5b52e260f5ff32c677923bbb0" "checksum expat-sys 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c470ccb972f2088549b023db8029ed9da9426f5affbf9b62efff7009ab8ed5b1" "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" "checksum font-loader 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd330f40acb3016432cbfa4c54b3d6e6e893a538df79d8df8fd8c26e21c36aaa" @@ -1695,8 +1697,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum lock_api 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "949826a5ccf18c1b3a7c3d57692778d21768b79e46eb9dd07bfc4c2160036c54" "checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" "checksum log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "89f010e843f2b1a31dbd316b3b8d443758bc634bed37aabade59c686d644e0a2" -"checksum lyon_geom 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1470fc1e16d6c3b2e86fb2b9abeb6984badcecddb9a3852c750bd0b35e83316f" -"checksum lyon_path 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "932fd3b7e8d2808f1833ddb753be4158107ffd9b7348f0e76c3ef5eb5d984da5" +"checksum lyon_geom 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "457347e05b9fef83dfa3b71775137313ef48de4bc0a20b354765233bc8c589ba" +"checksum lyon_path 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "98c39b845796d4590197e2b2b97202e31b69071116a541bfddb52f50680318f0" "checksum lzw 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084" "checksum malloc_buf 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" "checksum matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "100aabe6b8ff4e4a7e32c1c13523379802df0772b82466207ac25b013f193376" @@ -1722,13 +1724,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37" "checksum parking_lot 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "901d6514273469bb17380c1ac3f51fb3ce54be1f960e51a6f04901eba313ab8d" "checksum parking_lot_core 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "4db1a8ccf734a7bce794cc19b3df06ed87ab2f3907036b693c68f56b4d4537fa" -"checksum pathfinder_font_renderer 0.4.0 (git+https://github.com/pcwalton/pathfinder)" = "" -"checksum pathfinder_gfx_utils 0.1.0 (git+https://github.com/pcwalton/pathfinder)" = "" -"checksum pathfinder_partitioner 0.1.0 (git+https://github.com/pcwalton/pathfinder)" = "" -"checksum pathfinder_path_utils 0.1.0 (git+https://github.com/pcwalton/pathfinder)" = "" +"checksum pathfinder_font_renderer 0.5.0 (git+https://github.com/pcwalton/pathfinder)" = "" +"checksum pathfinder_gfx_utils 0.2.0 (git+https://github.com/pcwalton/pathfinder)" = "" +"checksum pathfinder_partitioner 0.2.0 (git+https://github.com/pcwalton/pathfinder)" = "" +"checksum pathfinder_path_utils 0.2.0 (git+https://github.com/pcwalton/pathfinder)" = "" "checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" "checksum pkg-config 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "110d5ee3593dbb73f56294327fe5668bcc997897097cbc76b51e7aed3f52452f" -"checksum plane-split 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7079b8485b4f9d9560dee7a69ca8f6ca781f9f284ff9d2bf27255d440b03e4af" +"checksum plane-split 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6e14382aabad89085fbf714f75d527492bb672725facb9b2ced2fada47cf418c" "checksum png 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f54b9600d584d3b8a739e1662a595fab051329eff43f20e7d8cc22872962145b" "checksum proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "effdb53b25cdad54f8f48843d67398f7ef2e14f12c1b4cb4effc549a6462a4d6" "checksum quick-error 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eda5fe9b71976e62bc81b781206aaa076401769b2143379d3eb2118388babac4" @@ -1746,9 +1748,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum safemem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e27a8b19b835f7aea908818e871f5cc3a5a186550c30773be987e155e8163d8f" "checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" -"checksum serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)" = "e9a2d9a9ac5120e0f768801ca2b58ad6eec929dc9d1d616c162f208869c2ce95" +"checksum serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)" = "0c3adf19c07af6d186d91dae8927b83b0553d07ca56cbf7f2f32560455c91920" "checksum serde_bytes 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)" = "adb6e51a6b3696b301bc221d785f898b4457c619b51d7ce195a6d20baecb37b3" -"checksum serde_derive 1.0.66 (git+https://github.com/servo/serde?branch=deserialize_from_enums8)" = "" +"checksum serde_derive 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)" = "3525a779832b08693031b8ecfb0de81cd71cfd3812088fafe9a7496789572124" "checksum serde_json 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)" = "f3ad6d546e765177cf3dded3c2e424a8040f870083a0e64064746b958ece9cb1" "checksum servo-fontconfig 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a088f8d775a5c5314aae09bd77340bc9c67d72b9a45258be34c83548b4814cd9" "checksum servo-fontconfig-sys 4.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "38b494f03009ee81914b0e7d387ad7c145cafcd69747c2ec89b0e17bb94f303a" diff --git a/direct-composition/Cargo.toml b/direct-composition/Cargo.toml index bec1a67e56..337d80a09a 100644 --- a/direct-composition/Cargo.toml +++ b/direct-composition/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Simon Sapin "] license = "MPL-2.0" [target.'cfg(windows)'.dependencies] -euclid = "0.17" +euclid = "0.18" gleam = "0.5" glutin = "0.17" mozangle = {version = "0.1", features = ["egl"]} diff --git a/examples/Cargo.toml b/examples/Cargo.toml index 1ceb2cc7b1..7e493758f7 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -59,7 +59,7 @@ debug = ["webrender/capture", "webrender/debugger", "webrender/profiler"] [dependencies] app_units = "0.6" env_logger = "0.5" -euclid = "0.17.3" +euclid = "0.18" gleam = "0.5" glutin = "0.17" rayon = "1" diff --git a/webrender/Cargo.toml b/webrender/Cargo.toml index b02c0492c2..1704e40242 100644 --- a/webrender/Cargo.toml +++ b/webrender/Cargo.toml @@ -24,14 +24,14 @@ bincode = "1.0" bitflags = "1.0" byteorder = "1.0" cfg-if = "0.1.2" -euclid = "0.17.3" +euclid = "0.18" fxhash = "0.2.1" gleam = "0.5" image = { optional = true, version = "0.19" } lazy_static = "1" log = "0.4" num-traits = "0.1.43" -plane-split = "0.9.1" +plane-split = "0.10.0" png = { optional = true, version = "0.12" } rayon = "1" ron = { optional = true, version = "0.1.7" } diff --git a/webrender/src/batch.rs b/webrender/src/batch.rs index 107f92f76d..f06d78ffc3 100644 --- a/webrender/src/batch.rs +++ b/webrender/src/batch.rs @@ -680,7 +680,7 @@ impl AlphaBatchBuilder { prim_index.0, ); - splitter.add(polygon); + splitter.add(polygon.expect("Should be a valid polygon")); return; } @@ -1697,7 +1697,7 @@ fn make_polygon( rect: LayoutRect, transform: &LayoutToWorldTransform, anchor: usize, -) -> Polygon { +) -> Option> { let mat = TypedTransform3D::row_major( transform.m11 as f64, transform.m12 as f64, @@ -1715,7 +1715,7 @@ fn make_polygon( transform.m42 as f64, transform.m43 as f64, transform.m44 as f64); - Polygon::from_transformed_rect(rect.cast().unwrap(), mat, anchor) + Polygon::from_transformed_rect(rect.cast(), mat, anchor) } /// Batcher managing draw calls into the clip mask (in the RT cache). diff --git a/webrender/src/picture.rs b/webrender/src/picture.rs index 45e2ec5e2a..bd069449d6 100644 --- a/webrender/src/picture.rs +++ b/webrender/src/picture.rs @@ -593,7 +593,7 @@ fn calculate_screen_uv( rendered_rect: &DeviceRect, device_pixel_scale: DevicePixelScale, ) -> DevicePoint { - let world_pos = transform.m.transform_point2d(local_pos); + let world_pos = transform.m.transform_point2d(local_pos).expect("Should get a valid point"); let mut device_pos = world_pos * device_pixel_scale; diff --git a/webrender/src/util.rs b/webrender/src/util.rs index c03bb02e92..4d6b703c28 100644 --- a/webrender/src/util.rs +++ b/webrender/src/util.rs @@ -267,10 +267,10 @@ pub fn calculate_screen_bounding_rect( ) } else { WorldRect::from_points(&[ - homogens[0].to_point2d(), - homogens[1].to_point2d(), - homogens[2].to_point2d(), - homogens[3].to_point2d(), + homogens[0].to_point2d().expect("Should be a valid point"), + homogens[1].to_point2d().expect("Should be a valid point"), + homogens[2].to_point2d().expect("Should be a valid point"), + homogens[3].to_point2d().expect("Should be a valid point"), ]) }; @@ -556,7 +556,9 @@ impl FastTransform { let new_point = *point + offset; TypedPoint2D::from_untyped(&new_point.to_untyped()) } - FastTransform::Transform { ref transform, .. } => transform.transform_point2d(point), + FastTransform::Transform { ref transform, .. } => { + transform.transform_point2d(point).expect("Should be a valid transformed point") + }, } } @@ -576,7 +578,9 @@ impl FastTransform { match *self { FastTransform::Offset(offset) => TypedRect::from_untyped(&rect.to_untyped().translate(&offset.to_untyped())), - FastTransform::Transform { ref transform, .. } => transform.transform_rect(rect), + FastTransform::Transform { ref transform, .. } => { + transform.transform_rect(rect).expect("Should be a valid transformed rect") + }, } } @@ -585,7 +589,7 @@ impl FastTransform { FastTransform::Offset(offset) => Some(TypedRect::from_untyped(&rect.to_untyped().translate(&-offset.to_untyped()))), FastTransform::Transform { inverse: Some(ref inverse), is_2d: true, .. } => - Some(inverse.transform_rect(rect)), + Some(inverse.transform_rect(rect)).expect("Should be a valid transformed rect"), FastTransform::Transform { ref transform, is_2d: false, .. } => Some(transform.inverse_rect_footprint(rect)), FastTransform::Transform { inverse: None, .. } => None, diff --git a/webrender_api/Cargo.toml b/webrender_api/Cargo.toml index df52c7d8f0..63034d3e48 100644 --- a/webrender_api/Cargo.toml +++ b/webrender_api/Cargo.toml @@ -17,9 +17,9 @@ bincode = "1.0" bitflags = "1.0" byteorder = "1.2.1" ipc-channel = {version = "0.10.0", optional = true} -euclid = { version = "0.17", features = ["serde"] } -serde = { version = "=1.0.66", features = ["rc"] } -serde_derive = { version = "=1.0.66", features = ["deserialize_in_place"] } +euclid = { version = "0.18", features = ["serde"] } +serde = { version = "=1.0.70", features = ["rc"] } +serde_derive = { version = "=1.0.70", features = ["deserialize_in_place"] } serde_bytes = "0.10" time = "0.1" diff --git a/wrench/Cargo.toml b/wrench/Cargo.toml index e7c47ddeee..e06661c187 100644 --- a/wrench/Cargo.toml +++ b/wrench/Cargo.toml @@ -10,7 +10,7 @@ base64 = "0.6" bincode = "1.0" byteorder = "1.0" env_logger = { version = "0.5", optional = true } -euclid = "0.17" +euclid = "0.18" gleam = "0.5" glutin = "0.17" app_units = "0.6"