Reorder dependencies in many Cargo.toml files

components/devtools_traits/Cargo.toml

@@ -9,13 +9,13 @@ name = "devtools_traits"
 path = "lib.rs"
 
 [dependencies]
-msg = {path = "../msg"}
+bitflags = "0.6.0"
-ipc-channel = {git = "https://github.com/servo/ipc-channel"}
 heapsize = "0.3.0"
 heapsize_plugin = "0.1.2"
-hyper = { version = "0.9", features = [ "serde-serialization" ] }
+hyper = {version = "0.9", features = ["serde-serialization"]}
-time = "0.1"
+ipc-channel = {git = "https://github.com/servo/ipc-channel"}
-bitflags = "0.6.0"
+msg = {path = "../msg"}
 serde = "0.7"
 serde_macros = "0.7"
+time = "0.1"
 url = {version = "1.0.0", features = ["heap_size"]}

components/gfx/Cargo.toml

@@ -11,38 +11,38 @@ path = "lib.rs"
 
 [dependencies]
 app_units = {version = "0.2.3", features = ["plugins"]}
+azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]}
 bitflags = "0.6.0"
 euclid = {version = "0.6.4", features = ["plugins"]}
 fnv = "1.0"
+gfx_traits = {path = "../gfx_traits"}
 harfbuzz-sys = "0.1"
 heapsize = "0.3.0"
 heapsize_plugin = "0.1.2"
+ipc-channel = {git = "https://github.com/servo/ipc-channel"}
+layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]}
 lazy_static = "0.2"
 libc = "0.2"
 log = "0.3.5"
 mime = "0.2"
+msg = {path = "../msg"}
+net_traits = {path = "../net_traits"}
+plugins = {path = "../plugins"}
+profile_traits = {path = "../profile_traits"}
 rand = "0.3"
+range = {path = "../range"}
 rustc-serialize = "0.3"
 serde = "0.7"
 serde_macros = "0.7"
 servo-skia = "0.20130412.0"
 smallvec = "0.1"
 string_cache = {version = "0.2.12", features = ["heap_size"]}
-time = "0.1.12"
-unicode-script = { version = "0.1", features = ["harfbuzz"] }
-url = {version = "1.0.0", features = ["heap_size"]}
-plugins = {path = "../plugins"}
-gfx_traits = {path = "../gfx_traits"}
-net_traits = {path = "../net_traits"}
-util = {path = "../util"}
-msg = {path = "../msg"}
-profile_traits = {path = "../profile_traits"}
-range = {path = "../range"}
 style = {path = "../style"}
 style_traits = {path = "../style_traits"}
-azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]}
+time = "0.1.12"
-layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]}
+unicode-script = {version = "0.1", features = ["harfbuzz"]}
-ipc-channel = {git = "https://github.com/servo/ipc-channel"}
+url = {version = "1.0.0", features = ["heap_size"]}
+util = {path = "../util"}
 webrender_traits = {git = "https://github.com/servo/webrender_traits"}
 xi-unicode = "0.0.1"
 

components/layout/Cargo.toml

@@ -9,39 +9,39 @@ name = "layout"
 path = "lib.rs"
 
 [dependencies]
-azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]}
-canvas_traits = {path = "../canvas_traits"}
-gfx = {path = "../gfx"}
-gfx_traits = {path = "../gfx_traits"}
-msg = {path = "../msg"}
-script = {path = "../script"}
-layout_traits = {path = "../layout_traits"}
-range = {path = "../range"}
-script_traits = {path = "../script_traits"}
-style = {path = "../style"}
-style_traits = {path = "../style_traits"}
-plugins = {path = "../plugins"}
-net_traits = {path = "../net_traits"}
-profile_traits = {path = "../profile_traits"}
-util = {path = "../util"}
-ipc-channel = {git = "https://github.com/servo/ipc-channel"}
-webrender_traits = {git = "https://github.com/servo/webrender_traits"}
 app_units = {version = "0.2.3", features = ["plugins"]}
+azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]}
 bitflags = "0.6.0"
+canvas_traits = {path = "../canvas_traits"}
 cssparser = {version = "0.5.4", features = ["heap_size", "serde-serialization"]}
 euclid = {version = "0.6.4", features = ["plugins"]}
 fnv = "1.0"
+gfx = {path = "../gfx"}
+gfx_traits = {path = "../gfx_traits"}
 heapsize = "0.3.0"
 heapsize_plugin = "0.1.2"
+ipc-channel = {git = "https://github.com/servo/ipc-channel"}
+layout_traits = {path = "../layout_traits"}
 libc = "0.2"
 log = "0.3.5"
+msg = {path = "../msg"}
+net_traits = {path = "../net_traits"}
+plugins = {path = "../plugins"}
+profile_traits = {path = "../profile_traits"}
+range = {path = "../range"}
 rustc-serialize = "0.3"
+script = {path = "../script"}
+script_traits = {path = "../script_traits"}
 selectors = {version = "0.5.1", features = ["heap_size"]}
 serde_json = "0.7"
 serde_macros = "0.7"
 smallvec = "0.1"
 string_cache = {version = "0.2.12", features = ["heap_size"]}
+style = {path = "../style"}
+style_traits = {path = "../style_traits"}
 time = "0.1"
 unicode-bidi = "0.2"
-unicode-script = { version = "0.1", features = ["harfbuzz"] }
+unicode-script = {version = "0.1", features = ["harfbuzz"]}
 url = {version = "1.0.0", features = ["heap_size"]}
+util = {path = "../util"}
+webrender_traits = {git = "https://github.com/servo/webrender_traits"}

components/msg/Cargo.toml

@@ -9,18 +9,18 @@ name = "msg"
 path = "lib.rs"
 
 [dependencies]
-util = {path = "../util"}
-layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]}
-ipc-channel = {git = "https://github.com/servo/ipc-channel"}
-plugins = {path = "../plugins"}
-webrender_traits = {git = "https://github.com/servo/webrender_traits"}
 bitflags = "0.6.0"
 cssparser = {version = "0.5.4", features = ["heap_size", "serde-serialization"]}
 euclid = {version = "0.6.4", features = ["plugins"]}
 heapsize = "0.3.0"
 heapsize_plugin = "0.1.2"
-hyper = { version = "0.9", features = [ "serde-serialization" ] }
+hyper = {version = "0.9", features = ["serde-serialization"]}
+ipc-channel = {git = "https://github.com/servo/ipc-channel"}
+layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]}
+plugins = {path = "../plugins"}
 rustc-serialize = "0.3.4"
 serde = "0.7"
 serde_macros = "0.7"
 url = {version = "1.0.0", features = ["heap_size"]}
+util = {path = "../util"}
+webrender_traits = {git = "https://github.com/servo/webrender_traits"}

components/net/Cargo.toml

@@ -9,32 +9,32 @@ name = "net"
 path = "lib.rs"
 
 [dependencies]
-net_traits = {path = "../net_traits"}
-util = {path = "../util"}
-devtools_traits = {path = "../devtools_traits"}
-brotli = {git = "https://github.com/ende76/brotli-rs"}
-plugins = {path = "../plugins"}
-msg = {path = "../msg"}
-ipc-channel = {git = "https://github.com/servo/ipc-channel"}
-webrender_traits = {git = "https://github.com/servo/webrender_traits"}
-device = {git = "https://github.com/servo/devices"}
 bitflags = "0.6.0"
-cookie = { version = "0.2.4", features = [ "serialize-rustc" ] }
+brotli = {git = "https://github.com/ende76/brotli-rs"}
+cookie = {version = "0.2.4", features = ["serialize-rustc"]}
+device = {git = "https://github.com/servo/devices"}
+devtools_traits = {path = "../devtools_traits"}
 flate2 = "0.2.0"
