More Cargo.toml cleanups

components/config/Cargo.toml

@@ -14,18 +14,18 @@ name = "servo_config"
 path = "lib.rs"
 
 [dependencies]
-euclid = "0.20"
 embedder_traits = { path = "../embedder_traits" }
+euclid = "0.20"
 getopts = "0.2.11"
 lazy_static = "1"
 log = "0.4"
 num_cpus = "1.1.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-servo_geometry = {path = "../geometry"}
-servo_url = {path = "../url"}
-url = "2.0"
 servo_config_plugins = { path = "../config_plugins" }
+servo_geometry = { path = "../geometry" }
+servo_url = { path = "../url" }
+url = "2.0"
 
 [dev-dependencies]
 std_test_override = { path = "../std_test_override" }

components/config_plugins/Cargo.toml

@@ -12,7 +12,7 @@ proc-macro = true
 path = "lib.rs"
 
 [dependencies]
-syn = { version = "1", default-features = false, features = ["clone-impls", "parsing"] }
-quote = "1"
-proc-macro2 = "1"
 itertools = "0.8"
+proc-macro2 = "1"
+quote = "1"
+syn = { version = "1", default-features = false, features = ["clone-impls", "parsing"] }

components/devtools/Cargo.toml

@@ -12,16 +12,16 @@ path = "lib.rs"
 
 [dependencies]
 crossbeam-channel = "0.4"
-devtools_traits = {path = "../devtools_traits"}
-embedder_traits = {path = "../embedder_traits"}
+devtools_traits = { path = "../devtools_traits" }
+embedder_traits = { path = "../embedder_traits" }
 headers = "0.2"
 http = "0.1"
 hyper = "0.12"
 ipc-channel = "0.14"
 log = "0.4"
-msg = {path = "../msg"}
+msg = { path = "../msg" }
 serde = "1.0"
 serde_json = "1.0"
 servo_url = { path = "../url" }
 time = "0.1"
-uuid = {version = "0.8", features = ["v4"]}
+uuid = { version = "0.8", features = ["v4"] }

components/devtools_traits/Cargo.toml

@@ -16,8 +16,8 @@ http = "0.1"
 ipc-channel = "0.14"
 malloc_size_of = { path = "../malloc_size_of" }
 malloc_size_of_derive = "0.1"
-msg = {path = "../msg"}
+msg = { path = "../msg" }
 serde = "1.0"
-servo_url = {path = "../url"}
+servo_url = { path = "../url" }
 time = "0.1"
-uuid = {version = "0.8", features = ["v4", "serde"]}
+uuid = { version = "0.8", features = ["v4", "serde"] }

components/domobject_derive/Cargo.toml

@@ -12,5 +12,5 @@ proc-macro = true
 
 [dependencies]
 proc-macro2 = "1"
-syn = { version = "1", default-features = false, features = ["clone-impls", "derive", "parsing"] }
 quote = "1"
+syn = { version = "1", default-features = false, features = ["clone-impls", "derive", "parsing"] }

components/embedder_traits/Cargo.toml

@@ -16,10 +16,10 @@ ipc-channel = "0.14"
 keyboard-types = "0.4.3"
 lazy_static = "1"
 log = "0.4"
-msg = {path = "../msg"}
-num-traits = "0.2"
+msg = { path = "../msg" }
 num-derive = "0.3"
+num-traits = "0.2"
 serde = "1.0"
-servo_url = {path = "../url"}
-webrender_api = {git = "https://github.com/servo/webrender"}
-webxr-api = {git = "https://github.com/servo/webxr", features = ["ipc"]}
+servo_url = { path = "../url" }
+webrender_api = { git = "https://github.com/servo/webrender" }
+webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] }

components/fallible/Cargo.toml

@@ -10,16 +10,16 @@ name = "fallible"
 path = "lib.rs"
 
 [dependencies]
-smallvec = "1.0"
 hashglobe = { path = "../hashglobe" }
+smallvec = "1.0"
 
 # This crate effectively does nothing except if the `known_system_malloc`
 # feature is specified.
 #
 # In that case, we actually call the system malloc functions to reserve space,
-# otherwise we just let rust do its thing (aborting on OOM).
+# otherwise we just let Rust do its thing (aborting on OOM).
 #
 # This is effectively a stop-gap measure until we can do this properly in
-# stable rust.
+# stable Rust.
 [features]
 known_system_malloc = []

components/gfx/Cargo.toml

@@ -18,28 +18,28 @@ app_units = "0.7"
 bitflags = "1.0"
 euclid = "0.20"
 fnv = "1.0"
-fontsan = {git = "https://github.com/servo/fontsan"}
-gfx_traits = {path = "../gfx_traits"}
+fontsan = { git = "https://github.com/servo/fontsan" }
+gfx_traits = { path = "../gfx_traits" }
 harfbuzz-sys = "0.3"
 ipc-channel = "0.14"
 lazy_static = "1"
 libc = "0.2"
 log = "0.4"
 malloc_size_of = { path = "../malloc_size_of" }
