diff --git a/servo/components/canvas/Cargo.toml b/servo/components/canvas/Cargo.toml
index a199d191f567..2103e09ddc2f 100644
--- a/servo/components/canvas/Cargo.toml
+++ b/servo/components/canvas/Cargo.toml
@@ -45,9 +45,10 @@ rs
 "
 [
 dependencies
-.
-azure
 ]
+azure
+=
+{
 git
 =
 "
@@ -72,11 +73,10 @@ features
 plugins
 "
 ]
-[
-dependencies
-.
+}
 canvas_traits
-]
+=
+{
 path
 =
 "
@@ -85,11 +85,10 @@ path
 /
 canvas_traits
 "
-[
-dependencies
-.
+}
 plugins
-]
+=
+{
 path
 =
 "
@@ -98,11 +97,10 @@ path
 /
 plugins
 "
-[
-dependencies
-.
+}
 util
-]
+=
+{
 path
 =
 "
@@ -111,11 +109,10 @@ path
 /
 util
 "
-[
-dependencies
-.
+}
 gfx_traits
-]
+=
+{
 path
 =
 "
@@ -124,13 +121,12 @@ path
 /
 gfx_traits
 "
-[
-dependencies
-.
+}
 ipc
 -
 channel
-]
+=
+{
 git
 =
 "
@@ -148,11 +144,10 @@ ipc
 -
 channel
 "
-[
-dependencies
-.
+}
 webrender_traits
-]
+=
+{
 git
 =
 "
@@ -168,9 +163,7 @@ servo
 /
 webrender_traits
 "
-[
-dependencies
-]
+}
 euclid
 =
 {
diff --git a/servo/components/canvas_traits/Cargo.toml b/servo/components/canvas_traits/Cargo.toml
index 36ee94b8937e..b6a083d9970d 100644
--- a/servo/components/canvas_traits/Cargo.toml
+++ b/servo/components/canvas_traits/Cargo.toml
@@ -45,9 +45,10 @@ rs
 "
 [
 dependencies
-.
-gfx_traits
 ]
+gfx_traits
+=
+{
 path
 =
 "
@@ -56,11 +57,10 @@ path
 /
 gfx_traits
 "
-[
-dependencies
-.
+}
 azure
-]
+=
+{
 git
 =
 "
@@ -85,13 +85,12 @@ features
 plugins
 "
 ]
-[
-dependencies
-.
+}
 ipc
 -
 channel
-]
+=
+{
 git
 =
 "
@@ -109,11 +108,10 @@ ipc
 -
 channel
 "
-[
-dependencies
-.
+}
 serde
-]
+=
+{
 version
 =
 "
@@ -128,11 +126,10 @@ features
 nightly
 "
 ]
-[
-dependencies
-.
+}
 plugins
-]
+=
+{
 path
 =
 "
@@ -141,11 +138,10 @@ path
 /
 plugins
 "
-[
-dependencies
-.
+}
 webrender_traits
-]
+=
+{
 git
 =
 "
@@ -161,9 +157,7 @@ servo
 /
 webrender_traits
 "
-[
-dependencies
-]
+}
 cssparser
 =
 {
diff --git a/servo/components/compositing/Cargo.toml b/servo/components/compositing/Cargo.toml
index 8e7cb2b8b455..c1edafd72690 100644
--- a/servo/components/compositing/Cargo.toml
+++ b/servo/components/compositing/Cargo.toml
@@ -45,9 +45,10 @@ rs
 "
 [
 dependencies
-.
-gfx
 ]
+gfx
+=
+{
 path
 =
 "
@@ -56,11 +57,10 @@ path
 /
 gfx
 "
-[
-dependencies
-.
+}
 gfx_traits
-]
+=
+{
 path
 =
 "
@@ -69,11 +69,10 @@ path
 /
 gfx_traits
 "
-[
-dependencies
-.
+}
 layout_traits
-]
+=
+{
 path
 =
 "
@@ -82,11 +81,10 @@ path
 /
 layout_traits
 "
-[
-dependencies
-.
+}
 script_traits
-]
+=
+{
 path
 =
 "
@@ -95,11 +93,10 @@ path
 /
 script_traits
 "
-[
-dependencies
-.
+}
 style_traits
-]
+=
+{
 path
 =
 "
@@ -108,11 +105,10 @@ path
 /
 style_traits
 "
-[
-dependencies
-.
+}
 msg
-]
+=
+{
 path
 =
 "
@@ -121,11 +117,10 @@ path
 /
 msg
 "
-[
-dependencies
-.
+}
 profile_traits
-]
+=
+{
 path
 =
 "
@@ -134,11 +129,10 @@ path
 /
 profile_traits
 "
-[
-dependencies
-.
+}
 net_traits
-]
+=
+{
 path
 =
 "
@@ -147,11 +141,10 @@ path
 /
 net_traits
 "
-[
-dependencies
-.
+}
 util
-]
+=
+{
 path
 =
 "
@@ -160,11 +153,10 @@ path
 /
 util
 "
-[
-dependencies
-.
+}
 devtools_traits
-]
+=
+{
 path
 =
 "
@@ -173,11 +165,10 @@ path
 /
 devtools_traits
 "
-[
-dependencies
-.
+}
 canvas_traits
-]
+=
+{
 path
 =
 "
@@ -186,11 +177,10 @@ path
 /
 canvas_traits
 "
-[
-dependencies
-.
+}
 canvas
-]
+=
+{
 path
 =
 "
@@ -199,11 +189,10 @@ path
 /
 canvas
 "
-[
-dependencies
-.
+}
 plugins
-]
+=
+{
 path
 =
 "
@@ -212,11 +201,10 @@ path
 /
 plugins
 "
-[
-dependencies
-.
+}
 azure
-]
+=
+{
 git
 =
 "
@@ -241,11 +229,10 @@ features
 plugins
 "
 ]
-[
-dependencies
-.
+}
 layers
-]
+=
+{
 git
 =
 "
@@ -270,11 +257,10 @@ features
 plugins
 "
 ]
-[
-dependencies
-.
+}
 clipboard
-]
+=
+{
 git
 =
 "
@@ -292,13 +278,12 @@ rust
 -
 clipboard
 "
-[
-dependencies
-.
+}
 ipc
 -
 channel
-]
+=
+{
 git
 =
 "
@@ -316,187 +301,10 @@ ipc
 -
 channel
 "
-[
-target
-.
-arm
--
-linux
--
-androideabi
-.
-dependencies
-.
-gaol
-]
-git
-=
-"
-https
-:
-/
-/
-github
-.
-com
-/
-servo
-/
-gaol
-"
-[
-target
-.
-x86_64
--
-apple
--
-darwin
-.
-dependencies
-.
-gaol
-]
-git
-=
-"
-https
-:
-/
-/
-github
-.
-com
-/
-servo
-/
-gaol
-"
-[
-target
-.
-x86_64
--
-unknown
--
-linux
--
-gnu
-.
-dependencies
-.
-gaol
-]
-git
-=
-"
-https
-:
-/
-/
-github
-.
-com
-/
-servo
-/
-gaol
-"
-[
-target
-.
-i686
--
-unknown
--
-linux
--
-gnu
-.
-dependencies
-.
-gaol
-]
-git
-=
-"
-https
-:
-/
-/
-github
-.
-com
-/
-servo
-/
-gaol
-"
-[
-target
-.
-arm
--
-unknown
--
-linux
--
-gnueabihf
-.
-dependencies
-.
-gaol
-]
-git
-=
-"
-https
-:
-/
-/
-github
-.
-com
-/
-servo
-/
-gaol
-"
-[
-target
-.
-aarch64
--
-unknown
--
-linux
--
-gnu
-.
-dependencies
-.
-gaol
-]
-git
-=
-"
-https
-:
-/
-/
-github
-.
-com
-/
-servo
-/
-gaol
-"
-[
-dependencies
-.
+}
 webrender_traits
-]
+=
+{
 git
 =
 "
@@ -512,11 +320,10 @@ servo
 /
 webrender_traits
 "
-[
-dependencies
-.
+}
 webrender
-]
+=
+{
 git
 =
 "
@@ -532,9 +339,7 @@ servo
 /
 webrender
 "
-[
-dependencies
-]
+}
 app_units
 =
 {
@@ -670,3 +475,41 @@ heap_size
 "
 ]
 }
+[
+target
+.
+'
+cfg
+(
+not
+(
+target_os
+=
+"
+windows
+"
+)
+)
+'
+.
+dependencies
+]
+gaol
+=
+{
+git
+=
+"
+https
+:
+/
+/
+github
+.
+com
+/
+servo
+/
+gaol
+"
+}
diff --git a/servo/components/devtools/Cargo.toml b/servo/components/devtools/Cargo.toml
index 369217873ee8..87d1a4a5ef2f 100644
--- a/servo/components/devtools/Cargo.toml
+++ b/servo/components/devtools/Cargo.toml
@@ -45,9 +45,10 @@ rs
 "
 [
 dependencies
-.
-devtools_traits
 ]
