More Cargo.toml updates

Cargo.toml

@@ -26,9 +26,9 @@ opt-level = 3
 #     [patch."https://github.com/servo/<repository>"]
 #     <crate> = { path = "/path/to/local/checkout" }
 
-# Those are here to dedupe winapi since mio is still using winapi 0.2.
+# This is here to dedupe winapi since mio 0.6 is still using winapi 0.2.
 mio = { git = "https://github.com/servo/mio.git", branch = "servo" }
+surfman = { git = "https://github.com/servo/surfman" }
+surfman-chains = { git = "https://github.com/asajeffrey/surfman-chains" }
 # https://github.com/retep998/winapi-rs/pull/816
 winapi = { git = "https://github.com/servo/winapi-rs", branch = "patch-1" }
-surfman-chains = { git = "https://github.com/asajeffrey/surfman-chains" }
-surfman = { git = "https://github.com/servo/surfman" }

components/style/Cargo.toml

@@ -36,7 +36,6 @@ bitflags = "1.0"
 byteorder = "1.0"
 cssparser = "0.27"
 derive_more = "0.99"
-new_debug_unreachable = "1.0"
 encoding_rs = { version = "0.8", optional = true }
 euclid = "0.20"
 fallible = { path = "../fallible" }
@@ -50,10 +49,11 @@ lazy_static = "1"
 log = { version = "0.4", features = ["std"] }
 malloc_size_of = { path = "../malloc_size_of" }
 malloc_size_of_derive = "0.1"
-num_cpus = {version = "1.1.0", optional = true}
+new_debug_unreachable = "1.0"
+num-derive = "0.3"
 num-integer = "0.1"
 num-traits = "0.2"
-num-derive = "0.3"
+num_cpus = { version = "1.1.0", optional = true }
 owning_ref = "0.4"
 parking_lot = "0.10"
 precomputed-hash = "0.1.1"
@@ -63,25 +63,25 @@ serde = {version = "1.0", optional = true, features = ["derive"]}
 servo_arc = { path = "../servo_arc" }
 servo_atoms = { path = "../atoms", optional = true }
 servo_config = { path = "../config", optional = true }
+servo_url = { path = "../url", optional = true }
 smallbitvec = "2.3.0"
 smallvec = "1.0"
 string_cache = { version = "0.8", optional = true }
 style_derive = { path = "../style_derive" }
 style_traits = { path = "../style_traits" }
-servo_url = {path = "../url", optional = true}
 thin-slice = { version = "0.1.0", optional = true }
+time = "0.1"
 to_shmem = { path = "../to_shmem" }
 to_shmem_derive = { path = "../to_shmem_derive" }
-time = "0.1"
 uluru = "0.4"
 unicode-bidi = "0.3"
 unicode-segmentation = "1.0"
 void = "1.0.2"
 
 [build-dependencies]
+bindgen = { version = "0.53", optional = true, default-features = false }
 lazy_static = "1"
 log = "0.4"
-bindgen = {version = "0.53", optional = true, default-features = false}
 regex = { version = "1.1", optional = true }
-walkdir = "2.1.4"
 toml = { version = "0.5", optional = true, default-features = false }
+walkdir = "2.1.4"

components/style_traits/Cargo.toml

@@ -15,17 +15,17 @@ gecko = []
 
 [dependencies]
 app_units = "0.7"
-cssparser = "0.27"
 bitflags = "1.0"
+cssparser = "0.27"
 euclid = "0.20"
 lazy_static = "1"
 malloc_size_of = { path = "../malloc_size_of" }
 malloc_size_of_derive = "0.1"
 selectors = { path = "../selectors" }
 serde = "1.0"
-webrender_api = {git = "https://github.com/servo/webrender", optional = true}
-servo_atoms = {path = "../atoms", optional = true}
 servo_arc = { path = "../servo_arc" }
+servo_atoms = { path = "../atoms", optional = true }
 servo_url = { path = "../url", optional = true }
 to_shmem = { path = "../to_shmem" }
 to_shmem_derive = { path = "../to_shmem_derive" }
+webrender_api = { git = "https://github.com/servo/webrender", optional = true }

components/url/Cargo.toml

@@ -13,8 +13,8 @@ path = "lib.rs"
 [dependencies]
 malloc_size_of = { path = "../malloc_size_of", features = ["servo"] }
 malloc_size_of_derive = "0.1"
-to_shmem = { path = "../to_shmem" }
 serde = { version = "1.0", features = ["derive"] }
 servo_rand = { path = "../rand" }
+to_shmem = { path = "../to_shmem" }
 url = { version = "2.0", features = ["serde"] }
-uuid = {version = "0.8", features = ["v4", "serde"]}
+uuid = { version = "0.8", features = ["serde", "v4"] }

components/webdriver_server/Cargo.toml

@@ -23,9 +23,9 @@ keyboard-types = "0.4.3"
 log = "0.4"
 msg = { path = "../msg" }
 pixels = { path = "../pixels" }
+script_traits = { path = "../script_traits" }
 serde = "1"
 serde_json = "1"
-script_traits = {path = "../script_traits"}
 servo_config = { path = "../config" }
 servo_url = { path = "../url" }
 style_traits = { path = "../style_traits" }

components/webgpu/Cargo.toml

@@ -18,5 +18,5 @@ malloc_size_of = { path = "../malloc_size_of" }
 serde = { version = "1.0", features = ["serde_derive"] }
 servo_config = { path = "../config" }
 smallvec = { version = "0.6", features = ["serde"] }
-wgpu-core = { version = "0.5.0", git = "https://github.com/gfx-rs/wgpu", features = ["trace", "replay"] }
+wgpu-core = { version = "0.5.0", git = "https://github.com/gfx-rs/wgpu", features = ["replay", "trace"] }
-wgpu-types = { version = "0.5.0", git = "https://github.com/gfx-rs/wgpu", features = ["trace", "replay"] }
+wgpu-types = { version = "0.5.0", git = "https://github.com/gfx-rs/wgpu", features = ["replay", "trace"] }