From 79cceab06442acc26ad1316d1e5fb9f9cfebddce Mon Sep 17 00:00:00 2001 From: Martin Robinson Date: Tue, 31 Oct 2023 12:06:05 +0100 Subject: [PATCH] Update `ipc-channels` (#30660) Along with an update to `webxr` and `media` this allows us to finally get rid of our forked version of `mio` 0.6. --- Cargo.lock | 100 +++++++++--------------------------------------- Cargo.toml | 5 +-- servo-tidy.toml | 1 - 3 files changed, 20 insertions(+), 86 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 650a113b76f..73c7f74ddcd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1847,22 +1847,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" -[[package]] -name = "fuchsia-zircon" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" -dependencies = [ - "bitflags 1.3.2", - "fuchsia-zircon-sys", -] - -[[package]] -name = "fuchsia-zircon-sys" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" - [[package]] name = "futf" version = "0.1.5" @@ -2855,27 +2839,18 @@ dependencies = [ "libc", ] -[[package]] -name = "iovec" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -dependencies = [ - "libc", -] - [[package]] name = "ipc-channel" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa880a385267ce3f1d466400b1b83ffb2bd9a3341f02392de5c7d528c2a307e6" +checksum = "7ab3a34c91b7e84a72643bd75d1bac3afd241f78f9859fe0b5e5b2a6a75732c2" dependencies = [ "bincode", "crossbeam-channel", "fnv", "lazy_static", "libc", - "mio 0.6.22", + "mio", "rand", "serde", "tempfile", @@ -3602,23 +3577,6 @@ dependencies = [ "simd-adler32", ] -[[package]] -name = "mio" -version = "0.6.22" -source = "git+https://github.com/servo/mio.git?branch=servo-mio-0.6.22#f640fd662db03026ca2a1b21ac1e161ec6f8150b" -dependencies = [ - "cfg-if 0.1.10", - "fuchsia-zircon", - "fuchsia-zircon-sys", - "iovec", - "libc", - "log", - "miow", - "net2", - "slab", - "winapi", -] - [[package]] name = "mio" version = "0.8.8" @@ -3631,15 +3589,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi", -] - [[package]] name = "mozangle" version = "0.4.0" @@ -3817,17 +3766,6 @@ dependencies = [ "webrender_api", ] -[[package]] -name = "net2" -version = "0.2.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b13b648036a2339d06de780866fbdfda0dde886de7b3af2ddeba8b14f4ee34ac" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "winapi", -] - [[package]] name = "net_traits" version = "0.0.1" @@ -5136,7 +5074,7 @@ dependencies = [ [[package]] name = "servo-media" version = "0.1.0" -source = "git+https://github.com/servo/media#af97a686de711c44f0e13fd4ace824c7b0a2e2e2" +source = "git+https://github.com/servo/media#8ea11a849d5c2f0e469d1d1ccad93a74fbd81462" dependencies = [ "servo-media-audio", "servo-media-player", @@ -5148,7 +5086,7 @@ dependencies = [ [[package]] name = "servo-media-audio" version = "0.2.0" -source = "git+https://github.com/servo/media#af97a686de711c44f0e13fd4ace824c7b0a2e2e2" +source = "git+https://github.com/servo/media#8ea11a849d5c2f0e469d1d1ccad93a74fbd81462" dependencies = [ "boxfnonce", "byte-slice-cast", @@ -5170,7 +5108,7 @@ dependencies = [ [[package]] name = "servo-media-dummy" version = "0.1.0" -source = "git+https://github.com/servo/media#af97a686de711c44f0e13fd4ace824c7b0a2e2e2" +source = "git+https://github.com/servo/media#8ea11a849d5c2f0e469d1d1ccad93a74fbd81462" dependencies = [ "boxfnonce", "ipc-channel", @@ -5185,7 +5123,7 @@ dependencies = [ [[package]] name = "servo-media-gstreamer" version = "0.1.0" -source = "git+https://github.com/servo/media#af97a686de711c44f0e13fd4ace824c7b0a2e2e2" +source = "git+https://github.com/servo/media#8ea11a849d5c2f0e469d1d1ccad93a74fbd81462" dependencies = [ "boxfnonce", "byte-slice-cast", @@ -5219,7 +5157,7 @@ dependencies = [ [[package]] name = "servo-media-gstreamer-render" version = "0.1.0" -source = "git+https://github.com/servo/media#af97a686de711c44f0e13fd4ace824c7b0a2e2e2" +source = "git+https://github.com/servo/media#8ea11a849d5c2f0e469d1d1ccad93a74fbd81462" dependencies = [ "gstreamer", "gstreamer-video", @@ -5229,7 +5167,7 @@ dependencies = [ [[package]] name = "servo-media-gstreamer-render-android" version = "0.1.0" -source = "git+https://github.com/servo/media#af97a686de711c44f0e13fd4ace824c7b0a2e2e2" +source = "git+https://github.com/servo/media#8ea11a849d5c2f0e469d1d1ccad93a74fbd81462" dependencies = [ "glib", "gstreamer", @@ -5242,7 +5180,7 @@ dependencies = [ [[package]] name = "servo-media-gstreamer-render-unix" version = "0.1.0" -source = "git+https://github.com/servo/media#af97a686de711c44f0e13fd4ace824c7b0a2e2e2" +source = "git+https://github.com/servo/media#8ea11a849d5c2f0e469d1d1ccad93a74fbd81462" dependencies = [ "glib", "gstreamer", @@ -5255,7 +5193,7 @@ dependencies = [ [[package]] name = "servo-media-player" version = "0.1.0" -source = "git+https://github.com/servo/media#af97a686de711c44f0e13fd4ace824c7b0a2e2e2" +source = "git+https://github.com/servo/media#8ea11a849d5c2f0e469d1d1ccad93a74fbd81462" dependencies = [ "ipc-channel", "serde", @@ -5267,7 +5205,7 @@ dependencies = [ [[package]] name = "servo-media-streams" version = "0.1.0" -source = "git+https://github.com/servo/media#af97a686de711c44f0e13fd4ace824c7b0a2e2e2" +source = "git+https://github.com/servo/media#8ea11a849d5c2f0e469d1d1ccad93a74fbd81462" dependencies = [ "lazy_static", "uuid", @@ -5276,12 +5214,12 @@ dependencies = [ [[package]] name = "servo-media-traits" version = "0.1.0" -source = "git+https://github.com/servo/media#af97a686de711c44f0e13fd4ace824c7b0a2e2e2" +source = "git+https://github.com/servo/media#8ea11a849d5c2f0e469d1d1ccad93a74fbd81462" [[package]] name = "servo-media-webrtc" version = "0.1.0" -source = "git+https://github.com/servo/media#af97a686de711c44f0e13fd4ace824c7b0a2e2e2" +source = "git+https://github.com/servo/media#8ea11a849d5c2f0e469d1d1ccad93a74fbd81462" dependencies = [ "boxfnonce", "lazy_static", @@ -5358,7 +5296,7 @@ dependencies = [ [[package]] name = "servo_media_derive" version = "0.1.0" -source = "git+https://github.com/servo/media#af97a686de711c44f0e13fd4ace824c7b0a2e2e2" +source = "git+https://github.com/servo/media#8ea11a849d5c2f0e469d1d1ccad93a74fbd81462" dependencies = [ "proc-macro2", "quote", @@ -6153,7 +6091,7 @@ dependencies = [ "backtrace", "bytes", "libc", - "mio 0.8.8", + "mio", "num_cpus", "pin-project-lite", "socket2 0.5.3", @@ -6857,7 +6795,7 @@ dependencies = [ [[package]] name = "webxr" version = "0.0.1" -source = "git+https://github.com/servo/webxr#d566e65b373b1899a642f3c6c3d8a9d12ce3717b" +source = "git+https://github.com/servo/webxr#2735ed748360d7925d380680d747dc218ab86208" dependencies = [ "android_injected_glue", "bindgen 0.66.1", @@ -6876,7 +6814,7 @@ dependencies = [ [[package]] name = "webxr-api" version = "0.0.1" -source = "git+https://github.com/servo/webxr#d566e65b373b1899a642f3c6c3d8a9d12ce3717b" +source = "git+https://github.com/servo/webxr#2735ed748360d7925d380680d747dc218ab86208" dependencies = [ "euclid", "ipc-channel", @@ -7181,7 +7119,7 @@ dependencies = [ "instant", "libc", "log", - "mio 0.8.8", + "mio", "ndk", "objc2", "once_cell", diff --git a/Cargo.toml b/Cargo.toml index 4210cf8105a..87921720aef 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,7 +43,7 @@ hyper_serde = "0.13" image = "0.24" imsz = "0.2" indexmap = { version = "1.0.2", features = ["std"] } -ipc-channel = "0.17" +ipc-channel = "0.18" itertools = "0.10" keyboard-types = "0.6" lazy_static = "1.4" @@ -116,9 +116,6 @@ debug-assertions = false # [patch."https://github.com/servo/"] # = { path = "/path/to/local/checkout" } -# This is here to dedupe winapi since mio 0.6 is still using winapi 0.2. -mio = { git = "https://github.com/servo/mio.git", branch = "servo-mio-0.6.22" } - # This is required because we want all dependencies that use WebRender to # use our vendored version. [patch."https://github.com/servo/webrender"] diff --git a/servo-tidy.toml b/servo-tidy.toml index 50ced64da7d..e47b620a32e 100644 --- a/servo-tidy.toml +++ b/servo-tidy.toml @@ -26,7 +26,6 @@ packages = [ "cookie", "futures", "libloading", - "mio", "nix", "num-rational", "redox_syscall",