+devtools_traits
+=
+{
 path
 =
 "
@@ -56,11 +57,10 @@ path
 /
 devtools_traits
 "
-[
-dependencies
-.
+}
 msg
-]
+=
+{
 path
 =
 "
@@ -69,11 +69,10 @@ path
 /
 msg
 "
-[
-dependencies
-.
+}
 util
-]
+=
+{
 path
 =
 "
@@ -82,11 +81,10 @@ path
 /
 util
 "
-[
-dependencies
-.
+}
 plugins
-]
+=
+{
 path
 =
 "
@@ -95,13 +93,12 @@ path
 /
 plugins
 "
-[
-dependencies
-.
+}
 ipc
 -
 channel
-]
+=
+{
 git
 =
 "
@@ -119,9 +116,7 @@ ipc
 -
 channel
 "
-[
-dependencies
-]
+}
 hyper
 =
 {
diff --git a/servo/components/devtools_traits/Cargo.toml b/servo/components/devtools_traits/Cargo.toml
index 5e861882be48..a57d003a3249 100644
--- a/servo/components/devtools_traits/Cargo.toml
+++ b/servo/components/devtools_traits/Cargo.toml
@@ -45,9 +45,10 @@ rs
 "
 [
 dependencies
-.
-msg
 ]
+msg
+=
+{
 path
 =
 "
@@ -56,13 +57,12 @@ path
 /
 msg
 "
-[
-dependencies
-.
+}
 ipc
 -
 channel
-]
+=
+{
 git
 =
 "
@@ -80,11 +80,10 @@ ipc
 -
 channel
 "
-[
-dependencies
-.
+}
 plugins
-]
+=
+{
 path
 =
 "
@@ -93,9 +92,7 @@ path
 /
 plugins
 "
-[
-dependencies
-]
+}
 heapsize
 =
 "
diff --git a/servo/components/gfx/Cargo.toml b/servo/components/gfx/Cargo.toml
index 4d4a9858d8a3..a8daa1db9f5e 100644
--- a/servo/components/gfx/Cargo.toml
+++ b/servo/components/gfx/Cargo.toml
@@ -274,11 +274,9 @@ heap_size
 "
 ]
 }
-[
-dependencies
-.
 plugins
-]
+=
+{
 path
 =
 "
@@ -287,11 +285,10 @@ path
 /
 plugins
 "
-[
-dependencies
-.
+}
 gfx_traits
-]
+=
+{
 path
 =
 "
@@ -300,11 +297,10 @@ path
 /
 gfx_traits
 "
-[
-dependencies
-.
+}
 net_traits
-]
+=
+{
 path
 =
 "
@@ -313,11 +309,10 @@ path
 /
 net_traits
 "
-[
-dependencies
-.
+}
 util
-]
+=
+{
 path
 =
 "
@@ -326,11 +321,10 @@ path
 /
 util
 "
-[
-dependencies
-.
+}
 msg
-]
+=
+{
 path
 =
 "
@@ -339,11 +333,10 @@ path
 /
 msg
 "
-[
-dependencies
-.
+}
 profile_traits
-]
+=
+{
 path
 =
 "
@@ -352,11 +345,10 @@ path
 /
 profile_traits
 "
-[
-dependencies
-.
+}
 range
-]
+=
+{
 path
 =
 "
@@ -365,11 +357,10 @@ path
 /
 range
 "
-[
-dependencies
-.
+}
 style
-]
+=
+{
 path
 =
 "
@@ -378,11 +369,10 @@ path
 /
 style
 "
-[
-dependencies
-.
+}
 style_traits
-]
+=
+{
 path
 =
 "
@@ -391,11 +381,10 @@ path
 /
 style_traits
 "
-[
-dependencies
-.
+}
 azure
-]
+=
+{
 git
 =
 "
@@ -420,11 +409,10 @@ features
 plugins
 "
 ]
-[
-dependencies
-.
+}
 layers
-]
+=
+{
 git
 =
 "
@@ -449,13 +437,12 @@ features
 plugins
 "
 ]
-[
-dependencies
-.
+}
 ipc
 -
 channel
-]
+=
+{
 git
 =
 "
@@ -473,11 +460,10 @@ ipc
 -
 channel
 "
-[
-dependencies
-.
+}
 webrender_traits
-]
+=
+{
 git
 =
 "
@@ -493,14 +479,20 @@ servo
 /
 webrender_traits
 "
+}
 [
 target
 .
-x86_64
--
-apple
--
-darwin
+'
+cfg
+(
+target_os
+=
+"
+macos
+"
+)
+'
 .
 dependencies
 ]
@@ -534,121 +526,29 @@ text
 [
 target
 .
-i686
--
-unknown
--
-linux
--
-gnu
-.
-dependencies
-]
-servo
--
-fontconfig
-=
-"
-0
-.
-2
-"
-[
-target
-.
-x86_64
--
-unknown
--
-linux
--
-gnu
-.
-dependencies
-]
-servo
--
-fontconfig
+'
+cfg
+(
+any
+(
+target_os
 =
 "
-0
-.
-2
-"
-[
-target
-.
-arm
--
-unknown
--
 linux
--
-gnueabihf
-.
-dependencies
-]
-servo
--
-fontconfig
-=
 "
-0
-.
-2
-"
-[
-target
-.
-aarch64
--
-unknown
--
-linux
--
-gnu
-.
-dependencies
-]
-servo
--
-fontconfig
+target_os
 =
 "
-0
-.
-2
+android
 "
-[
-target
-.
-arm
--
-linux
--
-androideabi
-.
-dependencies
-]
-servo
--
-fontconfig
+target_os
 =
 "
-0
-.
-2
-"
-[
-target
-.
-x86_64
--
-pc
--
 windows
--
-gnu
+"
+)
+)
+'
 .
 dependencies
 ]
@@ -661,117 +561,9 @@ fontconfig
 .
 2
 "
-[
-target
-.
-i686
--
-unknown
--
-linux
--
-gnu
-.
-dependencies
-.
 freetype
-]
-git
 =
-"
-https
-:
-/
-/
-github
-.
-com
-/
-servo
-/
-rust
--
-freetype
-"
-[
-target
-.
-x86_64
--
-unknown
--
-linux
--
-gnu
-.
-dependencies
-.
-freetype
-]
-git
-=
-"
-https
-:
-/
-/
-github
-.
-com
-/
-servo
-/
-rust
--
-freetype
-"
-[
-target
-.
-arm
--
-unknown
--
-linux
--
-gnueabihf
-.
-dependencies
-.
-freetype
-]
-git
-=
-"
-https
-:
-/
-/
-github
-.
-com
-/
-servo
-/
-rust
--
-freetype
-"
-[
-target
-.
-aarch64
--
-unknown
--
-linux
--
-gnu
-.
-dependencies
-.
-freetype
-]
+{
 git
 =
 "
@@ -789,201 +581,34 @@ rust
 -
 freetype
 "
+}
 [
 target
 .
-arm
--
-linux
--
-androideabi
-.
-dependencies
-.
-freetype
-]
-git
+'
+cfg
+(
+any
+(
+target_arch
 =
 "
-https
-:
-/
-/
-github
-.
-com
-/
-servo
-/
-rust
--
-freetype
-"
-[
-target
-.
 x86_64
--
-pc
--
-windows
--
-gnu
-.
-dependencies
-.
-freetype
-]
-git
-=
-"
-https
-:
-/
-/
-github
-.
-com
-/
-servo
-/
-rust
--
-freetype
 "
-[
-target
-.
-x86_64
--
-unknown
--
-linux
--
-gnu
-.
-dependencies
-.
-simd
-]
-git
+target_arch
 =
 "
-https
-:
-/
-/
-github
-.
-com
-/
-huonw
-/
-simd
-"
-[
-target
-.
-x86_64
--
-apple
--
-darwin
-.
-dependencies
-.
-simd
-]
-git
-=
-"
-https
-:
-/
-/
-github
-.
-com
-/
-huonw
-/
-simd
-"
-[
-target
-.
 aarch64
--
-unknown
--
-linux
--
-gnu
-.
-dependencies
-.
-simd
-]
-git
-=
 "
-https
-:
-/
-/
-github
-.
-com
-/
-huonw
-/
-simd
-"
-[
-target
-.
-x86_64
--
-pc
--
-windows
--
-gnu
+)
+)
+'
 .
 dependencies
-.
-simd
 ]
