Reorder dependencies

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

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

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

components/devtools/Cargo.toml

@@ -10,13 +10,13 @@ path = "lib.rs"
 
 [dependencies]
 devtools_traits = {path = "../devtools_traits"}
-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" ] }
+ipc-channel = {git = "https://github.com/servo/ipc-channel"}
+log = "0.3.5"
+msg = {path = "../msg"}
+plugins = {path = "../plugins"}
 serde = "0.7"
 serde_json = "0.7"
 serde_macros = "0.7"
 time = "0.1"
-log = "0.3.5"
+util = {path = "../util"}

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

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"

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

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

components/script_traits/Cargo.toml

@@ -9,23 +9,23 @@ name = "script_traits"
 path = "lib.rs"
 
 [dependencies]
-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"]}
+canvas_traits = {path = "../canvas_traits"}
+devtools_traits = {path = "../devtools_traits"}
 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"}

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"}
+browserhtml = {git = "https://github.com/browserhtml/browserhtml", branch = "gh-pages"}
-webrender_traits = {git = "https://github.com/servo/webrender_traits"}
-webrender = {git = "https://github.com/servo/webrender"}
-compositing = {path = "../compositing"}
-constellation = {path = "../constellation"}
-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_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"}
+compositing = {path = "../compositing"}
+constellation = {path = "../constellation"}
 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"
+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"}
+profile = {path = "../profile"}
+profile_traits = {path = "../profile_traits"}
+script = {path = "../script"}
+script_layout_interface = {path = "../script_layout_interface"}
+script_traits = {path = "../script_traits"}
+style = {path = "../style", features = ["servo"]}
 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"

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

components/webdriver_server/Cargo.toml

@@ -9,18 +9,18 @@ name = "webdriver_server"
 path = "lib.rs"
 
 [dependencies]
+euclid = {version = "0.6.4", features = ["plugins"]}
+hyper = "0.9"
+image = "0.10"
+ipc-channel = {git = "https://github.com/servo/ipc-channel"}
+log = "0.3.5"
 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"}
-image = "0.10"
-log = "0.3.5"
-hyper = "0.9"
-rustc-serialize = "0.3.4"
 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" ] }

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"}
-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"}
-style_traits = {path = "../../components/style_traits"}
-devtools = {path = "../../components/devtools"}
 layers = {git = "https://github.com/servo/rust-layers"}
+libc = "0.2"
+log = {version = "0.3.5", features = ["release_max_level_info"]}
+msg = {path = "../../components/msg"}
+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"}
+url = "1.0.0"
+util = {path = "../../components/util"}
 
 [target.'cfg(target_os="macos")'.dependencies]
 objc = "0.2"

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"]}
-time = {version = "0.1", optional = true, features = ["rustc-serialize"]}
-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"
+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"]}
 
 [replace]
 "string_cache:0.2.20" = {path = "string_cache"}

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"

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