Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-02 20:20:14 +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

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"