-git
-=
-"
-https
-:
-/
-/
-github
-.
-com
-/
-huonw
-/
-simd
-"
-[
-target
-.
-x86_64
--
-pc
--
-windows
--
-msvc
-.
-dependencies
-.
 simd
-]
+=
+{
 git
 =
 "
@@ -999,3 +624,4 @@ huonw
 /
 simd
 "
+}
diff --git a/servo/components/gfx_traits/Cargo.toml b/servo/components/gfx_traits/Cargo.toml
index b06cd05cec38..1d2c5f243549 100644
--- a/servo/components/gfx_traits/Cargo.toml
+++ b/servo/components/gfx_traits/Cargo.toml
@@ -45,9 +45,10 @@ rs
 "
 [
 dependencies
-.
-azure
 ]
+azure
+=
+{
 git
 =
 "
@@ -72,11 +73,10 @@ features
 plugins
 "
 ]
-[
-dependencies
-.
+}
 layers
-]
+=
+{
 git
 =
 "
@@ -101,11 +101,10 @@ features
 plugins
 "
 ]
-[
-dependencies
-.
+}
 msg
-]
+=
+{
 path
 =
 "
@@ -114,11 +113,10 @@ path
 /
 msg
 "
-[
-dependencies
-.
+}
 plugins
-]
+=
+{
 path
 =
 "
@@ -127,9 +125,7 @@ path
 /
 plugins
 "
-[
-dependencies
-]
+}
 euclid
 =
 {
diff --git a/servo/components/layout/Cargo.toml b/servo/components/layout/Cargo.toml
index ec490f0ba928..d5574fac28f3 100644
--- a/servo/components/layout/Cargo.toml
+++ b/servo/components/layout/Cargo.toml
@@ -45,9 +45,10 @@ rs
 "
 [
 dependencies
-.
-azure
 ]
+azure
+=
+{
 git
 =
 "
@@ -72,11 +73,10 @@ features
 plugins
 "
 ]
-[
-dependencies
-.
+}
 canvas_traits
-]
+=
+{
 path
 =
 "
@@ -85,11 +85,10 @@ path
 /
 canvas_traits
 "
-[
-dependencies
-.
+}
 gfx
-]
+=
+{
 path
 =
 "
@@ -98,11 +97,10 @@ path
 /
 gfx
 "
-[
-dependencies
-.
+}
 gfx_traits
-]
+=
+{
 path
 =
 "
@@ -111,11 +109,10 @@ path
 /
 gfx_traits
 "
-[
-dependencies
-.
+}
 msg
-]
+=
+{
 path
 =
 "
@@ -124,11 +121,10 @@ path
 /
 msg
 "
-[
-dependencies
-.
+}
 script
-]
+=
+{
 path
 =
 "
@@ -137,11 +133,10 @@ path
 /
 script
 "
-[
-dependencies
-.
+}
 layout_traits
-]
+=
+{
 path
 =
 "
@@ -150,11 +145,10 @@ path
 /
 layout_traits
 "
-[
-dependencies
-.
+}
 range
-]
+=
+{
 path
 =
 "
@@ -163,11 +157,10 @@ path
 /
 range
 "
-[
-dependencies
-.
+}
 script_traits
-]
+=
+{
 path
 =
 "
@@ -176,11 +169,10 @@ path
 /
 script_traits
 "
-[
-dependencies
-.
+}
 style
-]
+=
+{
 path
 =
 "
@@ -189,11 +181,10 @@ path
 /
 style
 "
-[
-dependencies
-.
+}
 style_traits
-]
+=
+{
 path
 =
 "
@@ -202,11 +193,10 @@ path
 /
 style_traits
 "
-[
-dependencies
-.
+}
 plugins
-]
+=
+{
 path
 =
 "
@@ -215,11 +205,10 @@ path
 /
 plugins
 "
-[
-dependencies
-.
+}
 net_traits
-]
+=
+{
 path
 =
 "
@@ -228,11 +217,10 @@ path
 /
 net_traits
 "
-[
-dependencies
-.
+}
 profile_traits
-]
+=
+{
 path
 =
 "
@@ -241,11 +229,10 @@ path
 /
 profile_traits
 "
-[
-dependencies
-.
+}
 util
-]
+=
+{
 path
 =
 "
@@ -254,13 +241,12 @@ path
 /
 util
 "
-[
-dependencies
-.
+}
 ipc
 -
 channel
-]
+=
+{
 git
 =
 "
@@ -278,11 +264,10 @@ ipc
 -
 channel
 "
-[
-dependencies
-.
+}
 webrender_traits
-]
+=
+{
 git
 =
 "
@@ -298,9 +283,7 @@ servo
 /
 webrender_traits
 "
-[
-dependencies
-]
+}
 app_units
 =
 {
diff --git a/servo/components/layout_traits/Cargo.toml b/servo/components/layout_traits/Cargo.toml
index d32acccff617..7444e55a0ad3 100644
--- a/servo/components/layout_traits/Cargo.toml
+++ b/servo/components/layout_traits/Cargo.toml
@@ -45,9 +45,10 @@ rs
 "
 [
 dependencies
-.
-gfx
 ]
+gfx
+=
+{
 path
 =
 "
@@ -56,11 +57,10 @@ path
 /
 gfx
 "
-[
-dependencies
-.
+}
 script_traits
-]
+=
+{
 path
 =
 "
@@ -69,11 +69,10 @@ path
 /
 script_traits
 "
-[
-dependencies
-.
+}
 msg
-]
+=
+{
 path
 =
 "
@@ -82,11 +81,10 @@ path
 /
 msg
 "
-[
-dependencies
-.
+}
 net_traits
-]
+=
+{
 path
 =
 "
@@ -95,11 +93,10 @@ path
 /
 net_traits
 "
-[
-dependencies
-.
+}
 profile_traits
-]
+=
+{
 path
 =
 "
@@ -108,11 +105,10 @@ path
 /
 profile_traits
 "
-[
-dependencies
-.
+}
 util
-]
+=
+{
 path
 =
 "
@@ -121,13 +117,12 @@ path
 /
 util
 "
-[
-dependencies
-.
+}
 ipc
 -
 channel
-]
+=
+{
 git
 =
 "
@@ -145,11 +140,10 @@ ipc
 -
 channel
 "
-[
-dependencies
-.
+}
 webrender_traits
-]
+=
+{
 git
 =
 "
@@ -165,9 +159,7 @@ servo
 /
 webrender_traits
 "
-[
-dependencies
-]
+}
 serde
 =
 "
diff --git a/servo/components/msg/Cargo.toml b/servo/components/msg/Cargo.toml
index d8582f733949..706c942a44df 100644
--- a/servo/components/msg/Cargo.toml
+++ b/servo/components/msg/Cargo.toml
@@ -45,9 +45,10 @@ rs
 "
 [
 dependencies
-.
-util
 ]
+util
+=
+{
 path
 =
 "
@@ -56,11 +57,10 @@ path
 /
 util
 "
-[
-dependencies
-.
+}
 layers
-]
+=
+{
 git
 =
 "
@@ -85,13 +85,12 @@ features
 plugins
 "
 ]
-[
-dependencies
-.
+}
 ipc
 -
 channel
-]
+=
+{
 git
 =
 "
@@ -109,11 +108,10 @@ ipc
 -
 channel
 "
-[
-dependencies
-.
+}
 plugins
-]
+=
+{
 path
 =
 "
@@ -122,11 +120,10 @@ path
 /
 plugins
 "
-[
-dependencies
-.
+}
 webrender_traits
-]
+=
+{
 git
 =
 "
@@ -142,9 +139,7 @@ servo
 /
 webrender_traits
 "
-[
-dependencies
-]
+}
 bitflags
 =
 "
diff --git a/servo/components/net/Cargo.toml b/servo/components/net/Cargo.toml
index faca742fb899..2a26e9cbd834 100644
--- a/servo/components/net/Cargo.toml
+++ b/servo/components/net/Cargo.toml
@@ -45,9 +45,10 @@ rs
 "
 [
 dependencies
-.
-net_traits
 ]
