Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-01 03:30:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #25806 - jdm:ipc-up, r=Manishearth

Browse source 
Update ipc-channel and crossbeam-channel

Depends on https://github.com/servo/webxr/pull/130 and https://github.com/servo/media/pull/333.
This commit is contained in:
bors-servo 2020-02-20 18:47:12 -05:00 • committed by GitHub
commit c78f0d7449
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
51 changed files with 294 additions and 255 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/background_hang_monitor/Cargo.toml
View file

@ -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"

2
components/bluetooth/Cargo.toml
View file

@ -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"}

2
components/bluetooth/lib.rs
View file

@ -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
},
}

2
components/bluetooth_traits/Cargo.toml
View file

@ -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" }

4
components/canvas/Cargo.toml
View file

@ -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}

4
components/canvas_traits/Cargo.toml
View file

@ -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"

6
components/compositing/Cargo.toml
View file

@ -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"}

4
components/constellation/Cargo.toml
View file

@ -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"

8
components/constellation/constellation.rs
View file

@ -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;

2
components/constellation/pipeline.rs
View file

@ -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);
}
}

2
components/debugger/Cargo.toml
View file

@ -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"

4
components/devtools/Cargo.toml
View file

@ -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"

2
components/devtools_traits/Cargo.toml
View file

@ -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"}

4
components/embedder_traits/Cargo.toml
View file

@ -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"

2
components/gfx/Cargo.toml
View file

@ -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"

4
components/layout/Cargo.toml
View file

@ -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"

2
components/layout_2020/Cargo.toml
View file

@ -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"

4
components/layout_thread/Cargo.toml
View file

@ -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"

4
components/layout_thread_2020/Cargo.toml
View file

@ -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"

4
components/layout_traits/Cargo.toml
View file

@ -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"}

2
components/malloc_size_of/Cargo.toml
View file

@ -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" }

2
components/media/Cargo.toml
View file

@ -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"

2
components/metrics/Cargo.toml
View file

@ -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"

2
components/msg/Cargo.toml
View file

@ -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"

4
components/net/Cargo.toml
View file

@ -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"

2
components/net/filemanager_thread.rs
View file

@ -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
},
}

2
components/net_traits/Cargo.toml
View file

@ -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" }

2
components/profile/Cargo.toml
View file

@ -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"

4
components/profile_traits/Cargo.toml
View file

@ -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"}

6
components/profile_traits/ipc.rs
View file

@ -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,

4
components/script/Cargo.toml
View file

@ -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"}

4
components/script_layout_interface/Cargo.toml
View file

@ -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"

4
components/script_traits/Cargo.toml
View file

@ -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"

6
components/servo/Cargo.toml
View file

@ -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"

2
components/style/Cargo.toml
View file

@ -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}

4
components/webdriver_server/Cargo.toml
View file

@ -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"}

2
components/webgpu/Cargo.toml
View file

@ -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"

8
components/webvr/Cargo.toml
View file

@ -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" }

4
components/webvr_traits/Cargo.toml
View file

@ -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"