-hyper = { version = "0.9", features = [ "serde-serialization" ] }
+hyper = {version = "0.9", features = ["serde-serialization"]}
 immeta = "0.3.1"
+ipc-channel = {git = "https://github.com/servo/ipc-channel"}
 log = "0.3.5"
 matches = "0.1"
 mime = "0.2.0"
 mime_guess = "1.6.0"
+msg = {path = "../msg"}
+net_traits = {path = "../net_traits"}
 openssl = "0.7.6"
 openssl-verify = "0.1"
+plugins = {path = "../plugins"}
 rustc-serialize = "0.3"
 threadpool = "1.0"
 time = "0.1.17"
 unicase = "1.4.0"
 url = {version = "1.0.0", features = ["heap_size", "rustc-serialize"]}
-uuid = { version = "0.2", features = ["v4"] }
+util = {path = "../util"}
+uuid = {version = "0.2", features = ["v4"]}
+webrender_traits = {git = "https://github.com/servo/webrender_traits"}
 websocket = "0.17"
 
 [target.'cfg(any(target_os = "macos", target_os = "linux"))'.dependencies]

components/script/Cargo.toml

@@ -17,52 +17,52 @@ debugmozjs = ['js/debugmozjs']
 tinyfiledialogs = {git = "https://github.com/jdm/tinyfiledialogs"}
 
 [dependencies]
-plugins = {path = "../plugins"}
-util = {path = "../util"}
-msg = {path = "../msg"}
-net_traits = {path = "../net_traits"}
-profile_traits = {path = "../profile_traits"}
-script_traits = {path = "../script_traits"}
-devtools_traits = {path = "../devtools_traits"}
-style = {path = "../style"}
-canvas = {path = "../canvas"}
-canvas_traits = {path = "../canvas_traits"}
-js = {git = "https://github.com/servo/rust-mozjs"}
 angle = {git = "https://github.com/emilio/angle", branch = "servo"}
-ipc-channel = {git = "https://github.com/servo/ipc-channel"}
-xml5ever = {version = "0.1.2", features = ["unstable"]}
-gfx_traits = {path = "../gfx_traits"}
-webrender_traits = {git = "https://github.com/servo/webrender_traits"}
 app_units = {version = "0.2.3", features = ["plugins"]}
 bitflags = "0.6.0"
+canvas = {path = "../canvas"}
+canvas_traits = {path = "../canvas_traits"}
 caseless = "0.1.0"
 cssparser = {version = "0.5.4", features = ["heap_size", "serde-serialization"]}
+devtools_traits = {path = "../devtools_traits"}
 encoding = "0.2"
 euclid = {version = "0.6.4", features = ["plugins"]}
 fnv = "1.0"
+gfx_traits = {path = "../gfx_traits"}
 heapsize = "0.3.0"
 heapsize_plugin = "0.1.2"
 html5ever = {version = "0.5.1", features = ["heap_size", "unstable"]}
-hyper = { version = "0.9", features = [ "serde-serialization" ] }
+hyper = {version = "0.9", features = ["serde-serialization"]}
 image = "0.10"
+ipc-channel = {git = "https://github.com/servo/ipc-channel"}
+js = {git = "https://github.com/servo/rust-mozjs"}
 libc = "0.2"
 log = "0.3.5"
 mime = "0.2.0"
+msg = {path = "../msg"}
+net_traits = {path = "../net_traits"}
 num-traits = "0.1.32"
 offscreen_gl_context = "0.1.2"
-rand = "0.3"
 phf = "0.7.13"
 phf_macros = "0.7.13"
+plugins = {path = "../plugins"}
+profile_traits = {path = "../profile_traits"}
+rand = "0.3"
 ref_filter_map = "1.0"
 ref_slice = "1.0"
 regex = "0.1.43"
 rustc-serialize = "0.3"