+net_traits
+=
+{
 path
 =
 "
@@ -56,11 +57,10 @@ path
 /
 net_traits
 "
-[
-dependencies
-.
+}
 util
-]
+=
+{
 path
 =
 "
@@ -69,11 +69,10 @@ path
 /
 util
 "
-[
-dependencies
-.
+}
 devtools_traits
-]
+=
+{
 path
 =
 "
@@ -82,11 +81,10 @@ path
 /
 devtools_traits
 "
-[
-dependencies
-.
+}
 brotli
-]
+=
+{
 git
 =
 "
@@ -104,11 +102,10 @@ brotli
 -
 rs
 "
-[
-dependencies
-.
+}
 plugins
-]
+=
+{
 path
 =
 "
@@ -117,11 +114,10 @@ path
 /
 plugins
 "
-[
-dependencies
-.
+}
 msg
-]
+=
+{
 path
 =
 "
@@ -130,13 +126,12 @@ path
 /
 msg
 "
-[
-dependencies
-.
+}
 ipc
 -
 channel
-]
+=
+{
 git
 =
 "
@@ -154,11 +149,10 @@ ipc
 -
 channel
 "
-[
-dependencies
-.
+}
 webrender_traits
-]
+=
+{
 git
 =
 "
@@ -174,9 +168,7 @@ servo
 /
 webrender_traits
 "
-[
-dependencies
-]
+}
 cookie
 =
 {
diff --git a/servo/components/net_traits/Cargo.toml b/servo/components/net_traits/Cargo.toml
index 96cb47d12cf4..0be581fa59b0 100644
--- a/servo/components/net_traits/Cargo.toml
+++ b/servo/components/net_traits/Cargo.toml
@@ -45,9 +45,10 @@ rs
 "
 [
 dependencies
-.
-util
 ]
+util
+=
+{
 path
 =
 "
@@ -56,11 +57,10 @@ path
 /
 util
 "
-[
-dependencies
-.
+}
 msg
-]
+=
+{
 path
 =
 "
@@ -69,13 +69,12 @@ path
 /
 msg
 "
-[
-dependencies
-.
+}
 ipc
 -
 channel
-]
+=
+{
 git
 =
 "
@@ -93,11 +92,10 @@ ipc
 -
 channel
 "
-[
-dependencies
-.
+}
 plugins
-]
+=
+{
 path
 =
 "
@@ -106,9 +104,7 @@ path
 /
 plugins
 "
-[
-dependencies
-]
+}
 heapsize
 =
 "
diff --git a/servo/components/plugins/Cargo.toml b/servo/components/plugins/Cargo.toml
index 19af67fa3fd3..378ad840db41 100644
--- a/servo/components/plugins/Cargo.toml
+++ b/servo/components/plugins/Cargo.toml
@@ -48,6 +48,18 @@ plugin
 true
 [
 dependencies
+]
+tenacious
+=
+"
+0
+.
+2
+.
+0
+"
+[
+dependencies
 .
 clippy
 ]
@@ -77,18 +89,6 @@ optional
 =
 true
 [
-dependencies
-]
-tenacious
-=
-"
-0
-.
-2
-.
-0
-"
-[
 features
 ]
 default
diff --git a/servo/components/profile/Cargo.toml b/servo/components/profile/Cargo.toml
index 5a05aa0b1bbb..849634904a4c 100644
--- a/servo/components/profile/Cargo.toml
+++ b/servo/components/profile/Cargo.toml
@@ -45,9 +45,10 @@ rs
 "
 [
 dependencies
-.
-profile_traits
 ]
+profile_traits
+=
+{
 path
 =
 "
@@ -56,11 +57,10 @@ path
 /
 profile_traits
 "
-[
-dependencies
-.
+}
 plugins
-]
+=
+{
 path
 =
 "
@@ -69,11 +69,10 @@ path
 /
 plugins
 "
-[
-dependencies
-.
+}
 util
-]
+=
+{
 path
 =
 "
@@ -82,13 +81,12 @@ path
 /
 util
 "
-[
-dependencies
-.
+}
 ipc
 -
 channel
-]
+=
+{
 git
 =
 "
@@ -106,9 +104,7 @@ ipc
 -
 channel
 "
-[
-dependencies
-]
+}
 hbs
 -
 pow
@@ -134,15 +130,6 @@ libc
 .
 2
 "
-regex
-=
-"
-0
-.
-1
-.
-55
-"
 time
 =
 "
@@ -155,16 +142,22 @@ time
 [
 target
 .
-x86_64
--
-apple
--
-darwin
+'
+cfg
+(
+target_os
+=
+"
+macos
+"
+)
+'
 .
 dependencies
-.
-task_info
 ]
+task_info
+=
+{
 path
 =
 "
@@ -180,31 +173,29 @@ rust
 -
 task_info
 "
+}
 [
 target
 .
-i686
--
-apple
--
-darwin
+'
+cfg
+(
+target_os
+=
+"
+linux
+"
+)
+'
 .
 dependencies
-.
-task_info
 ]
-path
+regex
 =
 "
+0
 .
+1
 .
-/
-.
-.
-/
-support
-/
-rust
--
-task_info
+55
 "
diff --git a/servo/components/profile_traits/Cargo.toml b/servo/components/profile_traits/Cargo.toml
index 15a23f3f1fca..1b7394622656 100644
--- a/servo/components/profile_traits/Cargo.toml
+++ b/servo/components/profile_traits/Cargo.toml
@@ -62,11 +62,12 @@ monitor
 ]
 [
 dependencies
-.
+]
 ipc
 -
 channel
-]
+=
+{
 git
 =
 "
@@ -84,11 +85,10 @@ ipc
 -
 channel
 "
-[
-dependencies
-.
+}
 energymon
-]
+=
+{
 git
 =
 "
@@ -111,13 +111,12 @@ git
 optional
 =
 true
-[
-dependencies
-.
+}
 energy
 -
 monitor
-]
+=
+{
 version
 =
 "
@@ -130,11 +129,10 @@ version
 optional
 =
 true
-[
-dependencies
-.
+}
 plugins
-]
+=
+{
 path
 =
 "
@@ -143,9 +141,7 @@ path
 /
 plugins
 "
-[
-dependencies
-]
+}
 serde
 =
 "
diff --git a/servo/components/script/Cargo.toml b/servo/components/script/Cargo.toml
index b2ddbab5a1f8..4db4dea384d6 100644
--- a/servo/components/script/Cargo.toml
+++ b/servo/components/script/Cargo.toml
@@ -64,9 +64,10 @@ debugmozjs
 ]
 [
 dependencies
-.
-plugins
 ]
+plugins
+=
+{
 path
 =
 "
@@ -75,11 +76,10 @@ path
 /
 plugins
 "
-[
-dependencies
-.
+}
 util
-]
+=
+{
 path
 =
 "
@@ -88,11 +88,10 @@ path
 /
 util
 "
-[
-dependencies
-.
+}
 msg
-]
+=
+{
 path
 =
 "
@@ -101,11 +100,10 @@ path
 /
 msg
 "
-[
-dependencies
-.
+}
 net_traits
-]
+=
+{
 path
 =
 "
@@ -114,11 +112,10 @@ path
 /
 net_traits
 "
-[
-dependencies
-.
+}
 profile_traits
-]
+=
+{
 path
 =
 "
@@ -127,11 +124,10 @@ path
 /
 profile_traits
 "
-[
-dependencies
-.
+}
 script_traits
-]
+=
+{
 path
 =
 "
@@ -140,11 +136,10 @@ path
 /
 script_traits
 "
-[
-dependencies
-.
+}
 devtools_traits
-]
+=
+{
 path
 =
 "
@@ -153,11 +148,10 @@ path
 /
 devtools_traits
 "
-[
-dependencies
-.
+}
 style
-]
+=
+{
 path
 =
 "
@@ -166,11 +160,10 @@ path
 /
 style
 "
-[
-dependencies
-.
+}
 canvas
-]
+=
+{
 path
 =
 "
@@ -179,11 +172,10 @@ path
 /
 canvas
 "
-[
-dependencies
-.
+}
 canvas_traits
-]
+=
+{
 path
 =
 "
@@ -192,11 +184,10 @@ path
 /
 canvas_traits
 "
-[
-dependencies
-.
+}
 js
-]
+=
+{
 git
 =
 "
@@ -214,11 +205,10 @@ rust
 -
 mozjs
 "
-[
-dependencies
-.
+}
 angle
-]
+=
+{
 git
 =
 "
@@ -239,13 +229,12 @@ branch
 "
 servo
 "
-[
-dependencies
-.
+}
 ipc
 -
 channel
-]
+=
+{
 git
 =
 "
@@ -263,11 +252,10 @@ ipc
 -
 channel
 "
-[
-dependencies
-.
+}
 xml5ever
-]
+=
+{
 git
 =
 "
@@ -290,11 +278,10 @@ features
 unstable
 "
 ]
-[
-dependencies
-.
+}
 gfx_traits
