diff --git a/Cargo.lock b/Cargo.lock index c1d21077c95..83d69e12ebc 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" @@ -248,6 +245,12 @@ dependencies = [ "byteorder", ] +[[package]] +name = "base64" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" + [[package]] name = "binary-space-partition" version = "0.1.2" @@ -954,19 +957,18 @@ 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", ] [[package]] name = "crossbeam-deque" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b18cd2e169ad86297e6bc0ad9aa679aee9daa4f19e8163860faf7c164e4f5a71" +checksum = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca" dependencies = [ "crossbeam-epoch", "crossbeam-utils", @@ -974,11 +976,11 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9" +checksum = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac" dependencies = [ - "arrayvec 0.4.6", + "autocfg", "cfg-if", "crossbeam-utils", "lazy_static", @@ -988,19 +990,21 @@ dependencies = [ [[package]] name = "crossbeam-queue" -version = "0.1.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b" +checksum = "c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db" dependencies = [ + "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.6.5" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8306fcef4a7b563b76b7dd949ca48f52bc1141aa067d2ea09565f3e2652aa5c" +checksum = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4" dependencies = [ + "autocfg", "cfg-if", "lazy_static", ] @@ -1482,28 +1486,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "failure" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9" -dependencies = [ - "backtrace", - "failure_derive", -] - -[[package]] -name = "failure_derive" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08" -dependencies = [ - "proc-macro2 1.0.1", - "quote 1.0.2", - "syn 1.0.3", - "synstructure", -] - [[package]] name = "fake-simd" version = "0.1.2" @@ -1612,12 +1594,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674" -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - [[package]] name = "fuchsia-zircon" version = "0.3.3" @@ -1650,6 +1626,21 @@ version = "0.1.28" 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" @@ -1660,6 +1651,56 @@ dependencies = [ "num_cpus", ] +[[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" @@ -1947,11 +1988,16 @@ dependencies = [ [[package]] name = "glib" -version = "0.8.0" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d70d737019da0473a7cd6d9240571cf58c6897dcb10edf32b90774f4ba237c1b" +checksum = "40fb573a09841b6386ddf15fd4bc6655b4f5b106ca962f57ecaecde32a0061c0" dependencies = [ "bitflags", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "futures-util", "glib-sys", "gobject-sys", "lazy_static", @@ -1960,9 +2006,9 @@ dependencies = [ [[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 +2103,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", @@ -2079,12 +2125,15 @@ dependencies = [ [[package]] name = "gstreamer" -version = "0.14.5" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa91e470b0cd4b05611f7d0e89caf76e39752156440877f04c23ad34ffc9761c" +checksum = "de425267c2d58db3ea9d513598bc5ff5458ca96041b86d8554366ff2e1e7667f" dependencies = [ "bitflags", "cfg-if", + "futures-channel", + "futures-core", + "futures-util", "glib", "glib-sys", "gobject-sys", @@ -2098,19 +2147,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", + "futures-core", + "futures-sink", "glib", "glib-sys", "gobject-sys", "gstreamer", "gstreamer-app-sys", "gstreamer-base", - "gstreamer-base-sys", "gstreamer-sys", + "lazy_static", "libc", ] @@ -2129,9 +2180,9 @@ 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", @@ -2140,7 +2191,10 @@ dependencies = [ "gobject-sys", "gstreamer", "gstreamer-audio-sys", + "gstreamer-base", + "gstreamer-base-sys", "gstreamer-sys", + "libc", ] [[package]] @@ -2159,9 +2213,9 @@ dependencies = [ [[package]] name = "gstreamer-base" -version = "0.14.0" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9e72a0456c51e9cf3a21c96539bed9be3f38c85ea49eee6d87a4d61db0cc2b0" +checksum = "4cc044450693b54c09a4563257566e6161a0055ffa9f908aa5788282984581ca" dependencies = [ "bitflags", "glib", @@ -2188,9 +2242,9 @@ dependencies = [ [[package]] name = "gstreamer-gl" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a7e54a021369cc93be69d2aaaab75e8916517bbc6de9d19f6584135df740580" +checksum = "7af26f75082a835541e09a347df10bf433533302e454487e532011e3c96d1d52" dependencies = [ "bitflags", "byteorder", @@ -2224,9 +2278,9 @@ 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", @@ -2255,9 +2309,9 @@ 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-sys", @@ -2294,11 +2348,13 @@ dependencies = [ [[package]] name = "gstreamer-video" -version = "0.14.0" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b3f0b864eced7c270c0e083a433128ddf65cda2409a5f400e1c7af3cb59858f" +checksum = "4bb63938bcd2e33285a6f195db8d719f3a13f568870d5bf168e2e3df18c1ea05" dependencies = [ "bitflags", + "futures-channel", + "futures-util", "glib", "glib-sys", "gobject-sys", @@ -2327,9 +2383,9 @@ 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-sys", @@ -2413,7 +2469,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "882ca7d8722f33ce2c2db44f95425d6267ed59ca96ce02acbe58320054ceb642" dependencies = [ - "base64", + "base64 0.10.1", "bitflags", "bytes", "headers-core", @@ -2658,7 +2714,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87fdeaaa9b5aacb83901de1bb66b32ec574a327758657404c1edf06f5a6ac0f0" dependencies = [ - "base64", + "base64 0.10.1", "futures", "http", "hyper", @@ -2691,9 +2747,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", @@ -3609,7 +3665,7 @@ checksum = "451a9a05d2a32c566c897835e0ea95cf79ed2fdfe957924045a1721a36c9980f" name = "net" version = "0.0.1" dependencies = [ - "base64", + "base64 0.10.1", "brotli", "bytes", "content-security-policy", @@ -4102,6 +4158,12 @@ dependencies = [ "siphasher", ] +[[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" @@ -4171,6 +4233,12 @@ dependencies = [ "syn 1.0.3", ] +[[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" @@ -4274,7 +4342,7 @@ dependencies = [ "getrandom", "libc", "rand_chacha", - "rand_core 0.5.1", + "rand_core", "rand_hc", "rand_pcg", ] @@ -4286,24 +4354,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" dependencies = [ "c2-chacha", - "rand_core 0.5.1", + "rand_core", ] -[[package]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - [[package]] name = "rand_core" version = "0.5.1" @@ -4319,7 +4372,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" dependencies = [ - "rand_core 0.5.1", + "rand_core", ] [[package]] @@ -4328,21 +4381,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8df6b0b3dc9991a10b2d91a86d1129314502169a1bf6afa67328945e02498b76" dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_os" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" -dependencies = [ - "cloudabi", - "fuchsia-cprng", - "libc", - "rand_core 0.4.2", - "rdrand", - "winapi", + "rand_core", ] [[package]] @@ -4351,7 +4390,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" dependencies = [ - "rand_core 0.5.1", + "rand_core", ] [[package]] @@ -4394,9 +4433,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a27732a533a1be0a0035a111fe76db89ad312f6f0347004c220c57f209a123" +checksum = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098" dependencies = [ "crossbeam-deque", "either", @@ -4405,9 +4444,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98dcf634205083b17d0861252431eb2acbfb698ab7478a2d20de07954f47ec7b" +checksum = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9" dependencies = [ "crossbeam-deque", "crossbeam-queue", @@ -4426,15 +4465,6 @@ dependencies = [ "rayon", ] -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", -] - [[package]] name = "redox_syscall" version = "0.1.17" @@ -4452,12 +4482,11 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.3.1" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ecedbca3bf205f8d8f5c2b44d83cd0690e39ee84b951ed649e9f1841132b66d" +checksum = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431" dependencies = [ - "failure", - "rand_os", + "getrandom", "redox_syscall", "rust-argon2", ] @@ -4559,20 +4588,21 @@ dependencies = [ [[package]] name = "rust-argon2" -version = "0.5.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf" +checksum = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017" dependencies = [ - "base64", + "base64 0.11.0", "blake2b_simd", + "constant_time_eq", "crossbeam-utils", ] [[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 +4620,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", @@ -4672,7 +4702,7 @@ dependencies = [ "accountable-refcell", "app_units", "backtrace", - "base64", + "base64 0.10.1", "bincode", "bitflags", "bluetooth_traits", @@ -5040,7 +5070,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 +5082,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 +5095,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,7 +5116,7 @@ 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", @@ -5121,7 +5152,7 @@ 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", @@ -5131,7 +5162,7 @@ dependencies = [ [[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", @@ -5144,7 +5175,7 @@ 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", @@ -5157,7 +5188,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 +5200,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 +5209,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 +5311,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", @@ -5294,7 +5325,7 @@ dependencies = [ "lazy_static", "log", "rand", - "rand_core 0.5.1", + "rand_core", "rand_isaac", "uuid", ] @@ -5504,6 +5535,12 @@ dependencies = [ "gl_generator 0.13.1", ] +[[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" @@ -6046,9 +6083,9 @@ dependencies = [ [[package]] name = "tokio-executor" -version = "0.1.8" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f27ee0e6db01c5f0b2973824547ce7e637b2ed79b891a9677b0de9bd532b6ac" +checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671" dependencies = [ "crossbeam-utils", "futures", @@ -6127,9 +6164,9 @@ dependencies = [ [[package]] name = "tokio-threadpool" -version = "0.1.16" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd2c6a3885302581f4401c82af70d792bb9df1700e7437b0aeb4ada94d5388c" +checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89" dependencies = [ "crossbeam-deque", "crossbeam-queue", @@ -6144,9 +6181,9 @@ dependencies = [ [[package]] name = "tokio-timer" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2106812d500ed25a4f38235b9cae8f78a09edf43203e16e59c3b769a342a60e" +checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296" dependencies = [ "crossbeam-utils", "futures", @@ -6510,7 +6547,7 @@ version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad517a7e5bb5228bee491b97f5c471b31606a42e89fda90a966d8245a4308e31" dependencies = [ - "base64", + "base64 0.10.1", "cookie", "http", "log", @@ -6529,7 +6566,7 @@ dependencies = [ name = "webdriver_server" version = "0.0.1" dependencies = [ - "base64", + "base64 0.10.1", "compositing", "cookie", "crossbeam-channel", @@ -6571,7 +6608,7 @@ name = "webrender" version = "0.60.0" source = "git+https://github.com/servo/webrender#edac864107cf43732ec66a9d3288e869a70ce1de" dependencies = [ - "base64", + "base64 0.10.1", "bincode", "bitflags", "byteorder", @@ -6675,7 +6712,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 +6733,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 f3892dc33c7..7504283a523 100644 --- a/components/constellation/constellation.rs +++ b/components/constellation/constellation.rs @@ -2566,7 +2566,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); } } @@ -2589,10 +2589,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."); @@ -4867,7 +4867,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 IpcReceiver where T: for<'de> Deserialize<'de> + Serialize, { - pub fn recv(&self) -> Result { + pub fn recv(&self) -> Result { time::profile( ProfilerCategory::IpcReceiver, None, @@ -30,7 +30,7 @@ where ) } - pub fn try_recv(&self) -> Result { + pub fn try_recv(&self) -> Result { self.ipc_receiver.try_recv() } @@ -59,7 +59,7 @@ pub struct IpcBytesReceiver { } impl IpcBytesReceiver { - pub fn recv(&self) -> Result, bincode::Error> { + pub fn recv(&self) -> Result, 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..dfe9569c635 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} @@ -90,7 +90,7 @@ webvr_traits = {path = "../webvr_traits"} webxr-api = {git = "https://github.com/servo/webxr"} webxr = {git = "https://github.com/servo/webxr"} surfman = { version = "0.1", features = ["sm-osmesa"] } -gstreamer = { version = "0.14.5", optional = true } +gstreamer = { version = "0.15", optional = true } [target.'cfg(all(not(target_os = "windows"), not(target_os = "ios"), not(target_os="android"), not(target_arch="arm"), not(target_arch="aarch64")))'.dependencies] gaol = "0.2.1" 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..5718f383f33 100644 --- a/ports/gstplugin/Cargo.toml +++ b/ports/gstplugin/Cargo.toml @@ -15,16 +15,16 @@ 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"] } -gstreamer = { version = "0.14", features = ["subclassing"] } -gstreamer-base = { version = "0.14", features = ["subclassing"] } -gstreamer-gl = { version = "0.14" } +glib = "0.9" +gstreamer = "0.15" +gstreamer-base = "0.15" +gstreamer-gl = "0.15" gstreamer-gl-sys = { version = "0.8", features = ["wayland"] } -gstreamer-sys = { version = "0.8" } -gstreamer-video = { version = "0.14", features = ["subclassing"] } +gstreamer-sys = "0.8" +gstreamer-video = "0.15" log = "0.4" lazy_static = "1.4" libservo = {path = "../../components/servo"} diff --git a/ports/gstplugin/servowebsrc.rs b/ports/gstplugin/servowebsrc.rs index fc2320ad0ba..d09b18fbf9b 100644 --- a/ports/gstplugin/servowebsrc.rs +++ b/ports/gstplugin/servowebsrc.rs @@ -12,7 +12,6 @@ use euclid::Rect; use euclid::Scale; use euclid::Size2D; -use glib::glib_bool_error; use glib::glib_object_impl; use glib::glib_object_subclass; use glib::object::Cast; @@ -110,6 +109,7 @@ use std::collections::HashMap; use std::convert::TryFrom; use std::ffi::c_void; use std::rc::Rc; +use std::str::FromStr; use std::sync::atomic::AtomicU64; use std::sync::atomic::Ordering; use std::sync::Mutex; @@ -519,7 +519,7 @@ impl ObjectSubclass for ServoWebSrc { env!("CARGO_PKG_AUTHORS"), ); - let src_caps = Caps::from_string(CAPS).unwrap(); + let src_caps = Caps::from_str(CAPS).unwrap(); let src_pad_template = PadTemplate::new("src", PadDirection::Src, PadPresence::Always, &src_caps).unwrap(); klass.add_pad_template(src_pad_template); @@ -546,7 +546,7 @@ impl ObjectImpl for ServoWebSrc { Property("url", ..) => { let mut guard = self.url.lock().expect("Failed to lock mutex"); let url = value.get().expect("Failed to get url value"); - *guard = Some(url); + *guard = url; }, _ => unimplemented!(), } @@ -572,14 +572,14 @@ impl BaseSrcImpl for ServoWebSrc { // Save the video info for later use let info = VideoInfo::from_caps(outcaps) - .ok_or_else(|| gst_loggable_error!(CATEGORY, "Failed to get video info"))?; + .map_err(|_| gst_loggable_error!(CATEGORY, "Failed to get video info"))?; *self.info.lock().unwrap() = Some(info); // Save the framerate if it is set let framerate = outcaps .get_structure(0) - .and_then(|cap| cap.get::("framerate")); - if let Some(framerate) = framerate { + .and_then(|cap| cap.get::("framerate").ok()); + if let Some(Some(framerate)) = framerate { let frame_duration_micros = 1_000_000 * *framerate.denom() as u64 / *framerate.numer() as u64; debug!("Setting frame duration to {}micros", frame_duration_micros); 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/ports/libsimpleservo/jniapi/Cargo.toml b/ports/libsimpleservo/jniapi/Cargo.toml index 953b1c1a4eb..c0f42bcec8d 100644 --- a/ports/libsimpleservo/jniapi/Cargo.toml +++ b/ports/libsimpleservo/jniapi/Cargo.toml @@ -16,7 +16,7 @@ bench = false [dependencies] android_injected_glue = "0.2" android_logger = "0.7" -gstreamer = "0.14.5" +gstreamer = "0.15" jni = "0.10.2" libc = "0.2" log = "0.4" diff --git a/servo-tidy.toml b/servo-tidy.toml index 006c3debf60..2de6bdc6a38 100644 --- a/servo-tidy.toml +++ b/servo-tidy.toml @@ -28,6 +28,7 @@ rand = [ # Ignored packages with duplicated versions packages = [ "arrayvec", + "base64", "cgl", "cocoa", "gleam", @@ -61,7 +62,6 @@ packages = [ "core-text", "dirs", "lyon_geom", - "rand_core", ] # Files that are ignored for all tidy and lint checks. files = [ 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"} diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini index 3b9abdec5a5..e54142f0257 100644 --- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini +++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini @@ -1,11 +1,7 @@ [audiobuffersource-multi-channels.html] - expected: ERROR - [Executing "initialize"] - expected: TIMEOUT - - [Audit report] - expected: NOTRUN - - [Executing "test"] - expected: NOTRUN - + [X Rendered audio for channel 5 does not equal [0,0.0626220703125,0.125030517578125,0.18695068359375,0.24810791015625,0.308319091796875,0.3673095703125,0.42486572265625,0.480743408203125,0.53472900390625,0.58660888671875,0.636199951171875,0.68328857421875,0.727691650390625,0.76922607421875,0.8077392578125...] with an element-wise tolerance of {"absoluteThreshold":0.000030517578125,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[1]\t3.6732959747314453e-1\t6.2622070312500000e-2\t3.0470752716064453e-1\t4.8658168859649127e+0\t3.0517578125000000e-5\n\t[2]\t6.8329977989196777e-1\t1.2503051757812500e-1\t5.5826926231384277e-1\t4.4650639949963384e+0\t3.0517578125000000e-5\n\t[3]\t9.0373212099075317e-1\t1.8695068359375000e-1\t7.1678143739700317e-1\t3.8340669508039502e+0\t3.0517578125000000e-5\n\t[4]\t9.9780619144439697e-1\t2.4810791015625000e-1\t7.4969828128814697e-1\t3.0216621502152523e+0\t3.0517578125000000e-5\n\t[5]\t9.5236867666244507e-1\t3.0831909179687500e-1\t6.4404958486557007e-1\t2.0889059484187866e+0\t3.0517578125000000e-5\n\t...and 44060 more errors.\n\tMax AbsError of 1.9961981773376465e+0 at index of 38383.\n\t[38383]\t-9.9879217147827148e-1\t9.9740600585937500e-1\t1.9961981773376465e+0\t2.0013897706758867e+0\t3.0517578125000000e-5\n\tMax RelError of Infinity at index of 1764.\n\t[1764]\t-5.8778524398803711e-1\t0.0000000000000000e+0\t5.8778524398803711e-1\tInfinity\t3.0517578125000000e-5\n] + expected: FAIL + [< [test] 1 out of 6 assertions were failed.] + expected: FAIL + [# AUDIT TASK RUNNER FINISHED: 1 out of 2 tasks were failed.] + expected: FAIL diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audioparam-interface/setTargetAtTime-after-event-within-block.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audioparam-interface/setTargetAtTime-after-event-within-block.html.ini new file mode 100644 index 00000000000..857f336ece3 --- /dev/null +++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audioparam-interface/setTargetAtTime-after-event-within-block.html.ini @@ -0,0 +1,3 @@ +[setTargetAtTime-after-event-within-block.html] + [Test setTargetAtTime after an event in the same processing block] + expected: FAIL diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audioparam-interface/setValueAtTime-within-block.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audioparam-interface/setValueAtTime-within-block.html.ini new file mode 100644 index 00000000000..da05fe2e316 --- /dev/null +++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audioparam-interface/setValueAtTime-within-block.html.ini @@ -0,0 +1,3 @@ +[setValueAtTime-within-block.html] + [Test setValueAtTime with start time not on a block boundary] + expected: FAIL