-net_traits = {path = "../net_traits"}
-range = {path = "../range"}
+net_traits = { path = "../net_traits" }
+range = { path = "../range" }
 serde = "1.0"
-servo_arc = {path = "../servo_arc"}
-servo_atoms = {path = "../atoms"}
-servo_url = {path = "../url"}
+servo_arc = { path = "../servo_arc" }
+servo_atoms = { path = "../atoms" }
+servo_url = { path = "../url" }
 smallvec = { version = "0.6", features = ["std", "union"] }
-style = {path = "../style", features = ["servo"]}
+style = { path = "../style", features = ["servo"] }
 time = "0.1.12"
-unicode-bidi = {version = "0.3", features = ["with_serde"]}
-unicode-script = {version = "0.3", features = ["harfbuzz"]}
-webrender_api = {git = "https://github.com/servo/webrender"}
-xi-unicode = "0.1.0"
 ucd = "0.1.1"
+unicode-bidi = { version = "0.3", features = ["with_serde"] }
+unicode-script = { version = "0.3", features = ["harfbuzz"] }
+webrender_api = { git = "https://github.com/servo/webrender" }
+xi-unicode = "0.1.0"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 byteorder = "1.0"
@@ -49,7 +49,7 @@ core-text = "15.0"
 
 [target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
 freetype = "0.4"
-servo_allocator = {path = "../allocator"}
+servo_allocator = { path = "../allocator" }
 
 [target.'cfg(target_os = "linux")'.dependencies]
 servo-fontconfig = "0.4"

components/gfx_traits/Cargo.toml

@@ -13,5 +13,5 @@ path = "lib.rs"
 [dependencies]
 malloc_size_of = { path = "../malloc_size_of" }
 malloc_size_of_derive = "0.1"
-range = {path = "../range"}
+range = { path = "../range" }
 serde = "1.0"

components/hashglobe/Cargo.toml

@@ -6,7 +6,6 @@ license = "MIT/Apache-2.0"
 description = "Fork of std::HashMap with stable fallible allocation."
 documentation = "https://docs.rs/hashglobe"
 repository = "https://github.com/Manishearth/hashglobe"
-
 readme = "README.md"
 
 [dependencies]

components/layout/Cargo.toml

@@ -16,44 +16,44 @@ doctest = false
 app_units = "0.7"
 atomic_refcell = "0.1"
 bitflags = "1.0"
-canvas_traits = {path = "../canvas_traits"}
+canvas_traits = { path = "../canvas_traits" }
 crossbeam-channel = "0.4"
-embedder_traits = {path = "../embedder_traits"}
+embedder_traits = { path = "../embedder_traits" }
 euclid = "0.20"
 fnv = "1.0"
 fxhash = "0.2"
-gfx = {path = "../gfx"}
-gfx_traits = {path = "../gfx_traits"}
+gfx = { path = "../gfx" }
+gfx_traits = { path = "../gfx_traits" }
 html5ever = "0.25"
 ipc-channel = "0.14"
 lazy_static = "1"
 libc = "0.2"
 log = "0.4"
 malloc_size_of = { path = "../malloc_size_of" }
-msg = {path = "../msg"}
-net_traits = {path = "../net_traits"}
+msg = { path = "../msg" }
+net_traits = { path = "../net_traits" }
 num-traits = "0.2"
 parking_lot = "0.9"
-profile_traits = {path = "../profile_traits"}
-range = {path = "../range"}
+profile_traits = { path = "../profile_traits" }
+range = { path = "../range" }
 rayon = "1"
-script_layout_interface = {path = "../script_layout_interface"}
-script_traits = {path = "../script_traits"}
+script_layout_interface = { path = "../script_layout_interface" }
+script_traits = { path = "../script_traits" }
 serde = "1.0"
-servo_arc = {path = "../servo_arc"}
-servo_atoms = {path = "../atoms"}
-servo_geometry = {path = "../geometry"}
 serde_json = "1.0"
-servo_config = {path = "../config"}
-servo_url = {path = "../url"}
+servo_arc = { path = "../servo_arc" }
+servo_atoms = { path = "../atoms" }
+servo_config = { path = "../config" }
+servo_geometry = { path = "../geometry" }
+servo_url = { path = "../url" }
 smallvec = { version = "0.6", features = ["std", "union"] }
-style = {path = "../style", features = ["servo", "servo-layout-2013"]}
-style_traits = {path = "../style_traits"}
-unicode-bidi = {version = "0.3", features = ["with_serde"]}
-unicode-script = {version = "0.3", features = ["harfbuzz"]}
-webrender_api = {git = "https://github.com/servo/webrender"}
+style = { path = "../style", features = ["servo", "servo-layout-2013"] }
+style_traits = { path = "../style_traits" }
+unicode-bidi = { version = "0.3", features = ["with_serde"] }
+unicode-script = { version = "0.3", features = ["harfbuzz"] }
+webrender_api = { git = "https://github.com/servo/webrender" }
 xi-unicode = "0.1.0"
 
 [dev-dependencies]
-size_of_test = {path = "../size_of_test"}
+size_of_test = { path = "../size_of_test" }
 

components/layout_2020/Cargo.toml

@@ -15,32 +15,32 @@ doctest = false
 [dependencies]
 app_units = "0.7"
 atomic_refcell = "0.1.6"
-canvas_traits = {path = "../canvas_traits"}
+canvas_traits = { path = "../canvas_traits" }
 cssparser = "0.27"
-embedder_traits = {path = "../embedder_traits"}
+embedder_traits = { path = "../embedder_traits" }
 euclid = "0.20"
 fnv = "1.0"
-gfx = {path = "../gfx"}
-gfx_traits = {path = "../gfx_traits"}
+gfx = { path = "../gfx" }
+gfx_traits = { path = "../gfx_traits" }
 html5ever = "0.25"
 ipc-channel = "0.14"
 libc = "0.2"
 log = "0.4"
-msg = {path = "../msg"}
 mitochondria = "1.1.2"
-net_traits = {path = "../net_traits"}
+msg = { path = "../msg" }
+net_traits = { path = "../net_traits" }
 parking_lot = "0.9"
-range = {path = "../range"}
+range = { path = "../range" }
 rayon = "1"
 rayon_croissant = "0.2.0"
-script_layout_interface = {path = "../script_layout_interface"}
-script_traits = {path = "../script_traits"}
+script_layout_interface = { path = "../script_layout_interface" }
+script_traits = { path = "../script_traits" }
 serde = "1.0"
 serde_json = "1.0"
 servo_arc = { path = "../servo_arc" }
-servo_geometry = {path = "../geometry"}
-servo_url = {path = "../url"}
-style = {path = "../style", features = ["servo", "servo-layout-2020"]}
-style_traits = {path = "../style_traits"}
-unicode-script = {version = "0.3", features = ["harfbuzz"]}
-webrender_api = {git = "https://github.com/servo/webrender"}
+servo_geometry = { path = "../geometry" }
+servo_url = { path = "../url" }
+style = { path = "../style", features = ["servo", "servo-layout-2020"] }
+style_traits = { path = "../style_traits" }
+unicode-script = { version = "0.3", features = ["harfbuzz"] }
+webrender_api = { git = "https://github.com/servo/webrender" }

components/layout_thread/Cargo.toml

@@ -14,40 +14,40 @@ path = "lib.rs"
 app_units = "0.7"
 atomic_refcell = "0.1"
 crossbeam-channel = "0.4"
-embedder_traits = {path = "../embedder_traits"}
+embedder_traits = { path = "../embedder_traits" }
 euclid = "0.20"
 fnv = "1.0"
 fxhash = "0.2"
-gfx = {path = "../gfx"}
-gfx_traits = {path = "../gfx_traits"}
+gfx = { path = "../gfx" }
+gfx_traits = { path = "../gfx_traits" }
 histogram = "0.6.8"
 html5ever = "0.25"
 ipc-channel = "0.14"
-layout = {path = "../layout", package = "layout_2013"}
-layout_traits = {path = "../layout_traits"}
+layout = { path = "../layout", package = "layout_2013" }
+layout_traits = { path = "../layout_traits" }
 lazy_static = "1"
 libc = "0.2"
 log = "0.4"
-time = "0.1.17"
 malloc_size_of = { path = "../malloc_size_of" }
-metrics = {path = "../metrics"}
-msg = {path = "../msg"}
-net_traits = {path = "../net_traits"}
+metrics = { path = "../metrics" }
+msg = { path = "../msg" }
+net_traits = { path = "../net_traits" }
 parking_lot = { version = "0.9", features = ["nightly"] }
-profile_traits = {path = "../profile_traits"}
-range = {path = "../range"}
+profile_traits = { path = "../profile_traits" }
+range = { path = "../range" }
 rayon = "1"
-script = {path = "../script"}
-script_layout_interface = {path = "../script_layout_interface"}
-script_traits = {path = "../script_traits"}
+script = { path = "../script" }
+script_layout_interface = { path = "../script_layout_interface" }
+script_traits = { path = "../script_traits" }
 selectors = { path = "../selectors" }
 serde_json = "1.0"
-servo_allocator = {path = "../allocator"}
-servo_arc = {path = "../servo_arc"}
-servo_atoms = {path = "../atoms"}
-servo_config = {path = "../config"}
-servo_geometry = {path = "../geometry"}
-servo_url = {path = "../url"}
-style = {path = "../style"}
-style_traits = {path = "../style_traits"}
-webrender_api = {git = "https://github.com/servo/webrender"}
+servo_allocator = { path = "../allocator" }
+servo_arc = { path = "../servo_arc" }
+servo_atoms = { path = "../atoms" }
+servo_config = { path = "../config" }
+servo_geometry = { path = "../geometry" }
+servo_url = { path = "../url" }
+style = { path = "../style" }
+style_traits = { path = "../style_traits" }
+time = "0.1.17"
+webrender_api = { git = "https://github.com/servo/webrender" }