-]
+=
+{
 path
 =
 "
@@ -303,11 +290,10 @@ path
 /
 gfx_traits
 "
-[
-dependencies
-.
+}
 webrender_traits
-]
+=
+{
 git
 =
 "
@@ -323,9 +309,7 @@ servo
 /
 webrender_traits
 "
-[
-dependencies
-]
+}
 app_units
 =
 {
diff --git a/servo/components/script_traits/Cargo.toml b/servo/components/script_traits/Cargo.toml
index 5219211ea751..216af350daa5 100644
--- a/servo/components/script_traits/Cargo.toml
+++ b/servo/components/script_traits/Cargo.toml
@@ -45,9 +45,10 @@ rs
 "
 [
 dependencies
-.
-canvas_traits
 ]
+canvas_traits
+=
+{
 path
 =
 "
@@ -56,11 +57,10 @@ path
 /
 canvas_traits
 "
-[
-dependencies
-.
+}
 gfx_traits
-]
+=
+{
 path
 =
 "
@@ -69,11 +69,10 @@ path
 /
 gfx_traits
 "
-[
-dependencies
-.
+}
 msg
-]
+=
+{
 path
 =
 "
@@ -82,11 +81,10 @@ path
 /
 msg
 "
-[
-dependencies
-.
+}
 net_traits
-]
+=
+{
 path
 =
 "
@@ -95,11 +93,10 @@ path
 /
 net_traits
 "
-[
-dependencies
-.
+}
 plugins
-]
+=
+{
 path
 =
 "
@@ -108,11 +105,10 @@ path
 /
 plugins
 "
-[
-dependencies
-.
+}
 profile_traits
-]
+=
+{
 path
 =
 "
@@ -121,11 +117,10 @@ path
 /
 profile_traits
 "
-[
-dependencies
-.
+}
 style_traits
-]
+=
+{
 path
 =
 "
@@ -134,11 +129,10 @@ path
 /
 style_traits
 "
-[
-dependencies
-.
+}
 util
-]
+=
+{
 path
 =
 "
@@ -147,11 +141,10 @@ path
 /
 util
 "
-[
-dependencies
-.
+}
 devtools_traits
-]
+=
+{
 path
 =
 "
@@ -160,13 +153,12 @@ path
 /
 devtools_traits
 "
-[
-dependencies
-.
+}
 ipc
 -
 channel
-]
+=
+{
 git
 =
 "
@@ -184,9 +176,7 @@ ipc
 -
 channel
 "
-[
-dependencies
-]
+}
 app_units
 =
 {
diff --git a/servo/components/servo/Cargo.toml b/servo/components/servo/Cargo.toml
index 83675f85c176..2da59b236273 100644
--- a/servo/components/servo/Cargo.toml
+++ b/servo/components/servo/Cargo.toml
@@ -86,6 +86,69 @@ bench
 =
 false
 [
+features
+]
+default
+=
+[
+"
+glutin_app
+"
+"
+webdriver
+"
+]
+webdriver
+=
+[
+"
+webdriver_server
+"
+]
+energy
+-
+profiling
+=
+[
+"
+profile_traits
+/
+energy
+-
+profiling
+"
+]
+[
+profile
+.
+release
+]
+opt
+-
+level
+=
+3
+codegen
+-
+units
+=
+4
+#
+Uncomment
+to
+profile
+on
+Linux
+:
+#
+debug
+=
+true
+#
+lto
+=
+false
+[
 dev
 -
 dependencies
@@ -97,13 +160,9 @@ image
 .
 9
 "
-[
-dev
--
-dependencies
-.
 gfx_tests
-]
+=
+{
 path
 =
 "
@@ -119,13 +178,10 @@ unit
 /
 gfx
 "
-[
-dev
--
-dependencies
-.
+}
 layout_tests
-]
+=
+{
 path
 =
 "
@@ -141,13 +197,10 @@ unit
 /
 layout
 "
-[
-dev
--
-dependencies
-.
+}
 net_tests
-]
+=
+{
 path
 =
 "
@@ -163,13 +216,10 @@ unit
 /
 net
 "
-[
-dev
--
-dependencies
-.
+}
 net_traits_tests
-]
+=
+{
 path
 =
 "
@@ -185,13 +235,10 @@ unit
 /
 net_traits
 "
-[
-dev
--
-dependencies
-.
+}
 profile_tests
-]
+=
+{
 path
 =
 "
@@ -207,13 +254,10 @@ unit
 /
 profile
 "
-[
-dev
--
-dependencies
-.
+}
 script_tests
-]
+=
+{
 path
 =
 "
@@ -229,13 +273,10 @@ unit
 /
 script
 "
-[
-dev
--
-dependencies
-.
+}
 style_tests
-]
+=
+{
 path
 =
 "
@@ -251,13 +292,10 @@ unit
 /
 style
 "
-[
-dev
--
-dependencies
-.
+}
 util_tests
-]
+=
+{
 path
 =
 "
@@ -273,13 +311,10 @@ unit
 /
 util
 "
-[
-dev
--
-dependencies
-.
+}
 compiletest_helper
-]
+=
+{
 path
 =
 "
@@ -295,13 +330,10 @@ compiletest
 /
 helper
 "
-[
-dev
--
-dependencies
-.
+}
 plugin_compiletest
-]
+=
+{
 path
 =
 "
@@ -317,11 +349,13 @@ compiletest
 /
 plugin
 "
+}
 [
 dependencies
-.
-webrender_traits
 ]
+webrender_traits
+=
+{
 git
 =
 "
@@ -337,11 +371,10 @@ servo
 /
 webrender_traits
 "
-[
-dependencies
-.
+}
 webrender
-]
+=
+{
 git
 =
 "
@@ -357,74 +390,10 @@ servo
 /
 webrender
 "
-[
-features
-]
-default
-=
-[
-"
-glutin_app
-"
-"
-webdriver
-"
-]
-webdriver
-=
-[
-"
-webdriver_server
-"
-]
-energy
--
-profiling
-=
-[
-"
-profile_traits
-/
-energy
--
-profiling
-"
-]
-[
-profile
-.
-release
-]
-opt
--
-level
-=
-3
-codegen
--
-units
-=
-4
-#
-Uncomment
-to
-profile
-on
-Linux
-:
-#
-debug
-=
-true
-#
-lto
-=
-false
-[
-dependencies
-.
+}
 compositing
-]
+=
+{
 path
 =
 "
@@ -433,11 +402,10 @@ path
 /
 compositing
 "
-[
-dependencies
-.
+}
 net
-]
+=
+{
 path
 =
 "
@@ -446,11 +414,10 @@ path
 /
 net
 "
-[
-dependencies
-.
+}
 net_traits
-]
+=
+{
 path
 =
 "
@@ -459,11 +426,10 @@ path
 /
 net_traits
 "
-[
-dependencies
-.
+}
 msg
-]
+=
+{
 path
 =
 "
@@ -472,11 +438,10 @@ path
 /
 msg
 "
-[
-dependencies
-.
+}
 profile
-]
+=
+{
 path
 =
 "
@@ -485,11 +450,10 @@ path
 /
 profile
 "
-[
-dependencies
-.
+}
 profile_traits
-]
+=
+{
 path
 =
 "
@@ -498,11 +462,10 @@ path
 /
 profile_traits
 "
-[
-dependencies
-.
+}
 util
-]
+=
+{
 path
 =
 "
@@ -520,11 +483,10 @@ non
 geckolib
 "
 ]
-[
-dependencies
-.
+}
 script
-]
+=
+{
 path
 =
 "
@@ -533,11 +495,10 @@ path
 /
 script
 "
-[
-dependencies
-.
+}
 script_traits
-]
+=
+{
 path
 =
 "
@@ -546,11 +507,10 @@ path
 /
 script_traits
 "
-[
-dependencies
-.
+}
 layout
-]
+=
+{
 path
 =
 "
@@ -559,11 +519,10 @@ path
 /
 layout
 "
-[
-dependencies
-.
+}
 gfx
-]
+=
+{
 path
 =
 "
@@ -572,11 +531,10 @@ path
 /
 gfx
 "
-[
-dependencies
-.
+}
 style
-]
+=
+{
 path
 =
 "
@@ -585,11 +543,10 @@ path
 /
 style
 "
-[
-dependencies
-.
+}
 canvas
-]
+=
+{
 path
 =
 "
@@ -598,11 +555,10 @@ path
 /
 canvas
 "
-[
-dependencies
-.
+}
 canvas_traits
-]
+=
+{
 path
 =
 "
@@ -611,11 +567,10 @@ path
 /
 canvas_traits
 "
-[
-dependencies
-.
+}
 devtools
-]
+=
+{
 path
 =
 "
@@ -624,11 +579,10 @@ path
 /
 devtools
 "
-[
-dependencies
-.
+}
 webdriver_server
-]
+=
+{
 path
 =
 "
@@ -640,11 +594,10 @@ webdriver_server
 optional
 =
 true
-[
-dependencies
-.
+}
 devtools_traits
-]
+=
+{
 path
 =
 "
@@ -653,11 +606,10 @@ path
 /
 devtools_traits
 "
-[
-dependencies
-.
+}
 glutin_app
-]
+=
+{
 path
 =
 "
@@ -674,11 +626,10 @@ glutin
 optional
 =
 true
-[
-dependencies
-.
+}
 android_glue
-]
+=
+{
 version
 =
 "
@@ -691,216 +642,12 @@ version
 optional
 =
 true
-[
-target
-.
-arm
--
-linux
--
-androideabi
-.
-dependencies
-.
-log
-]
-version
-=
-"
-0
-.
-3
-"
-features
-=
-[
-"
-release_max_level_info
-"
-]
-[
-target
-.
-arm
--
-linux
--
-androideabi
-.
-dependencies
-.
-gaol
-]
-git
-=
-"
-https
-:
-/
-/
-github
-.
-com
-/
-servo
-/
-gaol
-"
-[
-target
-.
-x86_64
--
-apple
--
-darwin
-.
-dependencies
-.
-gaol
-]
-git
-=
-"
-https
-:
-/
-/
-github
-.
-com
-/
-servo
-/
-gaol
-"
-[
-target
-.
-x86_64
--
-unknown
--
-linux
--
-gnu
-.
-dependencies
-.
-gaol
-]
-git
-=
-"
-https
-:
-/
-/
-github
-.
-com
-/
-servo
-/
-gaol
-"
-[
-target
-.
-i686
--
-unknown
--
-linux
--
-gnu
-.
-dependencies
-.
-gaol
-]
-git
-=
-"
-https
-:
-/
-/
-github
-.
-com
-/
-servo
-/
-gaol
-"
-[
-target
-.
-arm
--
-unknown
--
-linux
--
-gnueabihf
-.
-dependencies
-.
-gaol
-]
-git
-=
-"
-https
-:
-/
-/
-github
-.
-com
-/
-servo
-/
-gaol
-"
-[
-target
-.
-aarch64
--
-unknown
--
-linux
--
-gnu
-.
-dependencies
-.
-gaol
-]
-git
-=
-"
-https
-:
-/
-/
-github
-.
-com
-/
-servo
-/
-gaol
-"
-[
-dependencies
-.
+}
 ipc
 -
 channel
-]
+=
+{
 git
 =
 "
@@ -918,11 +665,10 @@ ipc
 -
 channel
 "
-[
-dependencies
-.
+}
 layers
-]
+=
+{
 git
 =
 "
@@ -947,23 +693,17 @@ features
 plugins
 "
 ]
-[
-dependencies
-.
+}
 gleam
-]
-version
 =
 "
 0
 .
 2
 "
-[
-dependencies
-.
 browserhtml
-]
+=
+{
 git
 =
 "
@@ -986,9 +726,7 @@ gh
 -
 pages
 "
-[
-dependencies
-]
+}
 bitflags
 =
 "
@@ -1056,3 +794,75 @@ query_encoding
 "
 ]
 }
