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

Bump ipc-channel and bincode

Browse source 
This required bumping uuid too which unfortunately duplicated rand.
This commit is contained in:
Bastien Orivel 2018-03-21 13:04:41 +01:00
parent 5b575e3647
commit 570d865065
34 changed files with 152 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/bluetooth/Cargo.toml
View file

@ -13,10 +13,10 @@ path = "lib.rs"
bitflags = "1.0"
bluetooth_traits = {path = "../bluetooth_traits"}
device = {git = "https://github.com/servo/devices", features = ["bluetooth-test"]}
ipc-channel = "0.9"
ipc-channel = "0.10"
servo_config = {path = "../config"}
servo_rand = {path = "../rand"}
uuid = {version = "0.5", features = ["v4"]}
uuid = {version = "0.6", features = ["v4"]}
[target.'cfg(target_os = "linux")'.dependencies]
tinyfiledialogs = "3.0"

2
components/bluetooth_traits/Cargo.toml
View file

@ -10,7 +10,7 @@ name = "bluetooth_traits"
path = "lib.rs"
[dependencies]
ipc-channel = "0.9"
ipc-channel = "0.10"
regex = "0.2"
serde = "1.0"
servo_config = {path = "../config"}

2
components/canvas/Cargo.toml
View file

@ -17,7 +17,7 @@ cssparser = "0.23.0"
euclid = "0.17"
fnv = "1.0"
gleam = "0.4"
ipc-channel = "0.9"
ipc-channel = "0.10"
log = "0.3.5"
num-traits = "0.1.32"
offscreen_gl_context = { version = "0.15", features = ["serde", "osmesa"] }

2
components/canvas_traits/Cargo.toml
View file

@ -12,7 +12,7 @@ path = "lib.rs"
[dependencies]
cssparser = "0.23.0"
euclid = "0.17"
ipc-channel = "0.9"
ipc-channel = "0.10"
lazy_static = "1"
malloc_size_of = { path = "../malloc_size_of" }
malloc_size_of_derive = { path = "../malloc_size_of_derive" }

2
components/compositing/Cargo.toml
View file

@ -14,7 +14,7 @@ euclid = "0.17"
gfx_traits = {path = "../gfx_traits"}
gleam = "0.4"
image = "0.18"
ipc-channel = "0.9"
ipc-channel = "0.10"
libc = "0.2"
log = "0.3.5"
msg = {path = "../msg"}

2
components/constellation/Cargo.toml
View file

@ -22,7 +22,7 @@ euclid = "0.17"
gfx = {path = "../gfx"}
gfx_traits = {path = "../gfx_traits"}
hyper = "0.10"
ipc-channel = "0.9"
ipc-channel = "0.10"
itertools = "0.7"
layout_traits = {path = "../layout_traits"}
log = "0.3.5"

2
components/devtools/Cargo.toml
View file

@ -13,7 +13,7 @@ path = "lib.rs"
devtools_traits = {path = "../devtools_traits"}
hyper = "0.10"
hyper_serde = "0.8"
ipc-channel = "0.9"
ipc-channel = "0.10"
log = "0.3.5"
msg = {path = "../msg"}
serde = "1.0"

2
components/devtools_traits/Cargo.toml
View file

@ -13,7 +13,7 @@ path = "lib.rs"
bitflags = "1.0"
hyper = "0.10"
hyper_serde = "0.8"
ipc-channel = "0.9"
ipc-channel = "0.10"
malloc_size_of = { path = "../malloc_size_of" }
malloc_size_of_derive = { path = "../malloc_size_of_derive" }
msg = {path = "../msg"}

2
components/gfx/Cargo.toml
View file

@ -23,7 +23,7 @@ fnv = "1.0"
fontsan = {git = "https://github.com/servo/fontsan"}
gfx_traits = {path = "../gfx_traits"}
harfbuzz-sys = "0.1"
ipc-channel = "0.9"
ipc-channel = "0.10"
lazy_static = "1"
libc = "0.2"
log = "0.3.5"

2
components/hashglobe/Cargo.toml
View file

@ -13,4 +13,4 @@ readme = "README.md"
libc = "0.2"
[dev-dependencies]
rand = "0.3"
rand = "0.4"

2
components/layout/Cargo.toml
View file

@ -21,7 +21,7 @@ fnv = "1.0"
gfx = {path = "../gfx"}
gfx_traits = {path = "../gfx_traits"}
html5ever = "0.22"
ipc-channel = "0.9"
ipc-channel = "0.10"
libc = "0.2"
log = "0.3.5"
malloc_size_of = { path = "../malloc_size_of" }

