diff options
45 files changed, 361 insertions, 167 deletions
diff --git a/Cargo.lock b/Cargo.lock index c1d21077c95..1342c6a107a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -118,12 +118,9 @@ dependencies = [ [[package]] name = "array-init" -version = "0.0.4" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23589ecb866b460d3a0f1278834750268c607e8e28a1b982c907219f3178cd72" -dependencies = [ - "nodrop", -] +checksum = "f30bbe2f5e3d117f55bd8c7a1f9191e4a5deba9f15f595bbea4f670c59c765db" [[package]] name = "arrayref" @@ -954,12 +951,11 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.3.8" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0ed1a4de2235cabda8558ff5840bffb97fcb64c97827f354a451307df5f72b" +checksum = "acec9a3b0b3559f15aee4f90746c4e5e293b701c0f7d3925d24e01645267b68c" dependencies = [ - "crossbeam-utils", - "smallvec 0.6.10", + "crossbeam-utils 0.7.0", ] [[package]] @@ -969,7 +965,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b18cd2e169ad86297e6bc0ad9aa679aee9daa4f19e8163860faf7c164e4f5a71" dependencies = [ "crossbeam-epoch", - "crossbeam-utils", + "crossbeam-utils 0.6.5", ] [[package]] @@ -980,7 +976,7 @@ checksum = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9" dependencies = [ "arrayvec 0.4.6", "cfg-if", - "crossbeam-utils", + "crossbeam-utils 0.6.5", "lazy_static", "memoffset", "scopeguard", @@ -992,7 +988,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b" dependencies = [ - "crossbeam-utils", + "crossbeam-utils 0.6.5", ] [[package]] @@ -1006,6 +1002,17 @@ dependencies = [ ] [[package]] +name = "crossbeam-utils" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4" +dependencies = [ + "autocfg", + "cfg-if", + "lazy_static", +] + +[[package]] name = "cssparser" version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1651,6 +1658,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45dc39533a6cae6da2b56da48edae506bb767ec07370f86f70fc062e9d435869" [[package]] +name = "futures-channel" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0c77d04ce8edd9cb903932b608268b3fffec4163dc053b3b402bf47eac1f1a8" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f25592f769825e89b92358db00d26f965761e094951ac44d3663ef25b7ac464a" + +[[package]] name = "futures-cpupool" version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1661,6 +1683,56 @@ dependencies = [ ] [[package]] +name = "futures-executor" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f674f3e1bcb15b37284a90cedf55afdba482ab061c407a9c0ebbd0f3109741ba" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-macro" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a5081aa3de1f7542a794a397cde100ed903b0630152d0973479018fd85423a7" +dependencies = [ + "proc-macro-hack", + "proc-macro2 1.0.1", + "quote 1.0.2", + "syn 1.0.3", +] + +[[package]] +name = "futures-sink" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3466821b4bc114d95b087b850a724c6f83115e929bc88f1fa98a3304a944c8a6" + +[[package]] +name = "futures-task" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b0a34e53cf6cdcd0178aa573aed466b646eb3db769570841fda0c7ede375a27" + +[[package]] +name = "futures-util" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22766cf25d64306bedf0384da004d05c9974ab104fcc4528f1236181c18004c5" +dependencies = [ + "futures-core", + "futures-macro", + "futures-task", + "pin-utils", + "proc-macro-hack", + "proc-macro-nested", + "slab", +] + +[[package]] name = "fxhash" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1959,10 +2031,28 @@ dependencies = [ ] [[package]] +name = "glib" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40fb573a09841b6386ddf15fd4bc6655b4f5b106ca962f57ecaecde32a0061c0" +dependencies = [ + "bitflags", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "futures-util", + "glib-sys", + "gobject-sys", + "lazy_static", + "libc", +] + +[[package]] name = "glib-sys" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b86a9169fbc9cf9a0ef315039c2304b09d5c575c5fde7defba3576a0311b863" +checksum = "95856f3802f446c05feffa5e24859fe6a183a7cb849c8449afc35c86b1e316e2" dependencies = [ "libc", "pkg-config", @@ -2057,9 +2147,9 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61d55bc9202447ca776f6ad0048c36e3312010f66f82ab478e97513e93f3604b" +checksum = "31d1a804f62034eccf370006ccaef3708a71c31d561fee88564abe71177553d9" dependencies = [ "glib-sys", "libc", @@ -2085,7 +2175,29 @@ checksum = "fa91e470b0cd4b05611f7d0e89caf76e39752156440877f04c23ad34ffc9761c" dependencies = [ "bitflags", "cfg-if", - "glib", + "glib 0.8.0", + "glib-sys", + "gobject-sys", + "gstreamer-sys", + "lazy_static", + "libc", + "muldiv", + "num-rational", + "paste", +] + +[[package]] +name = "gstreamer" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de425267c2d58db3ea9d513598bc5ff5458ca96041b86d8554366ff2e1e7667f" +dependencies = [ + "bitflags", + "cfg-if", + "futures-channel", + "futures-core", + "futures-util", + "glib 0.9.3", "glib-sys", "gobject-sys", "gstreamer-sys", @@ -2098,19 +2210,21 @@ dependencies = [ [[package]] name = "gstreamer-app" -version = "0.14.0" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a85485c2db4149ccb24d0b3c6598725743dec254bf757ac7a3684e62b9822c27" +checksum = "0a4eea6e5859a73c20ce8074f910316ceaf919f483fafd563de9e836177706b7" dependencies = [ "bitflags", - "glib", + "futures-core", + "futures-sink", + "glib 0.9.3", "glib-sys", "gobject-sys", - "gstreamer", + "gstreamer 0.15.3", "gstreamer-app-sys", - "gstreamer-base", - "gstreamer-base-sys", + "gstreamer-base 0.15.3", "gstreamer-sys", + "lazy_static", "libc", ] @@ -2129,18 +2243,21 @@ dependencies = [ [[package]] name = "gstreamer-audio" -version = "0.14.0" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d4f0bddc4c983105f3a0666d6e3abc88a72aad3d3b862816ed7f8c86aa3e833" +checksum = "6176dbe5c1c28e8739ffe14f5667b6a8a086e5960ce83fe84fad99bee98f2879" dependencies = [ "array-init", "bitflags", - "glib", + "glib 0.9.3", "glib-sys", "gobject-sys", - "gstreamer", + "gstreamer 0.15.3", "gstreamer-audio-sys", + "gstreamer-base 0.15.3", + "gstreamer-base-sys", "gstreamer-sys", + "libc", ] [[package]] @@ -2164,10 +2281,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9e72a0456c51e9cf3a21c96539bed9be3f38c85ea49eee6d87a4d61db0cc2b0" dependencies = [ "bitflags", - "glib", + "glib 0.8.0", + "glib-sys", + "gobject-sys", + "gstreamer 0.14.5", + "gstreamer-base-sys", + "gstreamer-sys", + "libc", +] + +[[package]] +name = "gstreamer-base" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cc044450693b54c09a4563257566e6161a0055ffa9f908aa5788282984581ca" +dependencies = [ + "bitflags", + "glib 0.9.3", "glib-sys", "gobject-sys", - "gstreamer", + "gstreamer 0.15.3", "gstreamer-base-sys", "gstreamer-sys", "libc", @@ -2194,14 +2327,35 @@ checksum = "3a7e54a021369cc93be69d2aaaab75e8916517bbc6de9d19f6584135df740580" dependencies = [ "bitflags", "byteorder", - "glib", + "glib 0.8.0", "glib-sys", "gobject-sys", - "gstreamer", - "gstreamer-base", + "gstreamer 0.14.5", + "gstreamer-base 0.14.0", "gstreamer-gl-sys", "gstreamer-sys", - "gstreamer-video", + "gstreamer-video 0.14.0", + "gstreamer-video-sys", + "lazy_static", + "libc", +] + +[[package]] +name = "gstreamer-gl" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7af26f75082a835541e09a347df10bf433533302e454487e532011e3c96d1d52" +dependencies = [ + "bitflags", + "byteorder", + "glib 0.9.3", + "glib-sys", + "gobject-sys", + "gstreamer 0.15.3", + "gstreamer-base 0.15.3", + "gstreamer-gl-sys", + "gstreamer-sys", + "gstreamer-video 0.15.3", "gstreamer-video-sys", "lazy_static", "libc", @@ -2224,18 +2378,18 @@ dependencies = [ [[package]] name = "gstreamer-player" -version = "0.14.0" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78395f87de2b954ca3e33a594a4eb85e68246f5f41a70bf0ab52187aacb4d3a9" +checksum = "11840a08baf63d5e2b4c94cc25c023cbfccb39f02e920c75b0550b975898be3b" dependencies = [ "bitflags", - "glib", + "glib 0.9.3", "glib-sys", "gobject-sys", - "gstreamer", + "gstreamer 0.15.3", "gstreamer-player-sys", "gstreamer-sys", - "gstreamer-video", + "gstreamer-video 0.15.3", "libc", ] @@ -2255,14 +2409,14 @@ dependencies = [ [[package]] name = "gstreamer-sdp" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e680156e5a488eda9ebd6081c0141386ef72bb81e3f0e6a2ca0c3129d82ac2" +checksum = "674df58b85cb077a357c581c29796fbeb5aa36e8362269807a11f938e5c7b973" dependencies = [ - "glib", + "glib 0.9.3", "glib-sys", "gobject-sys", - "gstreamer", + "gstreamer 0.15.3", "gstreamer-sdp-sys", "gstreamer-sys", ] @@ -2299,11 +2453,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b3f0b864eced7c270c0e083a433128ddf65cda2409a5f400e1c7af3cb59858f" dependencies = [ "bitflags", - "glib", + "glib 0.8.0", "glib-sys", "gobject-sys", - "gstreamer", - "gstreamer-base", + "gstreamer 0.14.5", + "gstreamer-base 0.14.0", + "gstreamer-base-sys", + "gstreamer-sys", + "gstreamer-video-sys", + "lazy_static", + "libc", +] + +[[package]] +name = "gstreamer-video" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bb63938bcd2e33285a6f195db8d719f3a13f568870d5bf168e2e3df18c1ea05" +dependencies = [ + "bitflags", + "futures-channel", + "futures-util", + "glib 0.9.3", + "glib-sys", + "gobject-sys", + "gstreamer 0.15.3", + "gstreamer-base 0.15.3", "gstreamer-base-sys", "gstreamer-sys", "gstreamer-video-sys", @@ -2327,14 +2502,14 @@ dependencies = [ [[package]] name = "gstreamer-webrtc" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e085c2c1ddfbbf91459c950d10b40e7acef1f8661f6e86aa4d40edfef91cd167" +checksum = "e64235af90676896b01f3cbe50808fefaf498057ca288ce4a31a89de81464e04" dependencies = [ - "glib", + "glib 0.9.3", "glib-sys", "gobject-sys", - "gstreamer", + "gstreamer 0.15.3", "gstreamer-sdp", "gstreamer-sys", "gstreamer-webrtc-sys", @@ -2691,9 +2866,9 @@ dependencies = [ [[package]] name = "ipc-channel" -version = "0.12.2" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5172208c1dfd469c409af6d159bd9137ce463285a978b7fad464518edd8ee3f8" +checksum = "55162cbe44dacbc0b4a66d1067c885a9d5975f068a432801bba0493e1ece7a51" dependencies = [ "bincode", "crossbeam-channel", @@ -3101,7 +3276,7 @@ dependencies = [ "gaol", "gfx", "gleam 0.6.18", - "gstreamer", + "gstreamer 0.14.5", "ipc-channel", "keyboard-types", "layout_thread_2013", @@ -4103,6 +4278,12 @@ dependencies = [ ] [[package]] +name = "pin-utils" +version = "0.1.0-alpha.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5894c618ce612a3fa23881b152b608bafb8c56cfc22f434a3ba3120b40f7b587" + +[[package]] name = "pixels" version = "0.0.1" dependencies = [ @@ -4172,6 +4353,12 @@ dependencies = [ ] [[package]] +name = "proc-macro-nested" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "369a6ed065f249a159e06c45752c780bda2fb53c995718f9e484d08daa9eb42e" + +[[package]] name = "proc-macro2" version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4411,7 +4598,7 @@ checksum = "98dcf634205083b17d0861252431eb2acbfb698ab7478a2d20de07954f47ec7b" dependencies = [ "crossbeam-deque", "crossbeam-queue", - "crossbeam-utils", + "crossbeam-utils 0.6.5", "lazy_static", "num_cpus", ] @@ -4565,14 +4752,14 @@ checksum = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf" dependencies = [ "base64", "blake2b_simd", - "crossbeam-utils", + "crossbeam-utils 0.6.5", ] [[package]] name = "rust-webvr" -version = "0.16.1" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6b96369ececa6950facfd205150ff9f83a13cc5b6e521f38f2c103cdcdcccf" +checksum = "feaf62b8a5271e024d426548d61d26b588e476b1b631af31f960f9995cdb8257" dependencies = [ "bindgen", "euclid", @@ -4590,9 +4777,9 @@ dependencies = [ [[package]] name = "rust-webvr-api" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f862b3325fac0dc55d4b9edc0f740e647e833534718b5d55472581f810e6b9e9" +checksum = "aeb2bc6eabb244825b6667e68ffe30e4647d629ba81f68f798ad9e4cec753edf" dependencies = [ "android_injected_glue", "ipc-channel", @@ -5019,14 +5206,14 @@ dependencies = [ "crossbeam-channel", "euclid", "gleam 0.6.18", - "glib", + "glib 0.8.0", "gst-plugin-version-helper", - "gstreamer", - "gstreamer-base", - "gstreamer-gl", + "gstreamer 0.14.5", + "gstreamer-base 0.14.0", + "gstreamer-gl 0.14.0", "gstreamer-gl-sys", "gstreamer-sys", - "gstreamer-video", + "gstreamer-video 0.14.0", "lazy_static", "libservo", "log", @@ -5040,7 +5227,7 @@ dependencies = [ [[package]] name = "servo-media" version = "0.1.0" -source = "git+https://github.com/servo/media#220ed1388f2ba008b05f5e94aca21dd14aa37290" +source = "git+https://github.com/servo/media#03c7420794b7d1bb80e50e03eaf3ae6e55f446ac" dependencies = [ "servo-media-audio", "servo-media-player", @@ -5052,7 +5239,7 @@ dependencies = [ [[package]] name = "servo-media-audio" version = "0.1.0" -source = "git+https://github.com/servo/media#220ed1388f2ba008b05f5e94aca21dd14aa37290" +source = "git+https://github.com/servo/media#03c7420794b7d1bb80e50e03eaf3ae6e55f446ac" dependencies = [ "boxfnonce", "byte-slice-cast", @@ -5065,12 +5252,13 @@ dependencies = [ "servo-media-traits", "servo_media_derive", "smallvec 0.6.10", + "speexdsp-resampler", ] [[package]] name = "servo-media-dummy" version = "0.1.0" -source = "git+https://github.com/servo/media#5380170bb42286ce9009d83e1034904bea8f00ee" +source = "git+https://github.com/servo/media#03c7420794b7d1bb80e50e03eaf3ae6e55f446ac" dependencies = [ "boxfnonce", "ipc-channel", @@ -5085,20 +5273,20 @@ dependencies = [ [[package]] name = "servo-media-gstreamer" version = "0.1.0" -source = "git+https://github.com/servo/media#220ed1388f2ba008b05f5e94aca21dd14aa37290" +source = "git+https://github.com/servo/media#03c7420794b7d1bb80e50e03eaf3ae6e55f446ac" dependencies = [ "boxfnonce", "byte-slice-cast", - "glib", + "glib 0.9.3", "glib-sys", - "gstreamer", + "gstreamer 0.15.3", "gstreamer-app", "gstreamer-audio", - "gstreamer-base", + "gstreamer-base 0.15.3", "gstreamer-player", "gstreamer-sdp", "gstreamer-sys", - "gstreamer-video", + "gstreamer-video 0.15.3", "gstreamer-webrtc", "ipc-channel", "lazy_static", @@ -5121,22 +5309,22 @@ dependencies = [ [[package]] name = "servo-media-gstreamer-render" version = "0.1.0" -source = "git+https://github.com/servo/media#220ed1388f2ba008b05f5e94aca21dd14aa37290" +source = "git+https://github.com/servo/media#03c7420794b7d1bb80e50e03eaf3ae6e55f446ac" dependencies = [ - "gstreamer", - "gstreamer-video", + "gstreamer 0.15.3", + "gstreamer-video 0.15.3", "servo-media-player", ] [[package]] name = "servo-media-gstreamer-render-android" version = "0.1.0" -source = "git+https://github.com/servo/media#220ed1388f2ba008b05f5e94aca21dd14aa37290" +source = "git+https://github.com/servo/media#03c7420794b7d1bb80e50e03eaf3ae6e55f446ac" dependencies = [ - "glib", - "gstreamer", - "gstreamer-gl", - "gstreamer-video", + "glib 0.9.3", + "gstreamer 0.15.3", + "gstreamer-gl 0.15.0", + "gstreamer-video 0.15.3", "servo-media-gstreamer-render", "servo-media-player", ] @@ -5144,12 +5332,12 @@ dependencies = [ [[package]] name = "servo-media-gstreamer-render-unix" version = "0.1.0" -source = "git+https://github.com/servo/media#220ed1388f2ba008b05f5e94aca21dd14aa37290" +source = "git+https://github.com/servo/media#03c7420794b7d1bb80e50e03eaf3ae6e55f446ac" dependencies = [ - "glib", - "gstreamer", - "gstreamer-gl", - "gstreamer-video", + "glib 0.9.3", + "gstreamer 0.15.3", + "gstreamer-gl 0.15.0", + "gstreamer-video 0.15.3", "servo-media-gstreamer-render", "servo-media-player", ] @@ -5157,7 +5345,7 @@ dependencies = [ [[package]] name = "servo-media-player" version = "0.1.0" -source = "git+https://github.com/servo/media#220ed1388f2ba008b05f5e94aca21dd14aa37290" +source = "git+https://github.com/servo/media#03c7420794b7d1bb80e50e03eaf3ae6e55f446ac" dependencies = [ "ipc-channel", "serde", @@ -5169,7 +5357,7 @@ dependencies = [ [[package]] name = "servo-media-streams" version = "0.1.0" -source = "git+https://github.com/servo/media#220ed1388f2ba008b05f5e94aca21dd14aa37290" +source = "git+https://github.com/servo/media#03c7420794b7d1bb80e50e03eaf3ae6e55f446ac" dependencies = [ "lazy_static", "uuid", @@ -5178,12 +5366,12 @@ dependencies = [ [[package]] name = "servo-media-traits" version = "0.1.0" -source = "git+https://github.com/servo/media#220ed1388f2ba008b05f5e94aca21dd14aa37290" +source = "git+https://github.com/servo/media#03c7420794b7d1bb80e50e03eaf3ae6e55f446ac" [[package]] name = "servo-media-webrtc" version = "0.1.0" -source = "git+https://github.com/servo/media#220ed1388f2ba008b05f5e94aca21dd14aa37290" +source = "git+https://github.com/servo/media#03c7420794b7d1bb80e50e03eaf3ae6e55f446ac" dependencies = [ "boxfnonce", "log", @@ -5280,7 +5468,7 @@ dependencies = [ [[package]] name = "servo_media_derive" version = "0.1.0" -source = "git+https://github.com/servo/media#220ed1388f2ba008b05f5e94aca21dd14aa37290" +source = "git+https://github.com/servo/media#03c7420794b7d1bb80e50e03eaf3ae6e55f446ac" dependencies = [ "proc-macro2 1.0.1", "quote 1.0.2", @@ -5422,7 +5610,7 @@ dependencies = [ "android_injected_glue", "android_logger", "cc", - "gstreamer", + "gstreamer 0.14.5", "jni", "libc", "log", @@ -5505,6 +5693,12 @@ dependencies = [ ] [[package]] +name = "speexdsp-resampler" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b72d540d5c565dbe1f891d7e21ceb21d2649508306782f1066989fccb0b363d3" + +[[package]] name = "spirv_cross" version = "0.16.0" source = "git+https://github.com/servo/spirv_cross?branch=wgpu-servo#636677bad724797789239c16e6d332e9b4d97b86" @@ -6050,7 +6244,7 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f27ee0e6db01c5f0b2973824547ce7e637b2ed79b891a9677b0de9bd532b6ac" dependencies = [ - "crossbeam-utils", + "crossbeam-utils 0.6.5", "futures", ] @@ -6133,7 +6327,7 @@ checksum = "2bd2c6a3885302581f4401c82af70d792bb9df1700e7437b0aeb4ada94d5388c" dependencies = [ "crossbeam-deque", "crossbeam-queue", - "crossbeam-utils", + "crossbeam-utils 0.6.5", "futures", "lazy_static", "log", @@ -6148,7 +6342,7 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2106812d500ed25a4f38235b9cae8f78a09edf43203e16e59c3b769a342a60e" dependencies = [ - "crossbeam-utils", + "crossbeam-utils 0.6.5", "futures", "slab", "tokio-executor", @@ -6675,7 +6869,7 @@ dependencies = [ [[package]] name = "webxr" version = "0.0.1" -source = "git+https://github.com/servo/webxr#cf4d37611b91b1cab71af26d0ce7243001c224ae" +source = "git+https://github.com/servo/webxr#2841497966d87bbd561f18ea66547dde9b13962f" dependencies = [ "bindgen", "euclid", @@ -6696,7 +6890,7 @@ dependencies = [ [[package]] name = "webxr-api" version = "0.0.1" -source = "git+https://github.com/servo/webxr#cf4d37611b91b1cab71af26d0ce7243001c224ae" +source = "git+https://github.com/servo/webxr#2841497966d87bbd561f18ea66547dde9b13962f" dependencies = [ "euclid", "ipc-channel", diff --git a/components/background_hang_monitor/Cargo.toml b/components/background_hang_monitor/Cargo.toml index 0b2e3cea7ac..0214d73fc1b 100644 --- a/components/background_hang_monitor/Cargo.toml +++ b/components/background_hang_monitor/Cargo.toml @@ -14,12 +14,12 @@ doctest = false [dependencies] backtrace = "0.3" -ipc-channel = "0.12" +ipc-channel = "0.14" libc = "0.2" log = "0.4" msg = {path = "../msg"} serde_json = "1.0" -crossbeam-channel = "0.3" +crossbeam-channel = "0.4" [dev-dependencies] lazy_static = "1.0" diff --git a/components/bluetooth/Cargo.toml b/components/bluetooth/Cargo.toml index 0ce769fdc03..56f4c8f1e4a 100644 --- a/components/bluetooth/Cargo.toml +++ b/components/bluetooth/Cargo.toml @@ -15,7 +15,7 @@ bitflags = "1.0" bluetooth_traits = {path = "../bluetooth_traits"} device = {git = "https://github.com/servo/devices", features = ["bluetooth-test"]} embedder_traits = {path = "../embedder_traits"} -ipc-channel = "0.12" +ipc-channel = "0.14" log = "0.4" servo_config = {path = "../config"} servo_rand = {path = "../rand"} diff --git a/components/bluetooth/lib.rs b/components/bluetooth/lib.rs index 5c54860d9e3..f882d640679 100644 --- a/components/bluetooth/lib.rs +++ b/components/bluetooth/lib.rs @@ -407,7 +407,7 @@ impl BluetoothManager { match ipc_receiver.recv() { Ok(result) => result, Err(e) => { - warn!("Failed to receive files from embedder ({}).", e); + warn!("Failed to receive files from embedder ({:?}).", e); None }, } diff --git a/components/bluetooth_traits/Cargo.toml b/components/bluetooth_traits/Cargo.toml index 2f5802b93ce..5dd2015dfec 100644 --- a/components/bluetooth_traits/Cargo.toml +++ b/components/bluetooth_traits/Cargo.toml @@ -11,7 +11,7 @@ name = "bluetooth_traits" path = "lib.rs" [dependencies] -ipc-channel = "0.12" +ipc-channel = "0.14" regex = "1.1" serde = "1.0" embedder_traits = { path = "../embedder_traits" } diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml index e35d2dd6a2f..7d6c63aae04 100644 --- a/components/canvas/Cargo.toml +++ b/components/canvas/Cargo.toml @@ -21,14 +21,14 @@ azure = {git = "https://github.com/servo/rust-azure", optional = true} bitflags = "1.0" byteorder = "1" canvas_traits = {path = "../canvas_traits"} -crossbeam-channel = "0.3" +crossbeam-channel = "0.4" cssparser = "0.27" embedder_traits = {path = "../embedder_traits"} euclid = "0.20" fnv = "1.0" gleam = "0.6.7" half = "1" -ipc-channel = "0.12" +ipc-channel = "0.14" log = "0.4" num-traits = "0.2" raqote = {git = "https://github.com/jrmuizel/raqote", optional = true} diff --git a/components/canvas_traits/Cargo.toml b/components/canvas_traits/Cargo.toml index 3cd3adb6443..7e0f3a92b2e 100644 --- a/components/canvas_traits/Cargo.toml +++ b/components/canvas_traits/Cargo.toml @@ -14,10 +14,10 @@ path = "lib.rs" webgl_backtrace = [] [dependencies] -crossbeam-channel = "0.3" +crossbeam-channel = "0.4" cssparser = "0.27" euclid = "0.20" -ipc-channel = "0.12" +ipc-channel = "0.14" lazy_static = "1" malloc_size_of = { path = "../malloc_size_of" } malloc_size_of_derive = "0.1" diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml index c1c9244cda5..057090d3dda 100644 --- a/components/compositing/Cargo.toml +++ b/components/compositing/Cargo.toml @@ -16,13 +16,13 @@ default = [] gl = ["gleam", "pixels"] [dependencies] -crossbeam-channel = "0.3" +crossbeam-channel = "0.4" embedder_traits = {path = "../embedder_traits"} euclid = "0.20" gfx_traits = {path = "../gfx_traits"} gleam = {version = "0.6", optional = true} image = "0.22" -ipc-channel = "0.12" +ipc-channel = "0.14" libc = "0.2" keyboard-types = "0.4.3" log = "0.4" @@ -31,7 +31,7 @@ net_traits = {path = "../net_traits"} num-traits = "0.2" pixels = {path = "../pixels", optional = true} profile_traits = {path = "../profile_traits"} -rust-webvr = {version = "0.16", features = ["mock", "openvr", "vrexternal"]} +rust-webvr = {version = "0.17", features = ["mock", "openvr", "vrexternal"]} script_traits = {path = "../script_traits"} servo_geometry = {path = "../geometry"} servo-media = {git = "https://github.com/servo/media"} diff --git a/components/constellation/Cargo.toml b/components/constellation/Cargo.toml index d832cb59e2c..b60850a7488 100644 --- a/components/constellation/Cargo.toml +++ b/components/constellation/Cargo.toml @@ -16,7 +16,7 @@ backtrace = "0.3" bluetooth_traits = { path = "../bluetooth_traits" } canvas_traits = {path = "../canvas_traits"} compositing = {path = "../compositing"} -crossbeam-channel = "0.3" +crossbeam-channel = "0.4" debugger = {path = "../debugger"} devtools_traits = {path = "../devtools_traits"} euclid = "0.20" @@ -24,7 +24,7 @@ embedder_traits = { path = "../embedder_traits" } gfx = {path = "../gfx"} gfx_traits = {path = "../gfx_traits"} http = "0.1" -ipc-channel = "0.12" +ipc-channel = "0.14" layout_traits = {path = "../layout_traits"} keyboard-types = "0.4.3" log = "0.4" diff --git a/components/constellation/constellation.rs b/components/constellation/constellation.rs index 4151c803599..d037a3b3124 100644 --- a/components/constellation/constellation.rs +++ b/components/constellation/constellation.rs @@ -2563,7 +2563,7 @@ where for receiver in receivers { if let Err(e) = receiver.recv() { - warn!("Failed to receive exit response from WebGPU ({})", e); + warn!("Failed to receive exit response from WebGPU ({:?})", e); } } @@ -2586,10 +2586,10 @@ where // Receive exit signals from threads. if let Err(e) = core_receiver.recv() { - warn!("Exit resource thread failed ({})", e); + warn!("Exit resource thread failed ({:?})", e); } if let Err(e) = storage_receiver.recv() { - warn!("Exit storage thread failed ({})", e); + warn!("Exit storage thread failed ({:?})", e); } debug!("Asking compositor to complete shutdown."); @@ -4838,7 +4838,7 @@ where warn!("Failed to send GetCurrentEpoch ({}).", e); } match epoch_receiver.recv() { - Err(e) => warn!("Failed to receive current epoch ({}).", e), + Err(e) => warn!("Failed to receive current epoch ({:?}).", e), Ok(layout_thread_epoch) => { if layout_thread_epoch != *compositor_epoch { return ReadyToSave::EpochMismatch; diff --git a/components/constellation/pipeline.rs b/components/constellation/pipeline.rs index e81f1ab58ae..c56d49962ee 100644 --- a/components/constellation/pipeline.rs +++ b/components/constellation/pipeline.rs @@ -400,7 +400,7 @@ impl Pipeline { self.compositor_proxy .send(CompositorMsg::PipelineExited(self.id, sender)); if let Err(e) = receiver.recv() { - warn!("Sending exit message failed ({}).", e); + warn!("Sending exit message failed ({:?}).", e); } } diff --git a/components/debugger/Cargo.toml b/components/debugger/Cargo.toml index 3d0e542b209..41f9714f41b 100644 --- a/components/debugger/Cargo.toml +++ b/components/debugger/Cargo.toml @@ -12,6 +12,6 @@ path = "lib.rs" crate_type = ["rlib"] [dependencies] -crossbeam-channel = "0.3" +crossbeam-channel = "0.4" log = "0.4" ws = "0.9" diff --git a/components/devtools/Cargo.toml b/components/devtools/Cargo.toml index 87380e66aa2..69d440f0f7a 100644 --- a/components/devtools/Cargo.toml +++ b/components/devtools/Cargo.toml @@ -11,13 +11,13 @@ name = "devtools" path = "lib.rs" [dependencies] -crossbeam-channel = "0.3" +crossbeam-channel = "0.4" devtools_traits = {path = "../devtools_traits"} embedder_traits = {path = "../embedder_traits"} headers = "0.2" http = "0.1" hyper = "0.12" -ipc-channel = "0.12" +ipc-channel = "0.14" log = "0.4" msg = {path = "../msg"} serde = "1.0" diff --git a/components/devtools_traits/Cargo.toml b/components/devtools_traits/Cargo.toml index 53287d05b33..01a3b7a1498 100644 --- a/components/devtools_traits/Cargo.toml +++ b/components/devtools_traits/Cargo.toml @@ -13,7 +13,7 @@ path = "lib.rs" [dependencies] bitflags = "1.0" http = "0.1" -ipc-channel = "0.12" +ipc-channel = "0.14" malloc_size_of = { path = "../malloc_size_of" } malloc_size_of_derive = "0.1" msg = {path = "../msg"} diff --git a/components/embedder_traits/Cargo.toml b/components/embedder_traits/Cargo.toml index bbb7fe98a74..c7febfb7c5b 100644 --- a/components/embedder_traits/Cargo.toml +++ b/components/embedder_traits/Cargo.toml @@ -11,8 +11,8 @@ name = "embedder_traits" path = "lib.rs" [dependencies] -crossbeam-channel = "0.3" -ipc-channel = "0.12" +crossbeam-channel = "0.4" +ipc-channel = "0.14" keyboard-types = "0.4.3" lazy_static = "1" log = "0.4" diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml index 08e0e4d6cc7..42082e76310 100644 --- a/components/gfx/Cargo.toml +++ b/components/gfx/Cargo.toml @@ -21,7 +21,7 @@ fnv = "1.0" fontsan = {git = "https://github.com/servo/fontsan"} gfx_traits = {path = "../gfx_traits"} harfbuzz-sys = "0.3" -ipc-channel = "0.12" +ipc-channel = "0.14" lazy_static = "1" libc = "0.2" log = "0.4" diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml index b45aebed3b4..063e24559fa 100644 --- a/components/layout/Cargo.toml +++ b/components/layout/Cargo.toml @@ -17,7 +17,7 @@ app_units = "0.7" atomic_refcell = "0.1" bitflags = "1.0" canvas_traits = {path = "../canvas_traits"} -crossbeam-channel = "0.3" +crossbeam-channel = "0.4" embedder_traits = {path = "../embedder_traits"} euclid = "0.20" fnv = "1.0" @@ -25,7 +25,7 @@ fxhash = "0.2" gfx = {path = "../gfx"} gfx_traits = {path = "../gfx_traits"} html5ever = "0.25" -ipc-channel = "0.12" +ipc-channel = "0.14" lazy_static = "1" libc = "0.2" log = "0.4" diff --git a/components/layout_2020/Cargo.toml b/components/layout_2020/Cargo.toml index dcf59991f57..d75d12e20c8 100644 --- a/components/layout_2020/Cargo.toml +++ b/components/layout_2020/Cargo.toml @@ -21,7 +21,7 @@ euclid = "0.20" fnv = "1.0" gfx = {path = "../gfx"} gfx_traits = {path = "../gfx_traits"} -ipc-channel = "0.12" +ipc-channel = "0.14" libc = "0.2" msg = {path = "../msg"} mitochondria = "1.1.2" diff --git a/components/layout_thread/Cargo.toml b/components/layout_thread/Cargo.toml index 39c30794901..4f7a21fb781 100644 --- a/components/layout_thread/Cargo.toml +++ b/components/layout_thread/Cargo.toml @@ -13,7 +13,7 @@ path = "lib.rs" [dependencies] app_units = "0.7" atomic_refcell = "0.1" -crossbeam-channel = "0.3" +crossbeam-channel = "0.4" embedder_traits = {path = "../embedder_traits"} euclid = "0.20" fnv = "1.0" @@ -22,7 +22,7 @@ gfx = {path = "../gfx"} gfx_traits = {path = "../gfx_traits"} histogram = "0.6.8" html5ever = "0.25" -ipc-channel = "0.12" +ipc-channel = "0.14" layout = {path = "../layout", package = "layout_2013"} layout_traits = {path = "../layout_traits"} lazy_static = "1" diff --git a/components/layout_thread_2020/Cargo.toml b/components/layout_thread_2020/Cargo.toml index df93ff10e13..ea05d02b113 100644 --- a/components/layout_thread_2020/Cargo.toml +++ b/components/layout_thread_2020/Cargo.toml @@ -13,7 +13,7 @@ path = "lib.rs" [dependencies] app_units = "0.7" atomic_refcell = "0.1" -crossbeam-channel = "0.3" +crossbeam-channel = "0.4" embedder_traits = {path = "../embedder_traits"} euclid = "0.20" fnv = "1.0" @@ -21,7 +21,7 @@ fxhash = "0.2" gfx = {path = "../gfx"} gfx_traits = {path = "../gfx_traits"} html5ever = "0.25" -ipc-channel = "0.12" +ipc-channel = "0.14" layout = {path = "../layout_2020", package = "layout_2020"} layout_traits = {path = "../layout_traits"} lazy_static = "1" diff --git a/components/layout_traits/Cargo.toml b/components/layout_traits/Cargo.toml index a320a77263a..e1a3ff6419e 100644 --- a/components/layout_traits/Cargo.toml +++ b/components/layout_traits/Cargo.toml @@ -11,10 +11,10 @@ name = "layout_traits" path = "lib.rs" [dependencies] -crossbeam-channel = "0.3" +crossbeam-channel = "0.4" euclid = "0.20" gfx = {path = "../gfx"} -ipc-channel = "0.12" +ipc-channel = "0.14" metrics = {path = "../metrics"} msg = {path = "../msg"} net_traits = {path = "../net_traits"} diff --git a/components/malloc_size_of/Cargo.toml b/components/malloc_size_of/Cargo.toml index c33175ad026..ed589373e09 100644 --- a/components/malloc_size_of/Cargo.toml +++ b/components/malloc_size_of/Cargo.toml @@ -30,7 +30,7 @@ servo = [ accountable-refcell = { version = "0.2.0", optional = true } app_units = "0.7" content-security-policy = {version = "0.3.0", features = ["serde"], optional = true} -crossbeam-channel = { version = "0.3", optional = true } +crossbeam-channel = { version = "0.4", optional = true } cssparser = "0.27" euclid = "0.20" hashglobe = { path = "../hashglobe" } diff --git a/components/media/Cargo.toml b/components/media/Cargo.toml index 7a72cf43d49..5e3bd85a3aa 100644 --- a/components/media/Cargo.toml +++ b/components/media/Cargo.toml @@ -13,7 +13,7 @@ path = "lib.rs" [dependencies] euclid = "0.20" fnv = "1.0" -ipc-channel = "0.12" +ipc-channel = "0.14" lazy_static = "1" log = "0.4" serde = "1.0" diff --git a/components/metrics/Cargo.toml b/components/metrics/Cargo.toml index fb7747474c8..3bfb79fc4d9 100644 --- a/components/metrics/Cargo.toml +++ b/components/metrics/Cargo.toml @@ -12,7 +12,7 @@ path = "lib.rs" [dependencies] gfx_traits = {path = "../gfx_traits"} -ipc-channel = "0.12" +ipc-channel = "0.14" log = "0.4" malloc_size_of = { path = "../malloc_size_of" } malloc_size_of_derive = "0.1" diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml index 5dc55caf521..edbddfa3190 100644 --- a/components/msg/Cargo.toml +++ b/components/msg/Cargo.toml @@ -14,7 +14,7 @@ doctest = false [dependencies] lazy_static = "1" -ipc-channel = "0.12" +ipc-channel = "0.14" malloc_size_of = { path = "../malloc_size_of" } malloc_size_of_derive = "0.1" parking_lot = "0.9" diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml index eec4da35e78..db3b1193374 100644 --- a/components/net/Cargo.toml +++ b/components/net/Cargo.toml @@ -20,7 +20,7 @@ brotli = "3" bytes = "0.4" content-security-policy = {version = "0.3.0", features = ["serde"]} cookie_rs = {package = "cookie", version = "0.11"} -crossbeam-channel = "0.3" +crossbeam-channel = "0.4" data-url = "0.1.0" devtools_traits = {path = "../devtools_traits"} embedder_traits = { path = "../embedder_traits" } @@ -32,7 +32,7 @@ hyper = "0.12" hyper_serde = "0.11" hyper-openssl = "0.7" immeta = "0.4" -ipc-channel = "0.12" +ipc-channel = "0.14" lazy_static = "1" libflate = "0.1" log = "0.4" diff --git a/components/net/filemanager_thread.rs b/components/net/filemanager_thread.rs index d765c37ce32..2e6ce832394 100644 --- a/components/net/filemanager_thread.rs +++ b/components/net/filemanager_thread.rs @@ -481,7 +481,7 @@ impl FileManagerStore { match ipc_receiver.recv() { Ok(result) => result, Err(e) => { - warn!("Failed to receive files from embedder ({}).", e); + warn!("Failed to receive files from embedder ({:?}).", e); None }, } diff --git a/components/net_traits/Cargo.toml b/components/net_traits/Cargo.toml index 9fcd39fd5e5..e749467a594 100644 --- a/components/net_traits/Cargo.toml +++ b/components/net_traits/Cargo.toml @@ -21,7 +21,7 @@ http = "0.1" hyper = "0.12" hyper_serde = "0.11" piston_image = {package = "image", version = "0.22"} -ipc-channel = "0.12" +ipc-channel = "0.14" lazy_static = "1" log = "0.4" malloc_size_of = { path = "../malloc_size_of" } diff --git a/components/profile/Cargo.toml b/components/profile/Cargo.toml index 7e695acaa28..1a5bab4dd2d 100644 --- a/components/profile/Cargo.toml +++ b/components/profile/Cargo.toml @@ -13,7 +13,7 @@ path = "lib.rs" [dependencies] profile_traits = {path = "../profile_traits"} influent = "0.5" -ipc-channel = "0.12" +ipc-channel = "0.14" heartbeats-simple = "0.4" log = "0.4" serde = "1.0" diff --git a/components/profile_traits/Cargo.toml b/components/profile_traits/Cargo.toml index 97d4d55f89f..dc45ab23f1b 100644 --- a/components/profile_traits/Cargo.toml +++ b/components/profile_traits/Cargo.toml @@ -15,10 +15,10 @@ energy-profiling = ["energymon", "energy-monitor"] [dependencies] bincode = "1" -crossbeam-channel = "0.3" +crossbeam-channel = "0.4" energy-monitor = {version = "0.2.0", optional = true} energymon = {git = "https://github.com/energymon/energymon-rust.git", optional = true} -ipc-channel = "0.12" +ipc-channel = "0.14" log = "0.4" serde = "1.0" servo_config = {path = "../config"} diff --git a/components/profile_traits/ipc.rs b/components/profile_traits/ipc.rs index e1dedb4b17f..5da5ef3e592 100644 --- a/components/profile_traits/ipc.rs +++ b/components/profile_traits/ipc.rs @@ -21,7 +21,7 @@ impl<T> IpcReceiver<T> where T: for<'de> Deserialize<'de> + Serialize, { - pub fn recv(&self) -> Result<T, bincode::Error> { + pub fn recv(&self) -> Result<T, ipc::IpcError> { time::profile( ProfilerCategory::IpcReceiver, None, @@ -30,7 +30,7 @@ where ) } - pub fn try_recv(&self) -> Result<T, bincode::Error> { + pub fn try_recv(&self) -> Result<T, ipc::TryRecvError> { self.ipc_receiver.try_recv() } @@ -59,7 +59,7 @@ pub struct IpcBytesReceiver { } impl IpcBytesReceiver { - pub fn recv(&self) -> Result<Vec<u8>, bincode::Error> { + pub fn recv(&self) -> Result<Vec<u8>, ipc::IpcError> { time::profile( ProfilerCategory::IpcBytesReceiver, None, diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 8a200bc375f..086b9981302 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -44,7 +44,7 @@ caseless = "0.2" content-security-policy = {version = "0.3.0", features = ["serde"]} cookie = "0.11" chrono = "0.4" -crossbeam-channel = "0.3" +crossbeam-channel = "0.4" cssparser = "0.27" deny_public_fields = {path = "../deny_public_fields"} devtools_traits = {path = "../devtools_traits"} @@ -62,7 +62,7 @@ hyper = "0.12" hyper_serde = "0.11" image = "0.22" indexmap = "1.0.2" -ipc-channel = "0.12" +ipc-channel = "0.14" itertools = "0.8" jstraceable_derive = {path = "../jstraceable_derive"} js = {package = "mozjs", git = "https://github.com/servo/rust-mozjs"} diff --git a/components/script_layout_interface/Cargo.toml b/components/script_layout_interface/Cargo.toml index 6adc14a1b27..8f759970c62 100644 --- a/components/script_layout_interface/Cargo.toml +++ b/components/script_layout_interface/Cargo.toml @@ -14,11 +14,11 @@ path = "lib.rs" app_units = "0.7" atomic_refcell = "0.1" canvas_traits = {path = "../canvas_traits"} -crossbeam-channel = "0.3" +crossbeam-channel = "0.4" euclid = "0.20" gfx_traits = {path = "../gfx_traits"} html5ever = "0.25" -ipc-channel = "0.12" +ipc-channel = "0.14" libc = "0.2" malloc_size_of = { path = "../malloc_size_of" } malloc_size_of_derive = "0.1" diff --git a/components/script_traits/Cargo.toml b/components/script_traits/Cargo.toml index 6b540a98c2b..fa5c11370c0 100644 --- a/components/script_traits/Cargo.toml +++ b/components/script_traits/Cargo.toml @@ -14,7 +14,7 @@ path = "lib.rs" bluetooth_traits = {path = "../bluetooth_traits"} canvas_traits = {path = "../canvas_traits"} cookie = "0.11" -crossbeam-channel = "0.3" +crossbeam-channel = "0.4" devtools_traits = {path = "../devtools_traits"} embedder_traits = {path = "../embedder_traits"} euclid = "0.20" @@ -22,7 +22,7 @@ gfx_traits = {path = "../gfx_traits"} http = "0.1" hyper = "0.12" hyper_serde = "0.11" -ipc-channel = "0.12" +ipc-channel = "0.14" keyboard-types = "0.4.3" libc = "0.2" log = "0.4" diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml index fd4cc3f8c4d..6f196183ace 100644 --- a/components/servo/Cargo.toml +++ b/components/servo/Cargo.toml @@ -48,7 +48,7 @@ canvas = {path = "../canvas", default-features = false} canvas_traits = {path = "../canvas_traits"} compositing = {path = "../compositing", features = ["gl"]} constellation = {path = "../constellation"} -crossbeam-channel = "0.3" +crossbeam-channel = "0.4" debugger = {path = "../debugger"} devtools = {path = "../devtools"} devtools_traits = {path = "../devtools_traits"} @@ -57,7 +57,7 @@ env_logger = "0.6" euclid = "0.20" gfx = {path = "../gfx"} gleam = "0.6" -ipc-channel = "0.12" +ipc-channel = "0.14" keyboard-types = "0.4" layout_thread_2013 = {path = "../layout_thread", optional = true} layout_thread_2020 = {path = "../layout_thread_2020", optional = true} diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml index 367161c3da0..f580d55b084 100644 --- a/components/style/Cargo.toml +++ b/components/style/Cargo.toml @@ -34,7 +34,7 @@ atomic_refcell = "0.1" bitflags = "1.0" byteorder = "1.0" cssparser = "0.27" -crossbeam-channel = { version = "0.3", optional = true } +crossbeam-channel = { version = "0.4", optional = true } derive_more = "0.99" new_debug_unreachable = "1.0" encoding_rs = {version = "0.8", optional = true} diff --git a/components/webdriver_server/Cargo.toml b/components/webdriver_server/Cargo.toml index e023a2fc377..44033207ece 100644 --- a/components/webdriver_server/Cargo.toml +++ b/components/webdriver_server/Cargo.toml @@ -14,11 +14,11 @@ path = "lib.rs" base64 = "0.10" compositing = {path = "../compositing"} cookie = "0.11" -crossbeam-channel = "0.3" +crossbeam-channel = "0.4" euclid = "0.20" hyper = "0.12" image = "0.22" -ipc-channel = "0.12" +ipc-channel = "0.14" keyboard-types = "0.4.3" log = "0.4" msg = {path = "../msg"} diff --git a/components/webgpu/Cargo.toml b/components/webgpu/Cargo.toml index bdae2522a77..2de49927ad3 100644 --- a/components/webgpu/Cargo.toml +++ b/components/webgpu/Cargo.toml @@ -12,7 +12,7 @@ path = "lib.rs" [dependencies] embedder_traits = {path = "../embedder_traits"} -ipc-channel = "0.12" +ipc-channel = "0.14" log = "0.4" malloc_size_of = { path = "../malloc_size_of" } serde = "1.0" diff --git a/components/webvr/Cargo.toml b/components/webvr/Cargo.toml index 02b65782e82..9f713245519 100644 --- a/components/webvr/Cargo.toml +++ b/components/webvr/Cargo.toml @@ -17,13 +17,13 @@ oculusvr = ['rust-webvr/oculusvr'] [dependencies] canvas_traits = {path = "../canvas_traits"} compositing = {path = "../compositing"} -crossbeam-channel = "0.3" +crossbeam-channel = "0.4" euclid = "0.20" -ipc-channel = "0.12" +ipc-channel = "0.14" log = "0.4" msg = {path = "../msg"} -rust-webvr = {version = "0.16", features = ["mock", "openvr", "vrexternal"]} -rust-webvr-api = "0.16" +rust-webvr = {version = "0.17", features = ["mock", "openvr", "vrexternal"]} +rust-webvr-api = "0.17" servo_config = {path = "../config"} sparkle = "0.1" webvr_traits = {path = "../webvr_traits" } diff --git a/components/webvr_traits/Cargo.toml b/components/webvr_traits/Cargo.toml index a9a49cd59e0..21627877ac8 100644 --- a/components/webvr_traits/Cargo.toml +++ b/components/webvr_traits/Cargo.toml @@ -11,7 +11,7 @@ name = "webvr_traits" path = "lib.rs" [dependencies] -ipc-channel = "0.12" +ipc-channel = "0.14" msg = {path = "../msg"} -rust-webvr-api = {version = "0.16", features = ["ipc"]} +rust-webvr-api = {version = "0.17", features = ["ipc"]} serde = "1.0" diff --git a/ports/glutin/Cargo.toml b/ports/glutin/Cargo.toml index 3e8cb38f560..455f0da4b86 100644 --- a/ports/glutin/Cargo.toml +++ b/ports/glutin/Cargo.toml @@ -60,7 +60,7 @@ lazy_static = "1" libservo = {path = "../../components/servo"} libc = "0.2" log = "0.4" -rust-webvr = { version = "0.16", features = ["glwindow"] } +rust-webvr = { version = "0.17", features = ["glwindow"] } servo-media = {git = "https://github.com/servo/media"} shellwords = "1.0.0" tinyfiledialogs = "3.0" diff --git a/ports/gstplugin/Cargo.toml b/ports/gstplugin/Cargo.toml index 04393709477..3d7683205ef 100644 --- a/ports/gstplugin/Cargo.toml +++ b/ports/gstplugin/Cargo.toml @@ -15,7 +15,7 @@ crate-type = ["cdylib"] path = "lib.rs" [dependencies] -crossbeam-channel = "0.3" +crossbeam-channel = "0.4" euclid = "0.20" gleam = "0.6" glib = { version = "0.8", features = ["subclassing"] } diff --git a/ports/libmlservo/Cargo.toml b/ports/libmlservo/Cargo.toml index 4c4ef0e8b1b..4173db9ad4e 100644 --- a/ports/libmlservo/Cargo.toml +++ b/ports/libmlservo/Cargo.toml @@ -22,7 +22,7 @@ layout-2020 = ["simpleservo/layout-2020"] [dependencies] libservo = { path = "../../components/servo", features = ["no_static_freetype"] } simpleservo = { path = "../libsimpleservo/api", features = ["no_static_freetype"] } -rust-webvr = { version = "0.16", features = ["magicleap"] } +rust-webvr = { version = "0.17", features = ["magicleap"] } webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] } webxr = { git = "https://github.com/servo/webxr", features = ["ipc", "magicleap"] } libc = "0.2" diff --git a/tests/unit/metrics/Cargo.toml b/tests/unit/metrics/Cargo.toml index b59271958e5..86b0c2d10c1 100644 --- a/tests/unit/metrics/Cargo.toml +++ b/tests/unit/metrics/Cargo.toml @@ -12,7 +12,7 @@ doctest = false [dependencies] gfx_traits = {path = "../../../components/gfx_traits"} -ipc-channel = "0.12" +ipc-channel = "0.14" metrics = {path = "../../../components/metrics"} msg = {path = "../../../components/msg"} profile_traits = {path = "../../../components/profile_traits"} diff --git a/tests/unit/profile/Cargo.toml b/tests/unit/profile/Cargo.toml index f011ce3f483..829bdfd3a2c 100644 --- a/tests/unit/profile/Cargo.toml +++ b/tests/unit/profile/Cargo.toml @@ -11,7 +11,7 @@ path = "lib.rs" doctest = false [dependencies] -ipc-channel = "0.12" +ipc-channel = "0.14" profile = {path = "../../../components/profile"} profile_traits = {path = "../../../components/profile_traits"} servo_config = {path = "../../../components/config"} |