aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--components/canvas/Cargo.toml10
-rw-r--r--components/canvas_traits/Cargo.toml10
-rw-r--r--components/compositing/Cargo.toml26
-rw-r--r--components/devtools/Cargo.toml8
-rw-r--r--components/gfx/Cargo.toml2
-rw-r--r--components/gfx_traits/Cargo.toml6
-rw-r--r--components/msg/Cargo.toml2
-rw-r--r--components/script_layout_interface/Cargo.toml2
-rw-r--r--components/script_traits/Cargo.toml18
-rw-r--r--components/servo/Cargo.toml46
-rw-r--r--components/style_traits/Cargo.toml2
-rw-r--r--components/webdriver_server/Cargo.toml12
-rw-r--r--ports/cef/Cargo.toml20
-rw-r--r--ports/geckolib/Cargo.toml10
-rw-r--r--ports/geckolib/string_cache/Cargo.toml2
-rw-r--r--tests/unit/style/Cargo.toml8
16 files changed, 92 insertions, 92 deletions
diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml
index 8df280ce744..64aceac1a7b 100644
--- a/components/canvas/Cargo.toml
+++ b/components/canvas/Cargo.toml
@@ -11,13 +11,13 @@ path = "lib.rs"
[dependencies]
azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]}
canvas_traits = {path = "../canvas_traits"}
-plugins = {path = "../plugins"}
-util = {path = "../util"}
-gfx_traits = {path = "../gfx_traits"}
-ipc-channel = {git = "https://github.com/servo/ipc-channel"}
-webrender_traits = {git = "https://github.com/servo/webrender_traits"}
euclid = {version = "0.6.4", features = ["plugins"]}
+gfx_traits = {path = "../gfx_traits"}
gleam = "0.2.8"
+ipc-channel = {git = "https://github.com/servo/ipc-channel"}
log = "0.3.5"
num-traits = "0.1.32"
offscreen_gl_context = "0.1.2"
+plugins = {path = "../plugins"}
+util = {path = "../util"}
+webrender_traits = {git = "https://github.com/servo/webrender_traits"}
diff --git a/components/canvas_traits/Cargo.toml b/components/canvas_traits/Cargo.toml
index 492b9d9f58c..269d6c9196a 100644
--- a/components/canvas_traits/Cargo.toml
+++ b/components/canvas_traits/Cargo.toml
@@ -9,15 +9,15 @@ name = "canvas_traits"
path = "lib.rs"
[dependencies]
-gfx_traits = {path = "../gfx_traits"}
azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]}
-ipc-channel = {git = "https://github.com/servo/ipc-channel"}
-serde = {version = "0.7", features = [ "nightly" ]}
-plugins = {path = "../plugins"}
-webrender_traits = {git = "https://github.com/servo/webrender_traits"}
cssparser = {version = "0.5.4", features = ["heap_size", "serde-serialization"]}
euclid = {version = "0.6.4", features = ["plugins"]}
+gfx_traits = {path = "../gfx_traits"}
heapsize = "0.3.0"
heapsize_plugin = "0.1.2"
+ipc-channel = {git = "https://github.com/servo/ipc-channel"}
+plugins = {path = "../plugins"}
+serde = {version = "0.7", features = [ "nightly" ]}
serde_macros = "0.7"
+webrender_traits = {git = "https://github.com/servo/webrender_traits"}
diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml
index d5480587a52..4aec268df53 100644
--- a/components/compositing/Cargo.toml
+++ b/components/compositing/Cargo.toml
@@ -9,25 +9,25 @@ name = "compositing"
path = "lib.rs"
[dependencies]
-gfx_traits = {path = "../gfx_traits"}
-script_traits = {path = "../script_traits"}
-style_traits = {path = "../style_traits"}
-msg = {path = "../msg"}
-profile_traits = {path = "../profile_traits"}
-net_traits = {path = "../net_traits"}
-util = {path = "../util"}
-plugins = {path = "../plugins"}
-azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]}
-layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]}
-ipc-channel = {git = "https://github.com/servo/ipc-channel"}
-webrender_traits = {git = "https://github.com/servo/webrender_traits"}
-webrender = {git = "https://github.com/servo/webrender"}
app_units = {version = "0.2.3", features = ["plugins"]}
+azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]}
euclid = {version = "0.6.4", features = ["plugins"]}
+gfx_traits = {path = "../gfx_traits"}
gleam = "0.2.8"
image = "0.10"
+ipc-channel = {git = "https://github.com/servo/ipc-channel"}
+layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]}
log = "0.3.5"
+msg = {path = "../msg"}
+net_traits = {path = "../net_traits"}
+plugins = {path = "../plugins"}
+profile_traits = {path = "../profile_traits"}
+script_traits = {path = "../script_traits"}
serde = "0.7"
serde_macros = "0.7"
+style_traits = {path = "../style_traits"}
time = "0.1.17"
url = {version = "1.0.0", features = ["heap_size"]}
+util = {path = "../util"}
+webrender = {git = "https://github.com/servo/webrender"}
+webrender_traits = {git = "https://github.com/servo/webrender_traits"}
diff --git a/components/devtools/Cargo.toml b/components/devtools/Cargo.toml
index 099b71edd3e..32724a1ab93 100644
--- a/components/devtools/Cargo.toml
+++ b/components/devtools/Cargo.toml
@@ -10,13 +10,13 @@ path = "lib.rs"
[dependencies]
devtools_traits = {path = "../devtools_traits"}
+hyper = { version = "0.9", features = [ "serde-serialization" ] }
+ipc-channel = {git = "https://github.com/servo/ipc-channel"}
+log = "0.3.5"
msg = {path = "../msg"}
-util = {path = "../util"}
plugins = {path = "../plugins"}
-ipc-channel = {git = "https://github.com/servo/ipc-channel"}
-hyper = { version = "0.9", features = [ "serde-serialization" ] }
serde = "0.7"
serde_json = "0.7"
serde_macros = "0.7"
time = "0.1"
-log = "0.3.5"
+util = {path = "../util"}
diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml
index 83ab6b25a91..20aec2ea7f0 100644
--- a/components/gfx/Cargo.toml
+++ b/components/gfx/Cargo.toml
@@ -52,8 +52,8 @@ core-graphics = "0.3"
core-text = "1.1"
[target.'cfg(any(target_os = "linux", target_os = "android", target_os = "windows"))'.dependencies]
-servo-fontconfig = "0.2"
freetype = {git = "https://github.com/servo/rust-freetype"}
+servo-fontconfig = "0.2"
[target.'cfg(any(target_arch = "x86_64", target_arch = "aarch64"))'.dependencies]
simd = {git = "https://github.com/huonw/simd"}
diff --git a/components/gfx_traits/Cargo.toml b/components/gfx_traits/Cargo.toml
index 853059c1b25..55f926baf33 100644
--- a/components/gfx_traits/Cargo.toml
+++ b/components/gfx_traits/Cargo.toml
@@ -10,14 +10,14 @@ path = "lib.rs"
[dependencies]
azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]}
+euclid = {version = "0.6.5", features = ["plugins"]}
+heapsize = "0.3.0"
+heapsize_plugin = "0.1.2"
layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]}
msg = {path = "../msg"}
plugins = {path = "../plugins"}
profile_traits = {path = "../profile_traits"}
range = {path = "../range"}
rustc-serialize = "0.3"
-euclid = {version = "0.6.5", features = ["plugins"]}
-heapsize = "0.3.0"
-heapsize_plugin = "0.1.2"
serde = "0.7"
serde_macros = "0.7"
diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml
index a47e3f83d8c..d736595d34f 100644
--- a/components/msg/Cargo.toml
+++ b/components/msg/Cargo.toml
@@ -10,6 +10,7 @@ path = "lib.rs"
[dependencies]
bitflags = "0.7"
+cookie = { version = "0.2.5", features = ["serialize-rustc", "serialize-serde"]}
cssparser = {version = "0.5.4", features = ["heap_size", "serde-serialization"]}
euclid = {version = "0.6.4", features = ["plugins"]}
heapsize = "0.3.0"
@@ -24,4 +25,3 @@ serde_macros = "0.7"
url = {version = "1.0.0", features = ["heap_size", "serde"]}
util = {path = "../util", features = ["servo"]}
webrender_traits = {git = "https://github.com/servo/webrender_traits"}
-cookie = { version = "0.2.5", features = ["serialize-serde", "serialize-rustc" ] }
diff --git a/components/script_layout_interface/Cargo.toml b/components/script_layout_interface/Cargo.toml
index 287c72ee2c0..65aae25794e 100644
--- a/components/script_layout_interface/Cargo.toml
+++ b/components/script_layout_interface/Cargo.toml
@@ -22,8 +22,8 @@ libc = "0.2"
log = "0.3.5"
msg = {path = "../msg"}
net_traits = {path = "../net_traits"}
-profile_traits = {path = "../profile_traits"}
plugins = {path = "../plugins"}
+profile_traits = {path = "../profile_traits"}
range = {path = "../range"}
script_traits = {path = "../script_traits"}
selectors = {version = "0.6", features = ["heap_size"]}
diff --git a/components/script_traits/Cargo.toml b/components/script_traits/Cargo.toml
index b3d980268cb..3fa3f56961e 100644
--- a/components/script_traits/Cargo.toml
+++ b/components/script_traits/Cargo.toml
@@ -9,23 +9,23 @@ name = "script_traits"
path = "lib.rs"
[dependencies]
+app_units = {version = "0.2.3", features = ["plugins"]}
canvas_traits = {path = "../canvas_traits"}
-gfx_traits = {path = "../gfx_traits"}
-msg = {path = "../msg"}
-net_traits = {path = "../net_traits"}
-plugins = {path = "../plugins"}
-profile_traits = {path = "../profile_traits"}
-style_traits = {path = "../style_traits", features = ["servo"]}
-util = {path = "../util"}
devtools_traits = {path = "../devtools_traits"}
-ipc-channel = {git = "https://github.com/servo/ipc-channel"}
-app_units = {version = "0.2.3", features = ["plugins"]}
euclid = {version = "0.6.4", features = ["plugins"]}
+gfx_traits = {path = "../gfx_traits"}
heapsize = "0.3.0"
heapsize_plugin = "0.1.2"
+ipc-channel = {git = "https://github.com/servo/ipc-channel"}
libc = "0.2"
+msg = {path = "../msg"}
+net_traits = {path = "../net_traits"}
offscreen_gl_context = "0.1.2"
+plugins = {path = "../plugins"}
+profile_traits = {path = "../profile_traits"}
serde = "0.7"
serde_macros = "0.7"
+style_traits = {path = "../style_traits", features = ["servo"]}
time = "0.1.12"
url = {version = "1.0.0", features = ["heap_size"]}
+util = {path = "../util"}
diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml
index f0bac793529..a65c3e30b09 100644
--- a/components/servo/Cargo.toml
+++ b/components/servo/Cargo.toml
@@ -31,49 +31,49 @@ opt-level = 3
# lto = false
[dev-dependencies]
+compiletest_helper = {path = "../../tests/compiletest/helper"}
gfx_tests = {path = "../../tests/unit/gfx"}
layout_tests = {path = "../../tests/unit/layout"}
net_tests = {path = "../../tests/unit/net"}
net_traits_tests = {path = "../../tests/unit/net_traits"}
+plugin_compiletest = {path = "../../tests/compiletest/plugin"}
profile_tests = {path = "../../tests/unit/profile"}
script_tests = {path = "../../tests/unit/script"}
style_tests = {path = "../../tests/unit/style"}
util_tests = {path = "../../tests/unit/util"}
-compiletest_helper = {path = "../../tests/compiletest/helper"}
-plugin_compiletest = {path = "../../tests/compiletest/plugin"}
[dependencies]
-script_layout_interface = {path = "../script_layout_interface"}
-webrender_traits = {git = "https://github.com/servo/webrender_traits"}
-webrender = {git = "https://github.com/servo/webrender"}
+browserhtml = {git = "https://github.com/browserhtml/browserhtml", branch = "gh-pages"}
+canvas = {path = "../canvas"}
+canvas_traits = {path = "../canvas_traits"}
compositing = {path = "../compositing"}
constellation = {path = "../constellation"}
+devtools = {path = "../devtools"}
+devtools_traits = {path = "../devtools_traits"}
+env_logger = "0.3"
+euclid = "0.6.4"
+gfx = {path = "../gfx"}
+gleam = "0.2"
+glutin_app = {path = "../../ports/glutin"}
+ipc-channel = {git = "https://github.com/servo/ipc-channel"}
+layout = {path = "../layout"}
+layout_thread = {path = "../layout_thread"}
+libc = "0.2"
+log = "0.3"
+msg = {path = "../msg"}
net = {path = "../net"}
net_traits = {path = "../net_traits"}
-msg = {path = "../msg"}
profile = {path = "../profile"}
profile_traits = {path = "../profile_traits"}
-util = {path = "../util"}
script = {path = "../script"}
+script_layout_interface = {path = "../script_layout_interface"}
script_traits = {path = "../script_traits"}
-layout = {path = "../layout"}
-layout_thread = {path = "../layout_thread"}
-gfx = {path = "../gfx"}
style = {path = "../style", features = ["servo"]}
-canvas = {path = "../canvas"}
-canvas_traits = {path = "../canvas_traits"}
-devtools = {path = "../devtools"}
-webdriver_server = {path = "../webdriver_server", optional = true}
-devtools_traits = {path = "../devtools_traits"}
-glutin_app = {path = "../../ports/glutin"}
-ipc-channel = {git = "https://github.com/servo/ipc-channel"}
-gleam = "0.2"
-browserhtml = {git = "https://github.com/browserhtml/browserhtml", branch = "gh-pages"}
-log = "0.3"
-env_logger = "0.3"
-euclid = "0.6.4"
-libc = "0.2"
url = "1.0.0"
+util = {path = "../util"}
+webdriver_server = {path = "../webdriver_server", optional = true}
+webrender = {git = "https://github.com/servo/webrender"}
+webrender_traits = {git = "https://github.com/servo/webrender_traits"}
[target.'cfg(not(target_os = "android"))'.dependencies]
sig = "0.1"
diff --git a/components/style_traits/Cargo.toml b/components/style_traits/Cargo.toml
index e823e1fbe7e..0fee88acbe7 100644
--- a/components/style_traits/Cargo.toml
+++ b/components/style_traits/Cargo.toml
@@ -13,7 +13,6 @@ servo = ["heapsize", "heapsize_plugin", "serde", "serde_macros", "euclid/plugins
"cssparser/heap_size", "cssparser/serde-serialization", "util/servo"]
[dependencies]
-util = {path = "../util"}
cssparser = "0.5.4"
euclid = "0.6.4"
heapsize = {version = "0.3.0", optional = true}
@@ -21,3 +20,4 @@ heapsize_plugin = {version = "0.1.2", optional = true}
rustc-serialize = "0.3"
serde = {version = "0.7", optional = true}
serde_macros = {version = "0.7", optional = true}
+util = {path = "../util"}
diff --git a/components/webdriver_server/Cargo.toml b/components/webdriver_server/Cargo.toml
index 00593b03b4e..3ae0fc751b0 100644
--- a/components/webdriver_server/Cargo.toml
+++ b/components/webdriver_server/Cargo.toml
@@ -9,18 +9,18 @@ name = "webdriver_server"
path = "lib.rs"
[dependencies]
-msg = {path = "../msg"}
-plugins = {path = "../plugins"}
-util = {path = "../util"}
euclid = {version = "0.6.4", features = ["plugins"]}
-ipc-channel = {git = "https://github.com/servo/ipc-channel"}
+hyper = "0.9"
image = "0.10"
+ipc-channel = {git = "https://github.com/servo/ipc-channel"}
log = "0.3.5"
-hyper = "0.9"
-rustc-serialize = "0.3.4"
+msg = {path = "../msg"}
+plugins = {path = "../plugins"}
regex = "0.1.55"
+rustc-serialize = "0.3.4"
script_traits = {path = "../script_traits"}
url = {version = "1.0.0", features = ["heap_size"]}
+util = {path = "../util"}
uuid = { version = "0.2", features = ["v4"] }
webdriver = "0.9"
cookie = { version = "0.2.5", features = ["serialize-serde", "serialize-rustc" ] }
diff --git a/ports/cef/Cargo.toml b/ports/cef/Cargo.toml
index 79cd8c8d698..3e315f0fc8c 100644
--- a/ports/cef/Cargo.toml
+++ b/ports/cef/Cargo.toml
@@ -15,22 +15,22 @@ opt-level = 3
# lto = false
[dependencies]
+compositing = {path = "../../components/compositing"}
+devtools = {path = "../../components/devtools"}
euclid = "0.6.4"
gleam = "0.2.8"
-libc = "0.2"
-url = "1.0.0"
-servo = {path = "../../components/servo"}
glutin_app = {path = "../glutin"}
-plugins = {path = "../../components/plugins"}
-compositing = {path = "../../components/compositing"}
+layers = {git = "https://github.com/servo/rust-layers"}
+libc = "0.2"
log = {version = "0.3.5", features = ["release_max_level_info"]}
-script_traits = {path = "../../components/script_traits"}
-net_traits = {path = "../../components/net_traits"}
msg = {path = "../../components/msg"}
-util = {path = "../../components/util"}
+net_traits = {path = "../../components/net_traits"}
+plugins = {path = "../../components/plugins"}
+script_traits = {path = "../../components/script_traits"}
+servo = {path = "../../components/servo"}
style_traits = {path = "../../components/style_traits"}
-devtools = {path = "../../components/devtools"}
-layers = {git = "https://github.com/servo/rust-layers"}
+url = "1.0.0"
+util = {path = "../../components/util"}
[target.'cfg(target_os="macos")'.dependencies]
objc = "0.2"
diff --git a/ports/geckolib/Cargo.toml b/ports/geckolib/Cargo.toml
index 99c3ee14b69..1244dda1f59 100644
--- a/ports/geckolib/Cargo.toml
+++ b/ports/geckolib/Cargo.toml
@@ -28,23 +28,23 @@ servo_features = [
[dependencies]
app_units = "0.2.3"
cssparser = "0.5.4"
+env_logger = "0.3"
euclid = "0.6.4"
gecko_bindings = {version = "0.0.1", path = "gecko_bindings"}
heapsize = {version = "0.3.0", optional = true}
lazy_static = "0.2"
libc = "0.2"
+log = {version = "0.3.5", features = ["release_max_level_info"]}
num_cpus = "0.2.2"
selectors = {version = "0.6", features = ["unstable"]}
smallvec = "0.1"
string_cache = {version = "0.2.20", features = ["unstable"]}
-url = "1.0.0"
-log = {version = "0.3.5", features = ["release_max_level_info"]}
+style = {path = "../../components/style", features = ["gecko"]}
+style_traits = {path = "../../components/style_traits"}
time = {version = "0.1", optional = true, features = ["rustc-serialize"]}
+url = "1.0.0"
util = {path = "../../components/util"}
uuid = {version = "0.2", optional = true, features = ["v4", "serde"]}
-style = {path = "../../components/style", features = ["gecko"]}
-style_traits = {path = "../../components/style_traits"}
-env_logger = "0.3"
[replace]
"string_cache:0.2.20" = {path = "string_cache"}
diff --git a/ports/geckolib/string_cache/Cargo.toml b/ports/geckolib/string_cache/Cargo.toml
index 9fd707c2a34..d15825a1ece 100644
--- a/ports/geckolib/string_cache/Cargo.toml
+++ b/ports/geckolib/string_cache/Cargo.toml
@@ -15,7 +15,7 @@ unstable = []
heap_size = []
[dependencies]
+gecko_bindings = {version = "0.0.1", path = "../gecko_bindings"}
heapsize = "0.3.5"
libc = "0.2"
-gecko_bindings = {version = "0.0.1", path = "../gecko_bindings"}
serde = "0.7"
diff --git a/tests/unit/style/Cargo.toml b/tests/unit/style/Cargo.toml
index f04f098134b..c1322bcc83e 100644
--- a/tests/unit/style/Cargo.toml
+++ b/tests/unit/style/Cargo.toml
@@ -9,13 +9,13 @@ path = "lib.rs"
doctest = false
[dependencies]
-style = {path = "../../../components/style"}
-style_traits = {path = "../../../components/style_traits"}
-util = {path = "../../../components/util"}
app_units = {version = "0.2.3", features = ["plugins"]}
cssparser = {version = "0.5.4", features = ["heap_size"]}
euclid = {version = "0.6.4", features = ["plugins"]}
+rustc-serialize = "0.3"
selectors = {version = "0.6", features = ["heap_size"]}
string_cache = {version = "0.2", features = ["heap_size"]}
+style = {path = "../../../components/style"}
+style_traits = {path = "../../../components/style_traits"}
url = {version = "1.0.0", features = ["heap_size"]}
-rustc-serialize = "0.3"
+util = {path = "../../../components/util"}