+[
+target
+.
+'
+cfg
+(
+target_os
+=
+"
+android
+"
+)
+'
+.
+dependencies
+]
+log
+=
+{
+version
+=
+"
+0
+.
+3
+"
+features
+=
+[
+"
+release_max_level_info
+"
+]
+}
+[
+target
+.
+'
+cfg
+(
+not
+(
+target_os
+=
+"
+windows
+"
+)
+)
+'
+.
+dependencies
+]
+gaol
+=
+{
+git
+=
+"
+https
+:
+/
+/
+github
+.
+com
+/
+servo
+/
+gaol
+"
+}
diff --git a/servo/components/style/Cargo.toml b/servo/components/style/Cargo.toml
index 46c63d1c8ce6..23f9517f0b1a 100644
--- a/servo/components/style/Cargo.toml
+++ b/servo/components/style/Cargo.toml
@@ -59,9 +59,10 @@ gecko
 ]
 [
 dependencies
-.
-plugins
 ]
+plugins
+=
+{
 path
 =
 "
@@ -70,11 +71,10 @@ path
 /
 plugins
 "
-[
-dependencies
-.
+}
 util
-]
+=
+{
 path
 =
 "
@@ -83,11 +83,10 @@ path
 /
 util
 "
-[
-dependencies
-.
+}
 style_traits
-]
+=
+{
 path
 =
 "
@@ -96,9 +95,7 @@ path
 /
 style_traits
 "
-[
-dependencies
-]
+}
 app_units
 =
 {
diff --git a/servo/components/style_traits/Cargo.toml b/servo/components/style_traits/Cargo.toml
index 79aeb54a2b01..beec3e91359b 100644
--- a/servo/components/style_traits/Cargo.toml
+++ b/servo/components/style_traits/Cargo.toml
@@ -45,9 +45,10 @@ rs
 "
 [
 dependencies
-.
-util
 ]
+util
+=
+{
 path
 =
 "
@@ -56,11 +57,10 @@ path
 /
 util
 "
-[
-dependencies
-.
+}
 plugins
-]
+=
+{
 path
 =
 "
@@ -69,9 +69,7 @@ path
 /
 plugins
 "
-[
-dependencies
-]
+}
 cssparser
 =
 {
diff --git a/servo/components/util/Cargo.toml b/servo/components/util/Cargo.toml
index b784a749228e..2923161f3185 100644
--- a/servo/components/util/Cargo.toml
+++ b/servo/components/util/Cargo.toml
@@ -127,9 +127,10 @@ js
 ]
 [
 dependencies
-.
-plugins
 ]
+plugins
+=
+{
 path
 =
 "
@@ -138,11 +139,10 @@ path
 /
 plugins
 "
-[
-dependencies
-.
+}
 js
-]
+=
+{
 git
 =
 "
@@ -163,13 +163,12 @@ mozjs
 optional
 =
 true
-[
-dependencies
-.
+}
 ipc
 -
 channel
-]
+=
+{
 git
 =
 "
@@ -187,9 +186,7 @@ ipc
 -
 channel
 "
-[
-dependencies
-]
+}
 app_units
 =
 {
@@ -409,13 +406,12 @@ serde
 [
 target
 .
-x86_64
--
-pc
--
+'
+cfg
+(
 windows
--
-gnu
+)
+'
 .
 dependencies
 ]
diff --git a/servo/components/webdriver_server/Cargo.toml b/servo/components/webdriver_server/Cargo.toml
index a45cd83aea54..824aae0ebcfc 100644
--- a/servo/components/webdriver_server/Cargo.toml
+++ b/servo/components/webdriver_server/Cargo.toml
@@ -45,9 +45,10 @@ rs
 "
 [
 dependencies
-.
-compositing
 ]
+compositing
+=
+{
 path
 =
 "
@@ -56,11 +57,10 @@ path
 /
 compositing
 "
-[
-dependencies
-.
+}
 msg
-]
+=
+{
 path
 =
 "
@@ -69,11 +69,10 @@ path
 /
 msg
 "
-[
-dependencies
-.
+}
 plugins
-]
+=
+{
 path
 =
 "
@@ -82,11 +81,10 @@ path
 /
 plugins
 "
-[
-dependencies
-.
+}
 util
-]
+=
+{
 path
 =
 "
@@ -95,13 +93,12 @@ path
 /
 util
 "
-[
-dependencies
-.
+}
 ipc
 -
 channel
-]
+=
+{
 git
 =
 "
@@ -119,9 +116,7 @@ ipc
 -
 channel
 "
-[
-dependencies
-]
+}
 image
 =
 "
diff --git a/servo/ports/cef/Cargo.toml b/servo/ports/cef/Cargo.toml
index 2bee31d0e679..ee854a53fd01 100644
--- a/servo/ports/cef/Cargo.toml
+++ b/servo/ports/cef/Cargo.toml
@@ -138,11 +138,9 @@ heap_size
 "
 ]
 }
-[
-dependencies
-.
 servo
-]
+=
+{
 path
 =
 "
@@ -156,11 +154,10 @@ components
 /
 servo
 "
-[
-dependencies
-.
+}
 glutin_app
-]
+=
+{
 path
 =
 "
@@ -169,11 +166,10 @@ path
 /
 glutin
 "
-[
-dependencies
-.
+}
 plugins
-]
+=
+{
 path
 =
 "
@@ -187,11 +183,10 @@ components
 /
 plugins
 "
-[
-dependencies
-.
+}
 compositing
-]
+=
+{
 path
 =
 "
@@ -205,11 +200,10 @@ components
 /
 compositing
 "
-[
-dependencies
-.
+}
 gfx
-]
+=
+{
 path
 =
 "
@@ -223,11 +217,10 @@ components
 /
 gfx
 "
-[
-dependencies
-.
+}
 log
-]
+=
+{
 version
 =
 "
@@ -244,11 +237,10 @@ features
 release_max_level_info
 "
 ]
