diff --git a/Cargo.lock b/Cargo.lock
index 9e732a50334..f6c6c03ddf0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -148,11 +148,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "autocfg"
-version = "0.1.6"
-source = "git+https://github.com/servo/autocfg?branch=rustflags2#9142612f4b2599e6a858dc32cd3cbda5c98bd651"
-
 [[package]]
 name = "azure"
 version = "0.37.0"
@@ -426,6 +421,16 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "c2-chacha"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101"
+dependencies = [
+ "lazy_static",
+ "ppv-lite86",
+]
+
 [[package]]
 name = "canvas"
 version = "0.0.1"
@@ -872,18 +877,16 @@ dependencies = [
 
 [[package]]
 name = "cssparser"
-version = "0.25.9"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbe18ca4efb9ba3716c6da66cc3d7e673bf59fa576353011f48c4cfddbdd740e"
+checksum = "dc63bba4f652956b1afadd4e21c52e76b7dd4f7aefb9e79db8611d0726a9d354"
 dependencies = [
- "autocfg",
  "cssparser-macros",
  "dtoa-short",
  "itoa",
  "matches",
  "phf",
  "proc-macro2 1.0.1",
- "procedural-masquerade",
  "quote 1.0.2",
  "serde",
  "smallvec",
@@ -892,13 +895,10 @@ dependencies = [
 
 [[package]]
 name = "cssparser-macros"
-version = "0.3.6"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bb1c84e87c717666564ec056105052331431803d606bd45529b28547b611eef"
+checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e"
 dependencies = [
- "phf_codegen",
- "proc-macro2 1.0.1",
- "procedural-masquerade",
  "quote 1.0.2",
  "syn 1.0.3",
 ]
@@ -1399,12 +1399,6 @@ dependencies = [
  "servo-freetype-sys",
 ]
 
-[[package]]
-name = "fuchsia-cprng"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
-
 [[package]]
 name = "fuchsia-zircon"
 version = "0.3.3"
@@ -1458,12 +1452,12 @@ dependencies = [
 
 [[package]]
 name = "gaol"
-version = "0.2.0"
-source = "git+https://github.com/servo/gaol#e26c5a5dd53c0745bb1e27f3bccdeb6cf306a17d"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "061957ca7a966a39a79ebca393a9a6c7babda10bf9dd6f11d00041558d929c22"
 dependencies = [
  "libc",
  "log",
- "rand",
 ]
 
 [[package]]
@@ -2108,9 +2102,9 @@ checksum = "1bdcec4094c1ca961b685384ea7af76af5718230b3f34657d1a71fd2dcf4cc9d"
 
 [[package]]
 name = "html5ever"
-version = "0.24.1"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "025483b0a1e4577bb28578318c886ee5f817dda6eb62473269349044406644cb"
+checksum = "61072e237173349e0a04d09e6e17178315dbf8135a07b034dd4ac72f4293d97f"
 dependencies = [
  "log",
  "mac",
@@ -2322,9 +2316,9 @@ dependencies = [
 
 [[package]]
 name = "ipc-channel"
-version = "0.12.0"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79d98ee7dd1d2e796d254807fd86ea7189d07571aeaa74007603e29a79d15217"
+checksum = "5172208c1dfd469c409af6d159bd9137ce463285a978b7fad464518edd8ee3f8"
 dependencies = [
  "bincode",
  "crossbeam-channel",
@@ -2893,9 +2887,9 @@ dependencies = [
 
 [[package]]
 name = "markup5ever"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65381d9d47506b8592b97c4efd936afcf673b09b059f2bef39c7211ee78b9d03"
+checksum = "aae38d669396ca9b707bfc3db254bc382ddb94f57cc5c235f34623a669a01dab"
 dependencies = [
  "log",
  "phf",
@@ -2910,9 +2904,9 @@ dependencies = [
 
 [[package]]
 name = "matches"
-version = "0.1.4"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd7622e3022e1a6eaa602c4cea8912254e5582c9c692e9167714182244801b1"
+checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
 
 [[package]]
 name = "media"
@@ -3595,18 +3589,20 @@ dependencies = [
 
 [[package]]
 name = "phf"
-version = "0.7.24"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18"
+checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
 dependencies = [
+ "phf_macros",
  "phf_shared",
+ "proc-macro-hack",
 ]
 
 [[package]]
 name = "phf_codegen"
-version = "0.7.24"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e"
+checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815"
 dependencies = [
  "phf_generator",
  "phf_shared",
@@ -3614,19 +3610,33 @@ dependencies = [
 
 [[package]]
 name = "phf_generator"
-version = "0.7.24"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
+checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
 dependencies = [
  "phf_shared",
  "rand",
 ]
 
 [[package]]
-name = "phf_shared"
-version = "0.7.24"
+name = "phf_macros"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
+checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+ "proc-macro-hack",
+ "proc-macro2 1.0.1",
+ "quote 1.0.2",
+ "syn 1.0.3",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
 dependencies = [
  "siphasher",
 ]
@@ -3677,6 +3687,12 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "780fb4b6698bbf9cf2444ea5d22411cef2953f0824b98f33cf454ec5615645bd"
 
+[[package]]
+name = "ppv-lite86"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b"
+
 [[package]]
 name = "precomputed-hash"
 version = "0.1.1"
@@ -3790,106 +3806,62 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.6.5"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
+checksum = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412"
 dependencies = [
- "autocfg",
+ "getrandom",
  "libc",
  "rand_chacha",
- "rand_core 0.4.2",
+ "rand_core",
  "rand_hc",
- "rand_isaac",
- "rand_jitter",
- "rand_os",
  "rand_pcg",
- "rand_xorshift",
- "winapi",
 ]
 
 [[package]]
 name = "rand_chacha"
-version = "0.1.1"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
+checksum = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
 dependencies = [
- "autocfg",
- "rand_core 0.3.1",
+ "c2-chacha",
+ "rand_core",
 ]
 
 [[package]]
 name = "rand_core"
-version = "0.3.1"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
 dependencies = [
- "rand_core 0.4.2",
+ "getrandom",
 ]
 
-[[package]]
-name = "rand_core"
-version = "0.4.2"
-source = "git+https://github.com/servo/rand?branch=servo-rand_os-0.1.3-uwp#13b836653183635c0bae3171a63f6faaf6d41809"
-
 [[package]]
 name = "rand_hc"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
 dependencies = [
- "rand_core 0.3.1",
+ "rand_core",
 ]
 
 [[package]]
 name = "rand_isaac"
-version = "0.1.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
+checksum = "8df6b0b3dc9991a10b2d91a86d1129314502169a1bf6afa67328945e02498b76"
 dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rand_jitter"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b9ea758282efe12823e0d952ddb269d2e1897227e464919a554f2a03ef1b832"
-dependencies = [
- "libc",
- "rand_core 0.4.2",
- "winapi",
-]
-
-[[package]]
-name = "rand_os"
-version = "0.1.3"
-source = "git+https://github.com/servo/rand?branch=servo-rand_os-0.1.3-uwp#13b836653183635c0bae3171a63f6faaf6d41809"
-dependencies = [
- "cloudabi",
- "fuchsia-cprng",
- "libc",
- "rand_core 0.4.2",
- "rdrand",
- "winapi",
+ "rand_core",
 ]
 
 [[package]]
 name = "rand_pcg"
-version = "0.1.2"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
+checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
 dependencies = [
- "autocfg",
- "rand_core 0.4.2",
-]
-
-[[package]]
-name = "rand_xorshift"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
-dependencies = [
- "rand_core 0.3.1",
+ "rand_core",
 ]
 
 [[package]]
@@ -3949,15 +3921,6 @@ dependencies = [
  "rayon",
 ]
 
-[[package]]
-name = "rdrand"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
-dependencies = [
- "rand_core 0.3.1",
-]
-
 [[package]]
 name = "redox_syscall"
 version = "0.1.17"
@@ -4469,7 +4432,7 @@ dependencies = [
 [[package]]
 name = "servo-media"
 version = "0.1.0"
-source = "git+https://github.com/servo/media#10ebedeff6d1c9208ab6651db96d760ec4cb34fc"
+source = "git+https://github.com/servo/media#5380170bb42286ce9009d83e1034904bea8f00ee"
 dependencies = [
  "servo-media-audio",
  "servo-media-player",
@@ -4481,7 +4444,7 @@ dependencies = [
 [[package]]
 name = "servo-media-audio"
 version = "0.1.0"
-source = "git+https://github.com/servo/media#10ebedeff6d1c9208ab6651db96d760ec4cb34fc"
+source = "git+https://github.com/servo/media#5380170bb42286ce9009d83e1034904bea8f00ee"
 dependencies = [
  "boxfnonce",
  "byte-slice-cast",
@@ -4498,7 +4461,7 @@ dependencies = [
 [[package]]
 name = "servo-media-dummy"
 version = "0.1.0"
-source = "git+https://github.com/servo/media#10ebedeff6d1c9208ab6651db96d760ec4cb34fc"
+source = "git+https://github.com/servo/media#5380170bb42286ce9009d83e1034904bea8f00ee"
 dependencies = [
  "boxfnonce",
  "ipc-channel",
@@ -4513,7 +4476,7 @@ dependencies = [
 [[package]]
 name = "servo-media-gstreamer"
 version = "0.1.0"
-source = "git+https://github.com/servo/media#10ebedeff6d1c9208ab6651db96d760ec4cb34fc"
+source = "git+https://github.com/servo/media#5380170bb42286ce9009d83e1034904bea8f00ee"
 dependencies = [
  "boxfnonce",
  "byte-slice-cast",
@@ -4549,7 +4512,7 @@ dependencies = [
 [[package]]
 name = "servo-media-gstreamer-render"
 version = "0.1.0"
-source = "git+https://github.com/servo/media#10ebedeff6d1c9208ab6651db96d760ec4cb34fc"
+source = "git+https://github.com/servo/media#5380170bb42286ce9009d83e1034904bea8f00ee"
 dependencies = [
  "gstreamer",
  "gstreamer-video",
@@ -4559,7 +4522,7 @@ dependencies = [
 [[package]]
 name = "servo-media-gstreamer-render-android"
 version = "0.1.0"
-source = "git+https://github.com/servo/media#10ebedeff6d1c9208ab6651db96d760ec4cb34fc"
+source = "git+https://github.com/servo/media#5380170bb42286ce9009d83e1034904bea8f00ee"
 dependencies = [
  "glib",
  "gstreamer",
@@ -4572,7 +4535,7 @@ dependencies = [
 [[package]]
 name = "servo-media-gstreamer-render-unix"
 version = "0.1.0"
-source = "git+https://github.com/servo/media#10ebedeff6d1c9208ab6651db96d760ec4cb34fc"
+source = "git+https://github.com/servo/media#5380170bb42286ce9009d83e1034904bea8f00ee"
 dependencies = [
  "glib",
  "gstreamer",
@@ -4585,7 +4548,7 @@ dependencies = [
 [[package]]
 name = "servo-media-player"
 version = "0.1.0"
-source = "git+https://github.com/servo/media#10ebedeff6d1c9208ab6651db96d760ec4cb34fc"
+source = "git+https://github.com/servo/media#5380170bb42286ce9009d83e1034904bea8f00ee"
 dependencies = [
  "ipc-channel",
  "serde",
@@ -4597,7 +4560,7 @@ dependencies = [
 [[package]]
 name = "servo-media-streams"
 version = "0.1.0"
-source = "git+https://github.com/servo/media#10ebedeff6d1c9208ab6651db96d760ec4cb34fc"
+source = "git+https://github.com/servo/media#5380170bb42286ce9009d83e1034904bea8f00ee"
 dependencies = [
  "lazy_static",
  "uuid",
@@ -4606,12 +4569,12 @@ dependencies = [
 [[package]]
 name = "servo-media-traits"
 version = "0.1.0"
-source = "git+https://github.com/servo/media#10ebedeff6d1c9208ab6651db96d760ec4cb34fc"
+source = "git+https://github.com/servo/media#5380170bb42286ce9009d83e1034904bea8f00ee"
 
 [[package]]
 name = "servo-media-webrtc"
 version = "0.1.0"
-source = "git+https://github.com/servo/media#10ebedeff6d1c9208ab6651db96d760ec4cb34fc"
+source = "git+https://github.com/servo/media#5380170bb42286ce9009d83e1034904bea8f00ee"
 dependencies = [
  "boxfnonce",
  "log",
@@ -4708,7 +4671,7 @@ dependencies = [
 [[package]]
 name = "servo_media_derive"
 version = "0.1.0"
-source = "git+https://github.com/servo/media#10ebedeff6d1c9208ab6651db96d760ec4cb34fc"
+source = "git+https://github.com/servo/media#5380170bb42286ce9009d83e1034904bea8f00ee"
 dependencies = [
  "proc-macro2 1.0.1",
  "quote 1.0.2",
@@ -4722,7 +4685,7 @@ dependencies = [
  "lazy_static",
  "log",
  "rand",
- "rand_core 0.4.2",
+ "rand_core",
  "rand_isaac",
  "uuid",
 ]
@@ -4849,9 +4812,9 @@ dependencies = [
 
 [[package]]
 name = "siphasher"
-version = "0.2.2"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0df90a788073e8d0235a67e50441d47db7c8ad9debd91cbf43736a2a92d36537"
+checksum = "83da420ee8d1a89e640d0948c646c1c088758d3a3c538f943bfa97bdac17929d"
 
 [[package]]
 name = "size_of_test"
@@ -4949,38 +4912,29 @@ dependencies = [
 
 [[package]]
 name = "string_cache"
-version = "0.7.3"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25d70109977172b127fe834e5449e5ab1740b9ba49fa18a2020f509174f25423"
+checksum = "2940c75beb4e3bf3a494cef919a747a2cb81e52571e212bfbd185074add7208a"
 dependencies = [
  "lazy_static",
  "new_debug_unreachable",
  "phf_shared",
  "precomputed-hash",
  "serde",
- "string_cache_codegen",
- "string_cache_shared",
 ]
 
 [[package]]
 name = "string_cache_codegen"
-version = "0.4.2"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1eea1eee654ef80933142157fdad9dd8bc43cf7c74e999e369263496f04ff4da"
+checksum = "f24c8e5e19d22a726626f1a5e16fe15b132dcf21d10177fa5a45ce7962996b97"
 dependencies = [
  "phf_generator",
  "phf_shared",
- "proc-macro2 0.4.26",
- "quote 0.6.12",
- "string_cache_shared",
+ "proc-macro2 1.0.1",
+ "quote 1.0.2",
 ]
 
-[[package]]
-name = "string_cache_shared"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1884d1bc09741d466d9b14e6d37ac89d6909cbcac41dd9ae982d4d063bbedfc"
-
 [[package]]
 name = "strsim"
 version = "0.7.0"
@@ -5181,9 +5135,9 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.0.8"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dc4738f2e68ed2855de5ac9cdbe05c9216773ecde4739b2f095002ab03a13ef"
+checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
 dependencies = [
  "cfg-if",
  "libc",
@@ -5370,9 +5324,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-executor"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83ea44c6c0773cc034771693711c35c677b4b5a4b21b9e7071704c54de7d555e"
+checksum = "0f27ee0e6db01c5f0b2973824547ce7e637b2ed79b891a9677b0de9bd532b6ac"
 dependencies = [
  "crossbeam-utils",
  "futures",
@@ -5451,17 +5405,17 @@ dependencies = [
 
 [[package]]
 name = "tokio-threadpool"
-version = "0.1.14"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72558af20be886ea124595ea0f806dd5703b8958e4705429dd58b3d8231f72f2"
+checksum = "2bd2c6a3885302581f4401c82af70d792bb9df1700e7437b0aeb4ada94d5388c"
 dependencies = [
  "crossbeam-deque",
  "crossbeam-queue",
  "crossbeam-utils",
  "futures",
+ "lazy_static",
  "log",
  "num_cpus",
- "rand",
  "slab",
  "tokio-executor",
 ]
@@ -5675,9 +5629,9 @@ checksum = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737"
 
 [[package]]
 name = "uuid"
-version = "0.7.4"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a"
+checksum = "bf1d83e5fa94e6c54ee47351bc92daca1f386aa1529ffbb668d2cee5e8173013"
 dependencies = [
  "rand",
  "serde",
@@ -6103,9 +6057,9 @@ dependencies = [
 
 [[package]]
 name = "ws"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a6f5bb86663ff4d1639408410f50bf6050367a8525d644d49a6894cd618a631"
+checksum = "c51a2c47b5798ccc774ffb93ff536aec7c4275d722fd9c740c83cdd1af1f2d94"
 dependencies = [
  "byteorder",
  "bytes",
@@ -6180,9 +6134,9 @@ checksum = "541b12c998c5b56aa2b4e6f18f03664eef9a4fd0a246a55594efae6cc2d964b5"
 
 [[package]]
 name = "xml5ever"
-version = "0.15.0"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b93ca59bfbbc3c0f807a61faea54e6a4c753f82857d3730e9afb5523b6149c7"
+checksum = "33f9cd1d3587e33237f1716ace767fbddd62405096305c57430369cb7263d32f"
 dependencies = [
  "log",
  "mac",
diff --git a/Cargo.toml b/Cargo.toml
index 71b1163d2cf..ee35ba935a9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -27,9 +27,5 @@ opt-level = 3
 
 # Those are here to dedupe winapi since mio is still using winapi 0.2.
 mio = { git = "https://github.com/servo/mio.git", branch = "servo" }
-rand_os = { git = "https://github.com/servo/rand", branch = "servo-rand_os-0.1.3-uwp" }
-rand_core = { git = "https://github.com/servo/rand", branch = "servo-rand_os-0.1.3-uwp" }
-# https://github.com/cuviper/autocfg/pull/10
-autocfg = { git = "https://github.com/servo/autocfg", branch = "rustflags2" }
 # https://github.com/retep998/winapi-rs/pull/816
 winapi = { git = "https://github.com/servo/winapi-rs", branch = "patch-1" }
diff --git a/components/atoms/Cargo.toml b/components/atoms/Cargo.toml
index 493088f7f24..aa232e86e5a 100644
--- a/components/atoms/Cargo.toml
+++ b/components/atoms/Cargo.toml
@@ -11,7 +11,7 @@ build = "build.rs"
 path = "lib.rs"
 
 [dependencies]
-string_cache = {version = "0.7"}
+string_cache = "0.8"
 
 [build-dependencies]
-string_cache_codegen = "0.4"
+string_cache_codegen = "0.5"
diff --git a/components/bluetooth/Cargo.toml b/components/bluetooth/Cargo.toml
index 846c242f30d..0ce769fdc03 100644
--- a/components/bluetooth/Cargo.toml
+++ b/components/bluetooth/Cargo.toml
@@ -19,7 +19,7 @@ ipc-channel = "0.12"
 log = "0.4"
 servo_config = {path = "../config"}
 servo_rand = {path = "../rand"}
-uuid = {version = "0.7", features = ["v4"]}
+uuid = {version = "0.8", features = ["v4"]}
 
 [features]
 native-bluetooth = ["device/bluetooth"]
diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml
index 742b286e995..b96b6a9b81c 100644
--- a/components/canvas/Cargo.toml
+++ b/components/canvas/Cargo.toml
@@ -20,7 +20,7 @@ no_wgl = ["offscreen_gl_context/no_wgl"]
 azure = {git = "https://github.com/servo/rust-azure", optional = true}
 byteorder = "1"
 canvas_traits = {path = "../canvas_traits"}
-cssparser = "0.25"
+cssparser = "0.27.1"
 embedder_traits = {path = "../embedder_traits"}
 euclid = "0.20"
 fnv = "1.0"
diff --git a/components/canvas_traits/Cargo.toml b/components/canvas_traits/Cargo.toml
index 777edd54dd9..516f4d66932 100644
--- a/components/canvas_traits/Cargo.toml
+++ b/components/canvas_traits/Cargo.toml
@@ -14,7 +14,7 @@ path = "lib.rs"
 webgl_backtrace = []
 
 [dependencies]
-cssparser = "0.25"
+cssparser = "0.27.1"
 euclid = "0.20"
 ipc-channel = "0.12"
 lazy_static = "1"
diff --git a/components/constellation/Cargo.toml b/components/constellation/Cargo.toml
index d6ed0c562d9..7b53d443e5c 100644
--- a/components/constellation/Cargo.toml
+++ b/components/constellation/Cargo.toml
@@ -53,4 +53,4 @@ webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}
 webxr-api = {git = "https://github.com/servo/webxr", features = ["ipc"]}
 
 [target.'cfg(all(not(target_os = "windows"), not(target_os = "ios"), not(target_os="android"), not(target_arch="arm"), not(target_arch="aarch64")))'.dependencies]
-gaol = {git = "https://github.com/servo/gaol"}
+gaol = "0.2.1"
diff --git a/components/devtools/Cargo.toml b/components/devtools/Cargo.toml
index 90df8e7498f..f59070b08b5 100644
--- a/components/devtools/Cargo.toml
+++ b/components/devtools/Cargo.toml
@@ -22,4 +22,4 @@ msg = {path = "../msg"}
 serde = "1.0"
 serde_json = "1.0"
 time = "0.1"
-uuid = {version = "0.7", features = ["v4"]}
+uuid = {version = "0.8", features = ["v4"]}
diff --git a/components/hashglobe/Cargo.toml b/components/hashglobe/Cargo.toml
index 1ff1b28bbba..49bc0126cff 100644
--- a/components/hashglobe/Cargo.toml
+++ b/components/hashglobe/Cargo.toml
@@ -13,4 +13,4 @@ readme = "README.md"
 libc = "0.2"
 
 [dev-dependencies]
-rand = "0.6"
+rand = "0.7"
diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml
index bd94cc174be..c68f98a831b 100644
--- a/components/layout/Cargo.toml
+++ b/components/layout/Cargo.toml
@@ -24,7 +24,7 @@ fnv = "1.0"
 fxhash = "0.2"
 gfx = {path = "../gfx"}
 gfx_traits = {path = "../gfx_traits"}
-html5ever = "0.24"
+html5ever = "0.25"
 ipc-channel = "0.12"
 lazy_static = "1"
 libc = "0.2"
diff --git a/components/layout_thread/Cargo.toml b/components/layout_thread/Cargo.toml
index 3d44f130830..38adb0bf4e1 100644
--- a/components/layout_thread/Cargo.toml
+++ b/components/layout_thread/Cargo.toml
@@ -21,7 +21,7 @@ fxhash = "0.2"
 gfx = {path = "../gfx"}
 gfx_traits = {path = "../gfx_traits"}
 histogram = "0.6.8"
-html5ever = "0.24"
+html5ever = "0.25"
 ipc-channel = "0.12"
 layout = {path = "../layout", package = "layout_2013"}
 layout_traits = {path = "../layout_traits"}
diff --git a/components/layout_thread_2020/Cargo.toml b/components/layout_thread_2020/Cargo.toml
index f51febba1c5..23bc41f9b25 100644
--- a/components/layout_thread_2020/Cargo.toml
+++ b/components/layout_thread_2020/Cargo.toml
@@ -20,7 +20,7 @@ fnv = "1.0"
 fxhash = "0.2"
 gfx = {path = "../gfx"}
 gfx_traits = {path = "../gfx_traits"}
-html5ever = "0.24"
+html5ever = "0.25"
 ipc-channel = "0.12"
 layout = {path = "../layout_2020", package = "layout_2020"}
 layout_traits = {path = "../layout_traits"}
diff --git a/components/malloc_size_of/Cargo.toml b/components/malloc_size_of/Cargo.toml
index e6a33d7e7c4..836d637f1eb 100644
--- a/components/malloc_size_of/Cargo.toml
+++ b/components/malloc_size_of/Cargo.toml
@@ -28,7 +28,7 @@ servo = [
 app_units = "0.7"
 content-security-policy = {version = "0.3.0", features = ["serde"], optional = true}
 crossbeam-channel = { version = "0.3", optional = true }
-cssparser = "0.25"
+cssparser = "0.27.1"
 euclid = "0.20"
 hashglobe = { path = "../hashglobe" }
 hyper = { version = "0.12", optional = true }
@@ -40,10 +40,10 @@ serde_bytes = { version = "0.10", optional = true }
 servo_arc = { path = "../servo_arc" }
 smallbitvec = "2.3.0"
 smallvec = "0.6"
-string_cache = { version = "0.7", optional = true }
+string_cache = { version = "0.8", optional = true }
 thin-slice = "0.1.0"
 time = { version = "0.1.17", optional = true }
 url = { version = "2.0", optional = true }
 webrender_api = { git = "https://github.com/servo/webrender", features = ["ipc"], optional = true }
-xml5ever = { version = "0.15", optional = true }
+xml5ever = { version = "0.16", optional = true }
 void = "1.0.2"
diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml
index f05d5b31268..aac0b32aaeb 100644
--- a/components/net/Cargo.toml
+++ b/components/net/Cargo.toml
@@ -55,7 +55,7 @@ servo_url = {path = "../url"}
 tokio = "0.1"
 time = "0.1.17"
 url = "2.0"
-uuid = {version = "0.7", features = ["v4"]}
+uuid = {version = "0.8", features = ["v4"]}
 webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}
 ws = { version = "0.9", features = ["ssl"] }
 
diff --git a/components/net_traits/Cargo.toml b/components/net_traits/Cargo.toml
index caf1f9787fc..5a75b523165 100644
--- a/components/net_traits/Cargo.toml
+++ b/components/net_traits/Cargo.toml
@@ -36,7 +36,7 @@ servo_arc = {path = "../servo_arc"}
 servo_url = {path = "../url"}
 time = "0.1"
 url = "2.0"
-uuid = {version = "0.7", features = ["v4", "serde"]}
+uuid = {version = "0.8", features = ["v4", "serde"]}
 webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}
 
 [dev-dependencies]
diff --git a/components/rand/Cargo.toml b/components/rand/Cargo.toml
index 70461e462ef..b85334b6d0b 100644
--- a/components/rand/Cargo.toml
+++ b/components/rand/Cargo.toml
@@ -13,7 +13,7 @@ path = "lib.rs"
 [dependencies]
 lazy_static = "1"
 log = "0.4"
-rand = "0.6"
-rand_core = "0.4"
-rand_isaac = "0.1"
-uuid = "0.7"
+rand = "0.7"
+rand_core = "0.5"
+rand_isaac = "0.2"
+uuid = "0.8"
diff --git a/components/rand/lib.rs b/components/rand/lib.rs
index f38a2bb6f3d..d9a8765c993 100644
--- a/components/rand/lib.rs
+++ b/components/rand/lib.rs
@@ -31,10 +31,7 @@ use uuid::{Builder, Uuid, Variant, Version};
 
 // The shared RNG which may hold on to a file descriptor
 lazy_static! {
-    static ref OS_RNG: Mutex<OsRng> = match OsRng::new() {
-        Ok(r) => Mutex::new(r),
-        Err(e) => panic!("Failed to seed OsRng: {}", e),
-    };
+    static ref OS_RNG: Mutex<OsRng> = Mutex::new(OsRng);
 }
 
 // Generate 32K of data between reseedings
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
index cb30f437a11..23873d59767 100644
--- a/components/script/Cargo.toml
+++ b/components/script/Cargo.toml
@@ -23,8 +23,8 @@ uwp = ["js/uwp"]
 vslatestinstalled = ["js/vslatestinstalled"]
 
 [build-dependencies]
-phf_codegen = "0.7"
-phf_shared = "0.7"
+phf_codegen = "0.8"
+phf_shared = "0.8"
 serde_json = "1.0"
 
 [target.'cfg(target_os = "linux")'.dependencies]
@@ -43,7 +43,7 @@ content-security-policy = {version = "0.3.0", features = ["serde"]}
 cookie = "0.11"
 chrono = "0.4"
 crossbeam-channel = "0.3"
-cssparser = "0.25"
+cssparser = "0.27.1"
 deny_public_fields = {path = "../deny_public_fields"}
 devtools_traits = {path = "../devtools_traits"}
 dom_struct = {path = "../dom_struct"}
@@ -54,7 +54,7 @@ enum-iterator = "0.3"
 euclid = "0.20"
 fnv = "1.0"
 headers = "0.2"
-html5ever = "0.24"
+html5ever = "0.25"
 http = "0.1"
 hyper = "0.12"
 hyper_serde = "0.11"
@@ -80,7 +80,7 @@ net_traits = {path = "../net_traits"}
 num-traits = "0.2"
 parking_lot = "0.9"
 percent-encoding = "2.0"
-phf = "0.7"
+phf = "0.8"
 pixels = {path = "../pixels"}
 profile_traits = {path = "../profile_traits"}
 ref_filter_map = "1.0.1"
@@ -109,8 +109,8 @@ time = "0.1.12"
 unicode-segmentation = "1.1.0"
 url = "2.0"
 utf-8 = "0.7"
-uuid = {version = "0.7", features = ["v4"]}
-xml5ever = {version = "0.15"}
+uuid = {version = "0.8", features = ["v4"]}
+xml5ever = "0.16"
 webdriver = "0.40"
 webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}
 webvr_traits = {path = "../webvr_traits"}
diff --git a/components/script/build.rs b/components/script/build.rs
index ea2e756490b..d8d65b098db 100644
--- a/components/script/build.rs
+++ b/components/script/build.rs
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use phf_shared;
+use phf_shared::{self, FmtConst};
 use serde_json::{self, Value};
 use std::env;
 use std::fmt;
@@ -40,18 +40,17 @@ fn main() {
     let mut phf = File::create(&phf).unwrap();
     write!(
         &mut phf,
-        "pub static MAP: phf::Map<&'static [u8], fn(JSContext, HandleObject)> = "
+        "pub static MAP: phf::Map<&'static [u8], fn(JSContext, HandleObject)> = {};\n",
+        map.build(),
     )
     .unwrap();
-    map.build(&mut phf).unwrap();
-    write!(&mut phf, ";\n").unwrap();
 }
 
 #[derive(Eq, Hash, PartialEq)]
 struct Bytes<'a>(&'a str);
 
-impl<'a> fmt::Debug for Bytes<'a> {
-    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+impl<'a> FmtConst for Bytes<'a> {
+    fn fmt_const(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
         // https://github.com/rust-lang/rust/issues/55223
         // should technically be just `write!(formatter, "b\"{}\"", self.0)
         // but the referenced issue breaks promotion in the surrounding code
diff --git a/components/script/dom/servoparser/prefetch.rs b/components/script/dom/servoparser/prefetch.rs
index 716be8b0f51..906c9352771 100644
--- a/components/script/dom/servoparser/prefetch.rs
+++ b/components/script/dom/servoparser/prefetch.rs
@@ -97,7 +97,7 @@ impl TokenSink for PrefetchSink {
             _ => return TokenSinkResult::Continue,
         };
         match (tag.kind, &tag.name) {
-            (TagKind::StartTag, local_name!("script")) if self.prefetching => {
+            (TagKind::StartTag, &local_name!("script")) if self.prefetching => {
                 if let Some(url) = self.get_url(tag, local_name!("src")) {
                     debug!("Prefetch script {}", url);
                     let cors_setting = self.get_cors_settings(tag, local_name!("crossorigin"));
@@ -120,7 +120,7 @@ impl TokenSink for PrefetchSink {
                 }
                 TokenSinkResult::RawData(RawKind::ScriptData)
             },
-            (TagKind::StartTag, local_name!("img")) if self.prefetching => {
+            (TagKind::StartTag, &local_name!("img")) if self.prefetching => {
                 if let Some(url) = self.get_url(tag, local_name!("src")) {
                     debug!("Prefetch {} {}", tag.name, url);
                     let request = image_fetch_request(
@@ -137,7 +137,7 @@ impl TokenSink for PrefetchSink {
                 }
                 TokenSinkResult::Continue
             },
-            (TagKind::StartTag, local_name!("link")) if self.prefetching => {
+            (TagKind::StartTag, &local_name!("link")) if self.prefetching => {
                 if let Some(rel) = self.get_attr(tag, local_name!("rel")) {
                     if rel.value.eq_ignore_ascii_case("stylesheet") {
                         if let Some(url) = self.get_url(tag, local_name!("href")) {
@@ -167,15 +167,15 @@ impl TokenSink for PrefetchSink {
                 }
                 TokenSinkResult::Continue
             },
-            (TagKind::StartTag, local_name!("script")) => {
+            (TagKind::StartTag, &local_name!("script")) => {
                 TokenSinkResult::RawData(RawKind::ScriptData)
             },
-            (TagKind::EndTag, local_name!("script")) => {
+            (TagKind::EndTag, &local_name!("script")) => {
                 // After the first script tag, the main parser is blocked, so it's worth prefetching.
                 self.prefetching = true;
                 TokenSinkResult::Script(PrefetchHandle)
             },
-            (TagKind::StartTag, local_name!("base")) => {
+            (TagKind::StartTag, &local_name!("base")) => {
                 if let Some(url) = self.get_url(tag, local_name!("href")) {
                     if self.base_url.is_none() {
                         debug!("Setting base {}", url);
diff --git a/components/script_layout_interface/Cargo.toml b/components/script_layout_interface/Cargo.toml
index 24b80baa463..8ad33fc7d43 100644
--- a/components/script_layout_interface/Cargo.toml
+++ b/components/script_layout_interface/Cargo.toml
@@ -17,7 +17,7 @@ canvas_traits = {path = "../canvas_traits"}
 crossbeam-channel = "0.3"
 euclid = "0.20"
 gfx_traits = {path = "../gfx_traits"}
-html5ever = "0.24"
+html5ever = "0.25"
 ipc-channel = "0.12"
 libc = "0.2"
 malloc_size_of = { path = "../malloc_size_of" }
diff --git a/components/selectors/Cargo.toml b/components/selectors/Cargo.toml
index ae3b08d7198..d3dda6cb2c1 100644
--- a/components/selectors/Cargo.toml
+++ b/components/selectors/Cargo.toml
@@ -22,11 +22,11 @@ bench = []
 [dependencies]
 bitflags = "1.0"
 matches = "0.1"
-cssparser = "0.25"
+cssparser = "0.27.1"
 derive_more = "0.13"
 log = "0.4"
 fxhash = "0.2"
-phf = "0.7"
+phf = "0.8"
 precomputed-hash = "0.1"
 servo_arc = { version = "0.1", path = "../servo_arc" }
 smallvec = "0.6"
@@ -35,4 +35,4 @@ to_shmem = { path = "../to_shmem" }
 to_shmem_derive = { path = "../to_shmem_derive" }
 
 [build-dependencies]
-phf_codegen = "0.7"
+phf_codegen = "0.8"
diff --git a/components/selectors/build.rs b/components/selectors/build.rs
index cc841227df5..264c2da6b4b 100644
--- a/components/selectors/build.rs
+++ b/components/selectors/build.rs
@@ -14,13 +14,16 @@ fn main() {
         .join("ascii_case_insensitive_html_attributes.rs");
     let mut file = BufWriter::new(File::create(&path).unwrap());
 
-    write!(&mut file, "{{ static SET: ::phf::Set<&'static str> = ").unwrap();
     let mut set = phf_codegen::Set::new();
     for name in ASCII_CASE_INSENSITIVE_HTML_ATTRIBUTES.split_whitespace() {
         set.entry(name);
     }
-    set.build(&mut file).unwrap();
-    write!(&mut file, "; &SET }}").unwrap();
+    write!(
+        &mut file,
+        "{{ static SET: ::phf::Set<&'static str> = {}; &SET }}",
+        set.build(),
+    )
+    .unwrap();
 }
 
 /// <https://html.spec.whatwg.org/multipage/#selectors>
diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml
index 84ba5dd825e..5b657e7e33b 100644
--- a/components/servo/Cargo.toml
+++ b/components/servo/Cargo.toml
@@ -85,7 +85,7 @@ webvr_traits = {path = "../webvr_traits"}
 webxr-api = {git = "https://github.com/servo/webxr"}
 
 [target.'cfg(all(not(target_os = "windows"), not(target_os = "ios"), not(target_os="android"), not(target_arch="arm"), not(target_arch="aarch64")))'.dependencies]
-gaol = {git = "https://github.com/servo/gaol"}
+gaol = "0.2.1"
 
 [target.'cfg(any(target_os = "android", target_arch = "x86_64", target_os = "windows"))'.dependencies]
 gstreamer = "0.14.5"
diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml
index fb17e71521e..1a727387b7e 100644
--- a/components/style/Cargo.toml
+++ b/components/style/Cargo.toml
@@ -33,7 +33,7 @@ arrayvec = "0.4.6"
 atomic_refcell = "0.1"
 bitflags = "1.0"
 byteorder = "1.0"
-cssparser = "0.25"
+cssparser = "0.27.1"
 crossbeam-channel = { version = "0.3", optional = true }
 derive_more = "0.13"
 new_debug_unreachable = "1.0"
@@ -42,7 +42,7 @@ euclid = "0.20"
 fallible = { path = "../fallible" }
 fxhash = "0.2"
 hashglobe = { path = "../hashglobe" }
-html5ever = {version = "0.24", optional = true}
+html5ever = {version = "0.25", optional = true}
 indexmap = "1.0"
 itertools = "0.8"
 itoa = "0.4"
@@ -67,7 +67,7 @@ servo_atoms = {path = "../atoms", optional = true}
 servo_config = {path = "../config", optional = true}
 smallbitvec = "2.3.0"
 smallvec = "0.6.6"
-string_cache = { version = "0.7", optional = true }
+string_cache = { version = "0.8", optional = true }
 style_derive = {path = "../style_derive"}
 style_traits = {path = "../style_traits"}
 servo_url = {path = "../url", optional = true}
diff --git a/components/style/counter_style/mod.rs b/components/style/counter_style/mod.rs
index 289281011c3..25cdc3f8737 100644
--- a/components/style/counter_style/mod.rs
+++ b/components/style/counter_style/mod.rs
@@ -220,9 +220,9 @@ macro_rules! counter_style_descriptors {
                             // rather than returning it.
                             let value = input.parse_entirely(|i| Parse::parse(self.context, i))?;
                             self.rule.$ident = Some(value)
-                        }
+                        },
                     )*
-                    _ => return Err(input.new_custom_error(SelectorParseErrorKind::UnexpectedIdent(name.clone())))
+                    _ => return Err(input.new_custom_error(SelectorParseErrorKind::UnexpectedIdent(name.clone()))),
                 }
                 Ok(())
             }
@@ -371,11 +371,11 @@ impl Parse for System {
             "fixed" => {
                 let first_symbol_value = input.try(|i| Integer::parse(context, i)).ok();
                 Ok(System::Fixed { first_symbol_value })
-            }
+            },
             "extends" => {
                 let other = parse_counter_style_name(input)?;
                 Ok(System::Extends(other))
-            }
+            },
         }
     }
 }
@@ -652,7 +652,7 @@ impl Parse for SpeakAs {
                 "spell-out" => {
                     is_spell_out = true;
                     Err(())
-                }
+                },
                 _ => Err(()),
             }
         });
diff --git a/components/style/font_face.rs b/components/style/font_face.rs
index d45cd340c85..21e2946d6a6 100644
--- a/components/style/font_face.rs
+++ b/components/style/font_face.rs
@@ -480,9 +480,9 @@ macro_rules! font_face_descriptors_common {
                             // rather than returning it.
                             let value = input.parse_entirely(|i| Parse::parse(self.context, i))?;
                             self.rule.$ident = Some(value)
-                        }
+                        },
                     )*
-                    _ => return Err(input.new_custom_error(SelectorParseErrorKind::UnexpectedIdent(name.clone())))
+                    _ => return Err(input.new_custom_error(SelectorParseErrorKind::UnexpectedIdent(name.clone()))),
                 }
                 Ok(())
             }
diff --git a/components/style/servo/selector_parser.rs b/components/style/servo/selector_parser.rs
index 4bf3f38822a..4fdd4d4ab37 100644
--- a/components/style/servo/selector_parser.rs
+++ b/components/style/servo/selector_parser.rs
@@ -460,8 +460,8 @@ impl<'a, 'i> ::selectors::Parser<'i> for SelectorParser<'a> {
         let pseudo_class = match_ignore_ascii_case! { &name,
             "lang" => {
                 Lang(parser.expect_ident_or_string()?.as_ref().into())
-            }
-            _ => return Err(parser.new_custom_error(SelectorParseErrorKind::UnexpectedIdent(name.clone())))
+            },
+            _ => return Err(parser.new_custom_error(SelectorParseErrorKind::UnexpectedIdent(name.clone()))),
         };
 
         Ok(pseudo_class)
diff --git a/components/style/stylesheets/document_rule.rs b/components/style/stylesheets/document_rule.rs
index 942d60a7d17..e779863f031 100644
--- a/components/style/stylesheets/document_rule.rs
+++ b/components/style/stylesheets/document_rule.rs
@@ -144,28 +144,28 @@ impl DocumentMatchingFunction {
         match_ignore_ascii_case! { &function,
             "url-prefix" => {
                 parse_quoted_or_unquoted_string!(input, DocumentMatchingFunction::UrlPrefix)
-            }
+            },
             "domain" => {
                 parse_quoted_or_unquoted_string!(input, DocumentMatchingFunction::Domain)
-            }
+            },
             "regexp" => {
                 input.parse_nested_block(|input| {
                     Ok(DocumentMatchingFunction::Regexp(
                         input.expect_string()?.as_ref().to_owned(),
                     ))
                 })
-            }
+            },
             "media-document" => {
                 input.parse_nested_block(|input| {
                     let kind = MediaDocumentKind::parse(input)?;
                     Ok(DocumentMatchingFunction::MediaDocument(kind))
                 })
-            }
+            },
             _ => {
                 Err(location.new_custom_error(
                     StyleParseErrorKind::UnexpectedFunction(function.clone())
                 ))
-            }
+            },
         }
     }
 
diff --git a/components/style/stylesheets/rule_parser.rs b/components/style/stylesheets/rule_parser.rs
index da9ce0a9401..aefea6c504d 100644
--- a/components/style/stylesheets/rule_parser.rs
+++ b/components/style/stylesheets/rule_parser.rs
@@ -228,7 +228,7 @@ impl<'a, 'i> AtRuleParser<'i> for TopLevelRuleParser<'a> {
             "charset" => {
                 self.dom_error = Some(RulesMutateError::HierarchyRequest);
                 return Err(input.new_custom_error(StyleParseErrorKind::UnexpectedCharsetRule))
-            }
+            },
             _ => {}
         }
 
diff --git a/components/style/stylesheets/supports_rule.rs b/components/style/stylesheets/supports_rule.rs
index 9ef3558bd1c..721634dd9a3 100644
--- a/components/style/stylesheets/supports_rule.rs
+++ b/components/style/stylesheets/supports_rule.rs
@@ -157,17 +157,17 @@ impl SupportsCondition {
                     CString::new(name.as_bytes())
                 }.map_err(|_| input.new_custom_error(StyleParseErrorKind::UnspecifiedError))?;
                 Ok(SupportsCondition::MozBoolPref(name))
-            }
+            },
             "selector" => {
                 let pos = input.position();
                 consume_any_value(input)?;
                 Ok(SupportsCondition::Selector(RawSelector(
                     input.slice_from(pos).to_owned()
                 )))
-            }
+            },
             _ => {
                 Err(input.new_custom_error(StyleParseErrorKind::UnspecifiedError))
-            }
+            },
         }
     }
 
diff --git a/components/style/values/specified/font.rs b/components/style/values/specified/font.rs
index 90426f80770..88f5969f52c 100644
--- a/components/style/values/specified/font.rs
+++ b/components/style/values/specified/font.rs
@@ -229,7 +229,7 @@ impl Parse for SpecifiedFontStyle {
                     .unwrap_or_else(|_| Self::default_angle());
 
                 generics::FontStyle::Oblique(angle)
-            }
+            },
         })
     }
 }
diff --git a/components/style/values/specified/image.rs b/components/style/values/specified/image.rs
index 6d0e0e5e7c2..c7a6ac1870c 100644
--- a/components/style/values/specified/image.rs
+++ b/components/style/values/specified/image.rs
@@ -220,7 +220,7 @@ impl Parse for Gradient {
             },
             "-webkit-radial-gradient" => {
                 Some((Shape::Radial, false, GradientCompatMode::WebKit))
-            }
+            },
             #[cfg(feature = "gecko")]
             "-moz-radial-gradient" => {
                 Some((Shape::Radial, false, GradientCompatMode::Moz))
diff --git a/components/style/values/specified/length.rs b/components/style/values/specified/length.rs
index 1934edf9669..c98038bdc68 100644
--- a/components/style/values/specified/length.rs
+++ b/components/style/values/specified/length.rs
@@ -471,17 +471,17 @@ impl NoCalcLength {
             // viewport percentages
             "vw" if !context.in_page_rule() => {
                 NoCalcLength::ViewportPercentage(ViewportPercentageLength::Vw(value))
-            }
+            },
             "vh" if !context.in_page_rule() => {
                 NoCalcLength::ViewportPercentage(ViewportPercentageLength::Vh(value))
-            }
+            },
             "vmin" if !context.in_page_rule() => {
                 NoCalcLength::ViewportPercentage(ViewportPercentageLength::Vmin(value))
-            }
+            },
             "vmax" if !context.in_page_rule() => {
                 NoCalcLength::ViewportPercentage(ViewportPercentageLength::Vmax(value))
-            }
-            _ => return Err(())
+            },
+            _ => return Err(()),
         })
     }
 
diff --git a/components/style/values/specified/text.rs b/components/style/values/specified/text.rs
index abe44aa8f03..946e97eb619 100644
--- a/components/style/values/specified/text.rs
+++ b/components/style/values/specified/text.rs
@@ -421,7 +421,7 @@ impl Parse for TextTransform {
                 },
                 "full-size-kana" if !result.other_.intersects(TextTransformOther::FULL_SIZE_KANA) => {
                     result.other_.insert(TextTransformOther::FULL_SIZE_KANA)
-                }
+                },
                 _ => return Err(location.new_custom_error(
                     SelectorParseErrorKind::UnexpectedIdent(ident.clone())
                 )),
diff --git a/components/style_traits/Cargo.toml b/components/style_traits/Cargo.toml
index e2cb4f1bd12..213c09b08df 100644
--- a/components/style_traits/Cargo.toml
+++ b/components/style_traits/Cargo.toml
@@ -15,7 +15,7 @@ gecko = []
 
 [dependencies]
 app_units = "0.7"
-cssparser = "0.25"
+cssparser = "0.27.1"
 bitflags = "1.0"
 euclid = "0.20"
 lazy_static = "1"
diff --git a/components/to_shmem/Cargo.toml b/components/to_shmem/Cargo.toml
index e17d9d981fb..71426507647 100644
--- a/components/to_shmem/Cargo.toml
+++ b/components/to_shmem/Cargo.toml
@@ -14,9 +14,9 @@ servo = ["cssparser/serde", "string_cache"]
 gecko = []
 
 [dependencies]
-cssparser = "0.25"
+cssparser = "0.27.1"
 servo_arc = { path = "../servo_arc" }
 smallbitvec = "2.1.1"
 smallvec = "0.6.6"
-string_cache = { version = "0.7", optional = true }
+string_cache = { version = "0.8", optional = true }
 thin-slice = "0.1.0"
diff --git a/components/url/Cargo.toml b/components/url/Cargo.toml
index 314e179a9e9..792fed54ac8 100644
--- a/components/url/Cargo.toml
+++ b/components/url/Cargo.toml
@@ -17,4 +17,4 @@ to_shmem = { path = "../to_shmem" }
 serde = {version = "1.0", features = ["derive"]}
 servo_rand = {path = "../rand"}
 url = {version = "2.0", features = ["serde"]}
-uuid = {version = "0.7", features = ["v4", "serde"]}
+uuid = {version = "0.8", features = ["v4", "serde"]}
diff --git a/components/webdriver_server/Cargo.toml b/components/webdriver_server/Cargo.toml
index 6ab00c59166..3df9701b2bf 100644
--- a/components/webdriver_server/Cargo.toml
+++ b/components/webdriver_server/Cargo.toml
@@ -29,5 +29,5 @@ servo_config = {path = "../config"}
 servo_url = {path = "../url"}
 style_traits = {path = "../style_traits"}
 url = "2.0"
-uuid = {version = "0.7", features = ["v4"]}
+uuid = {version = "0.8", features = ["v4"]}
 webdriver = "0.40"
diff --git a/servo-tidy.toml b/servo-tidy.toml
index fc4921c451a..cc55ed17dc2 100644
--- a/servo-tidy.toml
+++ b/servo-tidy.toml
@@ -15,13 +15,11 @@ lint-scripts = [
 [blocked-packages]
 num = []
 rand = [
-  "gaol",
   "hashglobe", # Only used in tests
   "ipc-channel",
   "phf_generator",
   "servo_rand",
   "tempfile",
-  "tokio-threadpool",
   "uuid",
   "ws",
 ]
@@ -34,7 +32,6 @@ packages = [
   "gleam",
   "proc-macro2",
   "quote",
-  "rand_core",
   "syn",
   "synstructure",
   "unicode-xid",
diff --git a/tests/unit/script/size_of.rs b/tests/unit/script/size_of.rs
index 4ab28494e06..e3107c13290 100644
--- a/tests/unit/script/size_of.rs
+++ b/tests/unit/script/size_of.rs
@@ -31,9 +31,9 @@ macro_rules! sizeof_checker (
 // Update the sizes here
 sizeof_checker!(size_event_target, EventTarget, 56);
 sizeof_checker!(size_node, Node, 176);
-sizeof_checker!(size_element, Element, 384);
-sizeof_checker!(size_htmlelement, HTMLElement, 400);
-sizeof_checker!(size_div, HTMLDivElement, 400);
-sizeof_checker!(size_span, HTMLSpanElement, 400);
+sizeof_checker!(size_element, Element, 352);
+sizeof_checker!(size_htmlelement, HTMLElement, 368);
+sizeof_checker!(size_div, HTMLDivElement, 368);
+sizeof_checker!(size_span, HTMLSpanElement, 368);
 sizeof_checker!(size_text, Text, 208);
 sizeof_checker!(size_characterdata, CharacterData, 208);
diff --git a/tests/unit/style/Cargo.toml b/tests/unit/style/Cargo.toml
index cfbee610425..f25e4a5b20f 100644
--- a/tests/unit/style/Cargo.toml
+++ b/tests/unit/style/Cargo.toml
@@ -11,9 +11,9 @@ doctest = false
 
 [dependencies]
 app_units = "0.7"
-cssparser = "0.25"
+cssparser = "0.27.1"
 euclid = "0.20"
-html5ever = "0.24"
+html5ever = "0.25"
 rayon = "1"
 serde_json = "1.0"
 selectors = {path = "../../../components/selectors"}