2
components/layout_thread/Cargo.toml
View file

@ -20,7 +20,7 @@ fnv = "1.0"
gfx = {path = "../gfx"}
gfx_traits = {path = "../gfx_traits"}
html5ever = "0.22"
ipc-channel = "0.9"
ipc-channel = "0.10"
layout = {path = "../layout"}
layout_traits = {path = "../layout_traits"}
lazy_static = "1"

2
components/layout_traits/Cargo.toml
View file

@ -11,7 +11,7 @@ path = "lib.rs"
[dependencies]
gfx = {path = "../gfx"}
ipc-channel = "0.9"
ipc-channel = "0.10"
metrics = {path = "../metrics"}
msg = {path = "../msg"}
net_traits = {path = "../net_traits"}

2
components/metrics/Cargo.toml
View file

@ -11,7 +11,7 @@ path = "lib.rs"
[dependencies]
gfx_traits = {path = "../gfx_traits"}
ipc-channel = "0.9"
ipc-channel = "0.10"
log = "0.3.5"
malloc_size_of = { path = "../malloc_size_of" }
malloc_size_of_derive = { path = "../malloc_size_of_derive" }

4
components/net/Cargo.toml
View file

@ -21,7 +21,7 @@ hyper = "0.10"
hyper_serde = "0.8"
hyper-openssl = "0.2.2"
immeta = "0.3.6"
ipc-channel = "0.9"
ipc-channel = "0.10"
lazy_static = "1"
log = "0.3.5"
matches = "0.1"
@ -40,7 +40,7 @@ threadpool = "1.0"
time = "0.1.17"
unicase = "1.4.0"
url = "1.2"
uuid = {version = "0.5", features = ["v4"]}
uuid = {version = "0.6", features = ["v4"]}
webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}
[target.'cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))'.dependencies]

4
components/net_traits/Cargo.toml
View file

@ -16,7 +16,7 @@ cookie = "0.10"
hyper = "0.10"
hyper_serde = "0.8"
image = "0.18"
ipc-channel = "0.9"
ipc-channel = "0.10"
lazy_static = "1"
log = "0.3.5"
malloc_size_of = { path = "../malloc_size_of" }
@ -27,5 +27,5 @@ serde = "1.0"
servo_config = {path = "../config"}
servo_url = {path = "../url"}
url = "1.2"
uuid = {version = "0.5", features = ["v4", "serde"]}
uuid = {version = "0.6", features = ["v4", "serde"]}
webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}

2
components/profile/Cargo.toml
View file

@ -15,7 +15,7 @@ unstable = ["jemalloc-sys"]
[dependencies]
profile_traits = {path = "../profile_traits"}
influent = "0.4"
ipc-channel = "0.9"
ipc-channel = "0.10"
heartbeats-simple = "0.4"
log = "0.3.5"
serde = "1.0"

2
components/profile_traits/Cargo.toml
View file

@ -15,7 +15,7 @@ energy-profiling = ["energymon", "energy-monitor"]
[dependencies]
energy-monitor = {version = "0.2.0", optional = true}
energymon = {git = "https://github.com/energymon/energymon-rust.git", optional = true}
ipc-channel = "0.9"
ipc-channel = "0.10"
log = "0.3.5"
serde = "1.0"
servo_config = {path = "../config"}

3
components/rand/Cargo.toml
View file

@ -12,4 +12,5 @@ path = "lib.rs"
[dependencies]
lazy_static = "1"
log = "0.3"
rand = "0.3"
rand = "0.4"
uuid = "0.6.2"

10
components/rand/lib.rs
View file

@ -17,6 +17,7 @@ extern crate lazy_static;
#[macro_use]
extern crate log;
extern crate rand;
extern crate uuid;
pub use rand::{Rand, Rng, SeedableRng};
#[cfg(target_pointer_width = "64")]
@ -30,6 +31,7 @@ use std::mem;
use std::rc::Rc;
use std::sync::Mutex;
use std::u64;
use uuid::Uuid;
// Slightly annoying having to cast between sizes.
@ -156,3 +158,11 @@ impl Rng for ServoThreadRng {
pub fn random<T: Rand>() -> T {
thread_rng().gen()
}
// TODO(eijebong): Replace calls to this by random once `uuid::Uuid` implements `rand::Rand` again.
#[inline]
pub fn random_uuid() -> Uuid {
let mut bytes = [0; 16];
thread_rng().fill_bytes(&mut bytes);
Uuid::from_random_bytes(bytes)
}

4
components/script/Cargo.toml
View file

@ -51,7 +51,7 @@ html5ever = "0.22"
hyper = "0.10"
hyper_serde = "0.8"
image = "0.18"
ipc-channel = "0.9"
ipc-channel = "0.10"
jstraceable_derive = {path = "../jstraceable_derive"}
lazy_static = "1"
libc = "0.2"
@ -93,7 +93,7 @@ time = "0.1.12"
unicode-segmentation = "1.1.0"
url = "1.6"
utf-8 = "0.7"
uuid = {version = "0.5", features = ["v4"]}
uuid = {version = "0.6", features = ["v4"]}
xml5ever = {version = "0.12"}
webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}
webvr_traits = {path = "../webvr_traits"}