-[
-dependencies
-.
+}
 script
-]
+=
+{
 path
 =
 "
@@ -262,11 +254,10 @@ components
 /
 script
 "
-[
-dependencies
-.
+}
 script_traits
-]
+=
+{
 path
 =
 "
@@ -280,11 +271,10 @@ components
 /
 script_traits
 "
-[
-dependencies
-.
+}
 net_traits
-]
+=
+{
 path
 =
 "
@@ -298,11 +288,10 @@ components
 /
 net_traits
 "
-[
-dependencies
-.
+}
 msg
-]
+=
+{
 path
 =
 "
@@ -316,11 +305,10 @@ components
 /
 msg
 "
-[
-dependencies
-.
+}
 util
-]
+=
+{
 path
 =
 "
@@ -343,11 +331,10 @@ non
 geckolib
 "
 ]
-[
-dependencies
-.
+}
 style
-]
+=
+{
 path
 =
 "
@@ -361,11 +348,10 @@ components
 /
 style
 "
-[
-dependencies
-.
+}
 style_traits
-]
+=
+{
 path
 =
 "
@@ -379,11 +365,10 @@ components
 /
 style_traits
 "
-[
-dependencies
-.
+}
 devtools
-]
+=
+{
 path
 =
 "
@@ -397,11 +382,10 @@ components
 /
 devtools
 "
-[
-dependencies
-.
+}
 azure
-]
+=
+{
 git
 =
 "
@@ -426,11 +410,10 @@ features
 plugins
 "
 ]
-[
-dependencies
-.
+}
 js
-]
+=
+{
 git
 =
 "
@@ -448,11 +431,10 @@ rust
 -
 mozjs
 "
-[
-dependencies
-.
+}
 layers
-]
+=
+{
 git
 =
 "
@@ -477,14 +459,20 @@ features
 plugins
 "
 ]
+}
 [
 target
 .
-x86_64
--
-apple
--
-darwin
+'
+cfg
+(
+target_os
+=
+"
+macos
+"
+)
+'
 .
 dependencies
 ]
@@ -539,33 +527,16 @@ cgl
 [
 target
 .
-i686
--
-unknown
--
-linux
--
-gnu
-.
-dependencies
-]
-x11
+'
+cfg
+(
+target_os
 =
 "
-2
-.
-3
-"
-[
-target
-.
-x86_64
--
-unknown
--
 linux
--
-gnu
+"
+)
+'
 .
 dependencies
 ]
diff --git a/servo/ports/geckolib/Cargo.toml b/servo/ports/geckolib/Cargo.toml
index 68c9638b579f..4fe3c5ff2dd0 100644
--- a/servo/ports/geckolib/Cargo.toml
+++ b/servo/ports/geckolib/Cargo.toml
@@ -251,11 +251,9 @@ serde
 "
 ]
 }
-[
-dependencies
-.
 log
-]
+=
+{
 version
 =
 "
@@ -272,11 +270,10 @@ features
 release_max_level_info
 "
 ]
-[
-dependencies
-.
+}
 plugins
-]
+=
+{
 path
 =
 "
@@ -290,11 +287,10 @@ components
 /
 plugins
 "
-[
-dependencies
-.
+}
 util
-]
+=
+{
 path
 =
 "
@@ -308,11 +304,10 @@ components
 /
 util
 "
-[
-dependencies
-.
+}
 style
-]
+=
+{
 path
 =
 "
@@ -333,3 +328,4 @@ features
 gecko
 "
 ]
+}
diff --git a/servo/ports/glutin/Cargo.toml b/servo/ports/glutin/Cargo.toml
index 9e7d68d397ee..584c523d98ab 100644
--- a/servo/ports/glutin/Cargo.toml
+++ b/servo/ports/glutin/Cargo.toml
@@ -108,11 +108,9 @@ glutin
 .
 4
 "
-[
-dependencies
-.
 compositing
-]
+=
+{
 path
 =
 "
@@ -126,11 +124,10 @@ components
 /
 compositing
 "
-[
-dependencies
-.
+}
 script_traits
-]
+=
+{
 path
 =
 "
@@ -144,11 +141,10 @@ components
 /
 script_traits
 "
-[
-dependencies
-.
+}
 layers
-]
+=
+{
 git
 =
 "
@@ -173,11 +169,10 @@ features
 plugins
 "
 ]
-[
-dependencies
-.
+}
 msg
-]
+=
+{
 path
 =
 "
@@ -191,11 +186,10 @@ components
 /
 msg
 "
-[
-dependencies
-.
+}
 net_traits
-]
+=
+{
 path
 =
 "
@@ -209,11 +203,10 @@ components
 /
 net_traits
 "
-[
-dependencies
-.
+}
 style_traits
-]
+=
+{
 path
 =
 "
@@ -227,11 +220,10 @@ components
 /
 style_traits
 "
-[
-dependencies
-.
+}
 util
-]
+=
+{
 path
 =
 "
@@ -245,60 +237,20 @@ components
 /
 util
 "
+}
 [
 target
 .
-i686
--
-unknown
--
-linux
--
-gnu
-.
-dependencies
-]
-x11
+'
+cfg
+(
+target_os
 =
 "
-2
-.
-0
-.
-0
-"
-[
-target
-.
-x86_64
--
-unknown
--
 linux
--
-gnu
-.
-dependencies
-]
-x11
-=
 "
-2
-.
-0
-.
-0
-"
-[
-target
-.
-arm
--
-unknown
--
-linux
--
-gnueabihf
+)
+'
 .
 dependencies
 ]
@@ -314,33 +266,16 @@ x11
 [
 target
 .
-aarch64
--
-unknown
--
-linux
--
-gnu
-.
-dependencies
-]
-x11
+'
+cfg
+(
+target_os
 =
 "
-2
-.
-0
-.
-0
+android
 "
-[
-target
-.
-arm
--
-linux
--
-androideabi
+)
+'
 .
 dependencies
 ]
diff --git a/servo/ports/gonk/Cargo.toml b/servo/ports/gonk/Cargo.toml
index bfb34a81eb84..0938af6da555 100644
--- a/servo/ports/gonk/Cargo.toml
+++ b/servo/ports/gonk/Cargo.toml
@@ -34,9 +34,10 @@ rs
 "
 [
 dependencies
-.
-compositing
 ]
+compositing
+=
+{
 path
 =
 "
@@ -50,11 +51,10 @@ components
 /
 compositing
 "
-[
-dependencies
-.
+}
 layers
-]
+=
+{
 git
 =
 "
@@ -79,11 +79,10 @@ features
 plugins
 "
 ]
-[
-dependencies
-.
+}
 msg
-]
+=
+{
 path
 =
 "
@@ -97,11 +96,10 @@ components
 /
 msg
 "
-[
-dependencies
-.
+}
 script
-]
+=
+{
 path
 =
 "
@@ -115,11 +113,10 @@ components
 /
 script
 "
-[
-dependencies
-.
+}
 script_traits
-]
+=
+{
 path
 =
 "
@@ -133,11 +130,10 @@ components
 /
 script_traits
 "
-[
-dependencies
-.
+}
 style_traits
-]
+=
+{
 path
 =
 "
@@ -151,11 +147,10 @@ components
 /
 style_traits
 "
-[
-dependencies
-.
+}
 net_traits
-]
+=
+{
 path
 =
 "
@@ -169,11 +164,10 @@ components
 /
 net_traits
 "
-[
-dependencies
-.
+}
 gfx
-]
+=
+{
 path
 =
 "
@@ -187,11 +181,10 @@ components
 /
 gfx
 "
-[
-dependencies
-.
+}
 layout
-]
+=
+{
 path
 =
 "
@@ -205,11 +198,10 @@ components
 /
 layout
 "
-[
-dependencies
-.
+}
 devtools
-]
+=
+{
 path
 =
 "
@@ -223,11 +215,10 @@ components
 /
 devtools
 "
-[
-dependencies
-.
+}
 servo
-]
+=
+{
 path
 =
 "
@@ -246,11 +237,10 @@ default
 features
 =
 false
-[
-dependencies
-.
+}
 profile
-]
+=
+{
 path
 =
 "
@@ -264,11 +254,10 @@ components
 /
 profile
 "
-[
-dependencies
-.
+}
 util
-]
+=
+{
 path
 =
 "
@@ -291,9 +280,7 @@ non
 geckolib
 "
 ]
-[
-dependencies
-]
+}
 env_logger
 =
 "