+script_traits = {path = "../script_traits"}
 selectors = {version = "0.5", features = ["heap_size"]}
 serde = "0.7"
 smallvec = "0.1"
 string_cache = {version = "0.2.12", features = ["heap_size", "unstable"]}
+style = {path = "../style"}
 time = "0.1.12"
 unicase = "1.0"
 url = {version = "1.0.0", features = ["heap_size", "query_encoding"]}
-uuid = { version = "0.2", features = ["v4"] }
+util = {path = "../util"}
+uuid = {version = "0.2", features = ["v4"]}
+webrender_traits = {git = "https://github.com/servo/webrender_traits"}
 websocket = "0.17"
+xml5ever = {version = "0.1.2", features = ["unstable"]}

components/style/Cargo.toml

@@ -14,9 +14,6 @@ path = "lib.rs"
 gecko = []
 
 [dependencies]
-plugins = {path = "../plugins"}
-util = {path = "../util"}
-style_traits = {path = "../style_traits"}
 app_units = {version = "0.2.3", features = ["plugins"]}
 bitflags = "0.6.0"
 cssparser = {version = "0.5.5", features = ["heap_size", "serde-serialization"]}
@@ -29,14 +26,17 @@ lazy_static = "0.2"
 log = "0.3.5"
 matches = "0.1"
 num-traits = "0.1.32"
+plugins = {path = "../plugins"}
 rustc-serialize = "0.3"
 selectors = {version = "0.5", features = ["heap_size", "unstable"]}
 serde = {version = "0.7", features = ["nightly"]}
 serde_macros = "0.7"
 smallvec = "0.1"
 string_cache = {version = "0.2.12", features = ["heap_size"]}
+style_traits = {path = "../style_traits"}
 time = "0.1"
 url = {version = "1.0.0", features = ["heap_size"]}
+util = {path = "../util"}
 
 [build-dependencies]
 walkdir = "0.1"

components/util/Cargo.toml

@@ -18,9 +18,6 @@ path = "lib.rs"
 non-geckolib = ["js"]
 
 [dependencies]
-plugins = {path = "../plugins"}
-js = {git = "https://github.com/servo/rust-mozjs", optional = true}
-ipc-channel = {git = "https://github.com/servo/ipc-channel"}
 app_units = {version = "0.2.3", features = ["plugins"]}
 backtrace = "0.2.1"
 bitflags = "0.6.0"
@@ -29,11 +26,14 @@ euclid = {version = "0.6.4", features = ["unstable", "plugins"]}
 getopts = "0.2.11"
 heapsize = "0.3.0"
 heapsize_plugin = "0.1.2"
+ipc-channel = {git = "https://github.com/servo/ipc-channel"}
+js = {git = "https://github.com/servo/rust-mozjs", optional = true}
 lazy_static = "0.2"
 libc = "0.2"
 log = "0.3.5"
 num = "0.1.32"
 num_cpus = "0.2.2"
+plugins = {path = "../plugins"}
 rand = "0.3"
 rustc-serialize = "0.3"
 serde = "0.7"

ports/glutin/Cargo.toml

@@ -9,16 +9,16 @@ path = "lib.rs"
 
 [dependencies]
 bitflags = "0.6.0"
-url = {version = "1.0.0", features = ["heap_size"]}
-gleam = "0.2.8"
-euclid = {version = "0.6.4", features = ["plugins"]}
-servo-glutin = "0.4"
 compositing = {path = "../../components/compositing"}
-script_traits = {path = "../../components/script_traits"}
+euclid = {version = "0.6.4", features = ["plugins"]}
+gleam = "0.2.8"
 layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]}
 msg = {path = "../../components/msg"}
 net_traits = {path = "../../components/net_traits"}
+script_traits = {path = "../../components/script_traits"}
+servo-glutin = "0.4"
 style_traits = {path = "../../components/style_traits"}
+url = {version = "1.0.0", features = ["heap_size"]}
 util = {path = "../../components/util"}
 
 [target.'cfg(target_os = "linux")'.dependencies]