2
components/script/dom/worklet.rs
View file

@ -154,7 +154,7 @@ malloc_size_of_is_0!(WorkletId);
impl WorkletId {
fn new() -> WorkletId {
WorkletId(servo_rand::random())
WorkletId(servo_rand::random_uuid())
}
}

2
components/script_layout_interface/Cargo.toml
View file

@ -17,7 +17,7 @@ cssparser = "0.23.0"
euclid = "0.17"
gfx_traits = {path = "../gfx_traits"}
html5ever = "0.22"
ipc-channel = "0.9"
ipc-channel = "0.10"
libc = "0.2"
log = "0.3.5"
malloc_size_of = { path = "../malloc_size_of" }

2
components/script_traits/Cargo.toml
View file

@ -18,7 +18,7 @@ euclid = "0.17"
gfx_traits = {path = "../gfx_traits"}
hyper = "0.10"
hyper_serde = "0.8"
ipc-channel = "0.9"
ipc-channel = "0.10"
libc = "0.2"
malloc_size_of = { path = "../malloc_size_of" }
malloc_size_of_derive = { path = "../malloc_size_of_derive" }

2
components/servo/Cargo.toml
View file

@ -41,7 +41,7 @@ env_logger = "0.4"
euclid = "0.17"
gfx = {path = "../gfx"}
gleam = "0.4"
ipc-channel = "0.9"
ipc-channel = "0.10"
layout_thread = {path = "../layout_thread"}
log = "0.3"
msg = {path = "../msg"}

2
components/url/Cargo.toml
View file

@ -16,4 +16,4 @@ serde = {version = "1.0"}
servo_rand = {path = "../rand"}
url = "1.2"
url_serde = {version = "0.2"}
uuid = {version = "0.5.0", features = ["v4", "serde"]}
uuid = {version = "0.6.0", features = ["v4", "serde"]}

3
components/url/origin.rs
View file

@ -3,7 +3,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use servo_rand;
use servo_rand::Rng;
use std::cell::RefCell;
use std::rc::Rc;
use url::{Host, Origin};
@ -43,7 +42,7 @@ impl ImmutableOrigin {
/// Creates a new opaque origin that is only equal to itself.
pub fn new_opaque() -> ImmutableOrigin {
ImmutableOrigin::Opaque(OpaqueOrigin(servo_rand::thread_rng().gen()))
ImmutableOrigin::Opaque(OpaqueOrigin(servo_rand::random_uuid()))
}
pub fn scheme(&self) -> Option<&str> {

4
components/webdriver_server/Cargo.toml
View file

@ -15,7 +15,7 @@ cookie = "0.10"
euclid = "0.17"
hyper = "0.10"
image = "0.18"
ipc-channel = "0.9"
ipc-channel = "0.10"
log = "0.3.5"
msg = {path = "../msg"}
net_traits = {path = "../net_traits"}
@ -25,5 +25,5 @@ script_traits = {path = "../script_traits"}
servo_config = {path = "../config"}
servo_url = {path = "../url"}
url = "1.2"
uuid = {version = "0.5", features = ["v4"]}
uuid = {version = "0.6", features = ["v4"]}
webdriver = "0.33"

2
components/webvr/Cargo.toml
View file

@ -16,7 +16,7 @@ oculusvr = ['rust-webvr/oculusvr']
[dependencies]
canvas_traits = {path = "../canvas_traits"}
euclid = "0.17"
ipc-channel = "0.9"
ipc-channel = "0.10"
log = "0.3"
msg = {path = "../msg"}
rust-webvr = {version = "0.9", features = ["openvr"]}

2
components/webvr_traits/Cargo.toml
View file

@ -10,7 +10,7 @@ name = "webvr_traits"
path = "lib.rs"
[dependencies]
ipc-channel = "0.9"
ipc-channel = "0.10"
msg = {path = "../msg"}
rust-webvr-api = {version = "0.9", features = ["serde-serialization"]}
serde = "1.0"