From a3e3b4d48ffcb3f73eddc99dc0b565ea3c9ea1ff Mon Sep 17 00:00:00 2001 From: Mukilan Thiyagarajan Date: Sun, 25 Jun 2023 15:11:43 +0530 Subject: [PATCH] Update ipc-channel and other dependencies These updates will allow us to move to latest rustc nightly. Signed-off-by: Mukilan Thiyagarajan --- Cargo.lock | 128 +++++++++++++++++++----------------------------- Cargo.toml | 8 +-- servo-tidy.toml | 4 +- 3 files changed, 56 insertions(+), 84 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 58119abc5c03f..20bcaa2a47e19 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -255,7 +255,7 @@ name = "background_hang_monitor" version = "0.0.1" dependencies = [ "backtrace", - "crossbeam-channel 0.4.4", + "crossbeam-channel", "ipc-channel", "lazy_static", "libc", @@ -515,7 +515,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8e3ff9db740167616e528c509b3618046fc05d337f8f3182d300f4aa977d2bb" dependencies = [ - "crossbeam-utils 0.8.8", + "crossbeam-utils", "jobserver", "num_cpus", ] @@ -607,7 +607,7 @@ dependencies = [ "bitflags", "byteorder", "canvas_traits", - "crossbeam-channel 0.4.4", + "crossbeam-channel", "cssparser", "euclid", "fnv", @@ -643,7 +643,7 @@ dependencies = [ name = "canvas_traits" version = "0.0.1" dependencies = [ - "crossbeam-channel 0.4.4", + "crossbeam-channel", "cssparser", "euclid", "ipc-channel", @@ -851,7 +851,7 @@ name = "compositing" version = "0.0.1" dependencies = [ "canvas", - "crossbeam-channel 0.4.4", + "crossbeam-channel", "embedder_traits", "euclid", "fnv", @@ -895,7 +895,7 @@ dependencies = [ "bluetooth_traits", "canvas_traits", "compositing", - "crossbeam-channel 0.4.4", + "crossbeam-channel", "devtools_traits", "embedder_traits", "euclid", @@ -1057,22 +1057,12 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" -dependencies = [ - "crossbeam-utils 0.7.2", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.0" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.8", + "crossbeam-utils", ] [[package]] @@ -1083,7 +1073,7 @@ checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" dependencies = [ "cfg-if 1.0.0", "crossbeam-epoch", - "crossbeam-utils 0.8.8", + "crossbeam-utils", ] [[package]] @@ -1094,23 +1084,12 @@ checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1" dependencies = [ "autocfg", "cfg-if 1.0.0", - "crossbeam-utils 0.8.8", + "crossbeam-utils", "memoffset", "once_cell", "scopeguard", ] -[[package]] -name = "crossbeam-utils" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg", - "cfg-if 0.1.10", - "lazy_static", -] - [[package]] name = "crossbeam-utils" version = "0.8.8" @@ -1323,7 +1302,7 @@ dependencies = [ name = "devtools" version = "0.0.1" dependencies = [ - "crossbeam-channel 0.4.4", + "crossbeam-channel", "devtools_traits", "embedder_traits", "headers", @@ -1474,7 +1453,7 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" name = "embedder_traits" version = "0.0.1" dependencies = [ - "crossbeam-channel 0.4.4", + "crossbeam-channel", "ipc-channel", "keyboard-types", "lazy_static", @@ -2878,12 +2857,12 @@ dependencies = [ [[package]] name = "ipc-channel" -version = "0.14.1" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3698b8affd5656032a074a7d40b3c2a29b71971f3e1ff6042b9d40724e20d97c" +checksum = "342d636452fbc2895574e0b319b23c014fd01c9ed71dcd87f6a4a8e2f948db4b" dependencies = [ "bincode", - "crossbeam-channel 0.4.4", + "crossbeam-channel", "fnv", "lazy_static", "libc", @@ -2891,7 +2870,8 @@ dependencies = [ "rand 0.7.3", "serde", "tempfile", - "uuid 0.8.2", + "uuid 1.3.4", + "winapi", ] [[package]] @@ -3090,7 +3070,7 @@ version = "0.0.1" dependencies = [ "app_units", "atomic_refcell", - "crossbeam-channel 0.4.4", + "crossbeam-channel", "embedder_traits", "euclid", "fnv", @@ -3135,7 +3115,7 @@ version = "0.0.1" dependencies = [ "app_units", "atomic_refcell", - "crossbeam-channel 0.4.4", + "crossbeam-channel", "embedder_traits", "euclid", "fnv", @@ -3174,7 +3154,7 @@ dependencies = [ name = "layout_traits" version = "0.0.1" dependencies = [ - "crossbeam-channel 0.4.4", + "crossbeam-channel", "gfx", "ipc-channel", "metrics", @@ -3292,7 +3272,7 @@ dependencies = [ "canvas_traits", "compositing", "constellation", - "crossbeam-channel 0.4.4", + "crossbeam-channel", "devtools", "devtools_traits", "embedder_traits", @@ -3443,7 +3423,7 @@ dependencies = [ "accountable-refcell", "app_units", "content-security-policy", - "crossbeam-channel 0.4.4", + "crossbeam-channel", "cssparser", "euclid", "http", @@ -3504,12 +3484,6 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - [[package]] name = "media" version = "0.0.1" @@ -3858,7 +3832,7 @@ dependencies = [ "bytes 1.1.0", "content-security-policy", "cookie 0.12.0", - "crossbeam-channel 0.4.4", + "crossbeam-channel", "data-url", "devtools_traits", "embedder_traits", @@ -4651,7 +4625,7 @@ dependencies = [ name = "profile_traits" version = "0.0.1" dependencies = [ - "crossbeam-channel 0.4.4", + "crossbeam-channel", "ipc-channel", "log", "serde", @@ -4834,9 +4808,9 @@ version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" dependencies = [ - "crossbeam-channel 0.5.0", + "crossbeam-channel", "crossbeam-deque", - "crossbeam-utils 0.8.8", + "crossbeam-utils", "num_cpus", ] @@ -5017,7 +4991,7 @@ dependencies = [ "chrono", "content-security-policy", "cookie 0.12.0", - "crossbeam-channel 0.4.4", + "crossbeam-channel", "cssparser", "data-url", "deny_public_fields", @@ -5108,7 +5082,7 @@ dependencies = [ "app_units", "atomic_refcell", "canvas_traits", - "crossbeam-channel 0.4.4", + "crossbeam-channel", "euclid", "fxhash", "gfx_traits", @@ -5162,7 +5136,7 @@ dependencies = [ "bluetooth_traits", "canvas_traits", "cookie 0.12.0", - "crossbeam-channel 0.4.4", + "crossbeam-channel", "devtools_traits", "embedder_traits", "euclid", @@ -5339,7 +5313,7 @@ dependencies = [ name = "servo-gst-plugin" version = "0.0.1" dependencies = [ - "crossbeam-channel 0.4.4", + "crossbeam-channel", "euclid", "glib", "gst-plugin-version-helper", @@ -5363,7 +5337,7 @@ dependencies = [ [[package]] name = "servo-media" version = "0.1.0" -source = "git+https://github.com/servo/media#f53ac0a03a1413362e15d39d1527466986d13c94" +source = "git+https://github.com/servo/media#b6969ae19be67ec268da471ef516e61cfa1071df" dependencies = [ "servo-media-audio", "servo-media-player", @@ -5375,7 +5349,7 @@ dependencies = [ [[package]] name = "servo-media-audio" version = "0.2.0" -source = "git+https://github.com/servo/media#f53ac0a03a1413362e15d39d1527466986d13c94" +source = "git+https://github.com/servo/media#b6969ae19be67ec268da471ef516e61cfa1071df" dependencies = [ "boxfnonce", "byte-slice-cast", @@ -5397,7 +5371,7 @@ dependencies = [ [[package]] name = "servo-media-dummy" version = "0.1.0" -source = "git+https://github.com/servo/media#1ccb9c7ce0acc2637c84f31a1204b1d5798993b9" +source = "git+https://github.com/servo/media#b6969ae19be67ec268da471ef516e61cfa1071df" dependencies = [ "boxfnonce", "ipc-channel", @@ -5412,7 +5386,7 @@ dependencies = [ [[package]] name = "servo-media-gstreamer" version = "0.1.0" -source = "git+https://github.com/servo/media#1ccb9c7ce0acc2637c84f31a1204b1d5798993b9" +source = "git+https://github.com/servo/media#b6969ae19be67ec268da471ef516e61cfa1071df" dependencies = [ "boxfnonce", "byte-slice-cast", @@ -5448,7 +5422,7 @@ dependencies = [ [[package]] name = "servo-media-gstreamer-render" version = "0.1.0" -source = "git+https://github.com/servo/media#1ccb9c7ce0acc2637c84f31a1204b1d5798993b9" +source = "git+https://github.com/servo/media#b6969ae19be67ec268da471ef516e61cfa1071df" dependencies = [ "gstreamer", "gstreamer-video", @@ -5458,7 +5432,7 @@ dependencies = [ [[package]] name = "servo-media-gstreamer-render-android" version = "0.1.0" -source = "git+https://github.com/servo/media#1ccb9c7ce0acc2637c84f31a1204b1d5798993b9" +source = "git+https://github.com/servo/media#b6969ae19be67ec268da471ef516e61cfa1071df" dependencies = [ "glib", "gstreamer", @@ -5471,7 +5445,7 @@ dependencies = [ [[package]] name = "servo-media-gstreamer-render-unix" version = "0.1.0" -source = "git+https://github.com/servo/media#1ccb9c7ce0acc2637c84f31a1204b1d5798993b9" +source = "git+https://github.com/servo/media#b6969ae19be67ec268da471ef516e61cfa1071df" dependencies = [ "glib", "gstreamer", @@ -5484,7 +5458,7 @@ dependencies = [ [[package]] name = "servo-media-player" version = "0.1.0" -source = "git+https://github.com/servo/media#f53ac0a03a1413362e15d39d1527466986d13c94" +source = "git+https://github.com/servo/media#b6969ae19be67ec268da471ef516e61cfa1071df" dependencies = [ "ipc-channel", "serde", @@ -5496,7 +5470,7 @@ dependencies = [ [[package]] name = "servo-media-streams" version = "0.1.0" -source = "git+https://github.com/servo/media#f53ac0a03a1413362e15d39d1527466986d13c94" +source = "git+https://github.com/servo/media#b6969ae19be67ec268da471ef516e61cfa1071df" dependencies = [ "lazy_static", "uuid 0.8.2", @@ -5505,12 +5479,12 @@ dependencies = [ [[package]] name = "servo-media-traits" version = "0.1.0" -source = "git+https://github.com/servo/media#f53ac0a03a1413362e15d39d1527466986d13c94" +source = "git+https://github.com/servo/media#b6969ae19be67ec268da471ef516e61cfa1071df" [[package]] name = "servo-media-webrtc" version = "0.1.0" -source = "git+https://github.com/servo/media#f53ac0a03a1413362e15d39d1527466986d13c94" +source = "git+https://github.com/servo/media#b6969ae19be67ec268da471ef516e61cfa1071df" dependencies = [ "boxfnonce", "lazy_static", @@ -5588,7 +5562,7 @@ dependencies = [ [[package]] name = "servo_media_derive" version = "0.1.0" -source = "git+https://github.com/servo/media#f53ac0a03a1413362e15d39d1527466986d13c94" +source = "git+https://github.com/servo/media#b6969ae19be67ec268da471ef516e61cfa1071df" dependencies = [ "proc-macro2", "quote", @@ -6036,9 +6010,9 @@ dependencies = [ [[package]] name = "surfman" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4ebdfa54ba49e91f713e232973ca44ac493aa98e6fbf1366772ffdf9b9ddb3f" +checksum = "dbd3dcfe04d4c831b44a0159c72cc6f6cb1d62731e27e8c67d7fd81f1f5201a2" dependencies = [ "bitflags", "cfg_aliases", @@ -6066,9 +6040,9 @@ dependencies = [ [[package]] name = "surfman-chains" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b51e9d68bff975cc81ed92995691c9522c49a0531900b6548e7c5bbb8681cc79" +checksum = "896f2c9668d2b6b1cc6634bcba84b6e80147c2c9243dfde6dedf782756f9a19c" dependencies = [ "euclid", "fnv", @@ -6916,7 +6890,7 @@ dependencies = [ "base64 0.10.1", "compositing", "cookie 0.12.0", - "crossbeam-channel 0.4.4", + "crossbeam-channel", "euclid", "headers", "http", @@ -7047,11 +7021,11 @@ dependencies = [ [[package]] name = "webxr" version = "0.0.1" -source = "git+https://github.com/servo/webxr#a5824ed9674d60a507c8b8f8511cfdbbd68c92c6" +source = "git+https://github.com/servo/webxr#a4ba9de997703d3831a04f771d8d1b948e612b49" dependencies = [ "android_injected_glue", "bindgen", - "crossbeam-channel 0.4.4", + "crossbeam-channel", "euclid", "gl_generator 0.13.1", "gvr-sys", @@ -7067,7 +7041,7 @@ dependencies = [ [[package]] name = "webxr-api" version = "0.0.1" -source = "git+https://github.com/servo/webxr#a5824ed9674d60a507c8b8f8511cfdbbd68c92c6" +source = "git+https://github.com/servo/webxr#a4ba9de997703d3831a04f771d8d1b948e612b49" dependencies = [ "euclid", "ipc-channel", diff --git a/Cargo.toml b/Cargo.toml index db89ad5fa9be0..cc6358711212b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ encoding_rs = "0.8" euclid = "0.22" cookie = "0.12" content-security-policy = { version = "0.5", features = ["serde"]} -crossbeam-channel = "0.4" +crossbeam-channel = "0.5" cssparser = "0.29" darling = { version = "0.13", default-features = false } data-url = "0.1.0" @@ -38,7 +38,7 @@ hyper = "0.14" hyper_serde = "0.13" image = "0.24" indexmap = { version = "1.0.2", features = ["std"] } -ipc-channel = "0.14" +ipc-channel = "0.16" itertools = "0.8" keyboard-types = "0.6" lazy_static = "1.4" @@ -67,8 +67,8 @@ smallvec = "1.9" sparkle = "0.1.25" string_cache = "0.8" string_cache_codegen = "0.5" -surfman = "0.6" -surfman-chains = "0.7" +surfman = "0.7" +surfman-chains = "0.8" surfman-chains-api = "0.2" thin-slice = "0.1.0" time = "0.1.41" diff --git a/servo-tidy.toml b/servo-tidy.toml index 88c1b55397134..07f6e731a59f9 100644 --- a/servo-tidy.toml +++ b/servo-tidy.toml @@ -25,8 +25,6 @@ packages = [ "base64", "cfg-if", "cookie", - "crossbeam-channel", - "crossbeam-utils", "fixedbitset", "getrandom", "half", @@ -73,7 +71,7 @@ packages = [ # Duplicated by winit/surfman update. "raw-window-handle", - # Temporarily duplicated until ipc-channels and gleam can be upgrded. + # Temporarily duplicated until gleam can be upgraded. "uuid", ] # Files that are ignored for all tidy and lint checks.