diff --git a/servo/tests/compiletest/helper/Cargo.toml b/servo/tests/compiletest/helper/Cargo.toml
index 118b13588d09..c03527058de5 100644
--- a/servo/tests/compiletest/helper/Cargo.toml
+++ b/servo/tests/compiletest/helper/Cargo.toml
@@ -45,13 +45,13 @@ doctest
 false
 [
 dependencies
-.
-compiletest_rs
 ]
 compiletest_rs
 =
 "
 0
 .
-11
+1
+.
+1
 "
diff --git a/servo/tests/compiletest/plugin/Cargo.toml b/servo/tests/compiletest/plugin/Cargo.toml
index cdda70c614c8..46f3f778c626 100644
--- a/servo/tests/compiletest/plugin/Cargo.toml
+++ b/servo/tests/compiletest/plugin/Cargo.toml
@@ -45,9 +45,10 @@ doctest
 false
 [
 dependencies
-.
-compiletest_helper
 ]
+compiletest_helper
+=
+{
 path
 =
 "
@@ -56,11 +57,10 @@ path
 /
 helper
 "
-[
-dependencies
-.
+}
 plugins
-]
+=
+{
 path
 =
 "
@@ -77,11 +77,10 @@ components
 /
 plugins
 "
-[
-dependencies
-.
+}
 script
-]
+=
+{
 path
 =
 "
@@ -98,3 +97,4 @@ components
 /
 script
 "
+}
diff --git a/servo/tests/unit/gfx/Cargo.toml b/servo/tests/unit/gfx/Cargo.toml
index 7c87141bebe6..13b51cf7891f 100644
--- a/servo/tests/unit/gfx/Cargo.toml
+++ b/servo/tests/unit/gfx/Cargo.toml
@@ -45,9 +45,10 @@ doctest
 false
 [
 dependencies
-.
-gfx
 ]
+gfx
+=
+{
 path
 =
 "
@@ -64,13 +65,12 @@ components
 /
 gfx
 "
-[
-dependencies
-.
+}
 ipc
 -
 channel
-]
+=
+{
 git
 =
 "
@@ -88,11 +88,10 @@ ipc
 -
 channel
 "
-[
-dependencies
-.
+}
 style
-]
+=
+{
 path
 =
 "
@@ -109,3 +108,4 @@ components
 /
 style
 "
+}
diff --git a/servo/tests/unit/layout/Cargo.toml b/servo/tests/unit/layout/Cargo.toml
index be417637b274..1b0a2971ba64 100644
--- a/servo/tests/unit/layout/Cargo.toml
+++ b/servo/tests/unit/layout/Cargo.toml
@@ -45,9 +45,10 @@ doctest
 false
 [
 dependencies
-.
-layout
 ]
+layout
+=
+{
 path
 =
 "
@@ -64,3 +65,4 @@ components
 /
 layout
 "
+}
diff --git a/servo/tests/unit/net/Cargo.toml b/servo/tests/unit/net/Cargo.toml
index 5cd296df80dd..413c657139f3 100644
--- a/servo/tests/unit/net/Cargo.toml
+++ b/servo/tests/unit/net/Cargo.toml
@@ -45,9 +45,10 @@ doctest
 false
 [
 dependencies
-.
-net
 ]
+net
+=
+{
 path
 =
 "
@@ -64,11 +65,10 @@ components
 /
 net
 "
-[
-dependencies
-.
+}
 net_traits
-]
+=
+{
 path
 =
 "
@@ -85,11 +85,10 @@ components
 /
 net_traits
 "
-[
-dependencies
-.
+}
 util
-]
+=
+{
 path
 =
 "
@@ -106,11 +105,10 @@ components
 /
 util
 "
-[
-dependencies
-.
+}
 msg
-]
+=
+{
 path
 =
 "
@@ -127,11 +125,10 @@ components
 /
 msg
 "
-[
-dependencies
-.
+}
 plugins
-]
+=
+{
 path
 =
 "
@@ -148,11 +145,10 @@ components
 /
 plugins
 "
-[
-dependencies
-.
+}
 devtools_traits
-]
+=
+{
 path
 =
 "
@@ -169,13 +165,12 @@ components
 /
 devtools_traits
 "
-[
-dependencies
-.
+}
 ipc
 -
 channel
-]
+=
+{
 git
 =
 "
@@ -193,9 +188,7 @@ ipc
 -
 channel
 "
-[
-dependencies
-]
+}
 cookie
 =
 "
diff --git a/servo/tests/unit/net_traits/Cargo.toml b/servo/tests/unit/net_traits/Cargo.toml
index 52c12ffcbfd3..7fcf355a422e 100644
--- a/servo/tests/unit/net_traits/Cargo.toml
+++ b/servo/tests/unit/net_traits/Cargo.toml
@@ -45,9 +45,10 @@ doctest
 false
 [
 dependencies
-.
-net_traits
 ]
+net_traits
+=
+{
 path
 =
 "
@@ -64,3 +65,4 @@ components
 /
 net_traits
 "
+}
diff --git a/servo/tests/unit/profile/Cargo.toml b/servo/tests/unit/profile/Cargo.toml
index 35da1fd195f0..41ba231aea02 100644
--- a/servo/tests/unit/profile/Cargo.toml
+++ b/servo/tests/unit/profile/Cargo.toml
@@ -45,9 +45,10 @@ doctest
 false
 [
 dependencies
-.
-profile
 ]
+profile
+=
+{
 path
 =
 "
@@ -64,11 +65,10 @@ components
 /
 profile
 "
-[
-dependencies
-.
+}
 profile_traits
-]
+=
+{
 path
 =
 "
@@ -85,3 +85,4 @@ components
 /
 profile_traits
 "
+}
diff --git a/servo/tests/unit/script/Cargo.toml b/servo/tests/unit/script/Cargo.toml
index 5c7ba6b58029..006a36d77c03 100644
--- a/servo/tests/unit/script/Cargo.toml
+++ b/servo/tests/unit/script/Cargo.toml
@@ -45,9 +45,10 @@ doctest
 false
 [
 dependencies
-.
-msg
 ]
+msg
+=
+{
 path
 =
 "
@@ -64,11 +65,10 @@ components
 /
 msg
 "
-[
-dependencies
-.
+}
 plugins
-]
+=
+{
 path
 =
 "
@@ -85,11 +85,10 @@ components
 /
 plugins
 "
-[
-dependencies
-.
+}
 script
-]
+=
+{
 path
 =
 "
@@ -106,11 +105,10 @@ components
 /
 script
 "
-[
-dependencies
-.
+}
 util
-]
+=
+{
 path
 =
 "
@@ -127,9 +125,7 @@ components
 /
 util
 "
-[
-dependencies
-]
+}
 url
 =
 {
diff --git a/servo/tests/unit/style/Cargo.toml b/servo/tests/unit/style/Cargo.toml
index 709de8cef743..5d455a38bfaf 100644
--- a/servo/tests/unit/style/Cargo.toml
+++ b/servo/tests/unit/style/Cargo.toml
@@ -45,9 +45,10 @@ doctest
 false
 [
 dependencies
-.
-msg
 ]
+msg
+=
+{
 path
 =
 "
@@ -64,11 +65,10 @@ components
 /
 msg
 "
-[
-dependencies
-.
+}
 plugins
-]
+=
+{
 path
 =
 "
@@ -85,11 +85,10 @@ components
 /
 plugins
 "
-[
-dependencies
-.
+}
 style
-]
+=
+{
 path
 =
 "
@@ -106,11 +105,10 @@ components
 /
 style
 "
-[
-dependencies
-.
+}
 style_traits
-]
+=
+{
 path
 =
 "
@@ -127,11 +125,10 @@ components
 /
 style_traits
 "
-[
-dependencies
-.
+}
 util
-]
+=
+{
 path
 =
 "
@@ -148,9 +145,7 @@ components
 /
 util
 "
-[
-dependencies
-]
+}
 app_units
 =
 {
diff --git a/servo/tests/unit/util/Cargo.toml b/servo/tests/unit/util/Cargo.toml
index 1cbd85cb6b14..fee1e662efd7 100644
--- a/servo/tests/unit/util/Cargo.toml
+++ b/servo/tests/unit/util/Cargo.toml
@@ -45,9 +45,10 @@ doctest
 false
 [
 dependencies
-.
-util
 ]
+util
+=
+{
 path
 =
 "
@@ -64,11 +65,10 @@ components
 /
 util
 "
-[
-dependencies
-.
+}
 plugins
-]
+=
+{
 path
 =
 "
@@ -85,9 +85,7 @@ components
 /
 plugins
 "
-[
-dependencies
-]
+}
 app_units
 =
 {