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

Auto merge of #9886 - nox:unstable-feature, r=SimonSapin

Browse source 
Make Cargo share more things between servo and ports

This should enable Cargo to reuse more build artifacts between servo and geckolib.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9886)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-03-08 20:03:24 +05:30
commit 5fbed88248
4 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/style/Cargo.toml
View file

@ -34,7 +34,7 @@ matches = "0.1"
num = "0.1.24"
rustc-serialize = "0.3"
selectors = {version = "0.5", features = ["heap_size", "unstable"]}
serde = "0.6"
serde = {version = "0.6", features = ["nightly"]}
serde_macros = "0.6"
smallvec = "0.1"
string_cache = {version = "0.2.10", features = ["heap_size"]}

5
ports/cef/Cargo.toml
View file

@ -12,7 +12,6 @@ crate-type = ["dylib"]
euclid = {version = "0.6.2", features = ["plugins"]}
gleam = "0.2"
libc = "0.2"
log = "0.3"
url = {version = "0.5.5", features = ["heap_size"]}
[dependencies.servo]
@ -30,6 +29,10 @@ path = "../../components/compositing"
[dependencies.gfx]
path = "../../components/gfx"
[dependencies.log]
version = "0.3"
features = ["release_max_level_info"]
[dependencies.script]
path = "../../components/script"

1
ports/geckolib/Cargo.lock generated
View file

@ -509,6 +509,7 @@ name = "url"
version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",

11
ports/geckolib/Cargo.toml
View file

@ -17,12 +17,15 @@ heapsize = "0.3.0"
heapsize_plugin = "0.1.2"
lazy_static = "0.1"
libc = "0.2"
log = "0.3"
num_cpus = "0.2.2"
selectors = {version = "0.5", features = ["heap_size"]}
selectors = {version = "0.5", features = ["heap_size", "unstable"]}
smallvec = "0.1"
string_cache = {version = "0.2.10", features = ["heap_size"]}
url = {version = "0.5.5", features = ["heap_size"]}
string_cache = {version = "0.2.10", features = ["heap_size", "unstable"]}
url = {version = "0.5.5", features = ["heap_size", "query_encoding", "serde_serialization"]}
[dependencies.log]
version = "0.3"
features = ["release_max_level_info"]
[dependencies.plugins]
path = "../../components/plugins"