From 0da9ba5bbef6ca764564207e323ebf29501d5f55 Mon Sep 17 00:00:00 2001
From: atouchet <alextouchet@outlook.com>
Date: Sat, 25 Apr 2020 18:26:49 -0700
Subject: [PATCH] More Cargo.toml updates

---
 components/net/Cargo.toml    | 34 +++++++++++++++++-----------------
 components/script/Cargo.toml |  4 ++--
 ports/gstplugin/Cargo.toml   |  8 ++++----
 ports/libmlservo/Cargo.toml  |  9 ++++-----
 4 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml
index d1248453c10..64f40d55689 100644
--- a/components/net/Cargo.toml
+++ b/components/net/Cargo.toml
@@ -18,19 +18,19 @@ doctest = false
 base64 = "0.10.1"
 brotli = "3"
 bytes = "0.4"
-content-security-policy = {version = "0.4.0", features = ["serde"]}
-cookie_rs = {package = "cookie", version = "0.11"}
+content-security-policy = { version = "0.4.0", features = ["serde"] }
+cookie_rs = { package = "cookie", version = "0.11" }
 crossbeam-channel = "0.4"
 data-url = "0.1.0"
-devtools_traits = {path = "../devtools_traits"}
+devtools_traits = { path = "../devtools_traits" }
 embedder_traits = { path = "../embedder_traits" }
 flate2 = "1"
 futures = "0.1"
 headers = "0.2"
 http = "0.1"
 hyper = "0.12"
-hyper_serde = "0.11"
 hyper-openssl = "0.7"
+hyper_serde = "0.11"
 immeta = "0.4"
 ipc-channel = "0.14"
 lazy_static = "1"
@@ -39,31 +39,31 @@ log = "0.4"
 malloc_size_of = { path = "../malloc_size_of" }
 malloc_size_of_derive = "0.1"
 mime = "0.3"
-mime_guess = "2.0.0-alpha.6"
-msg = {path = "../msg"}
-net_traits = {path = "../net_traits"}
+mime_guess = "2.0.0"
+msg = { path = "../msg" }
+net_traits = { path = "../net_traits" }
 openssl = "0.10"
 openssl-sys = "0.9"
 percent-encoding = "2.0"
-pixels = {path = "../pixels"}
-profile_traits = {path = "../profile_traits"}
+pixels = { path = "../pixels" }
+profile_traits = { path = "../profile_traits" }
 rayon = "1"
 serde = "1.0"
 serde_json = "1.0"
-servo_allocator = {path = "../allocator"}
-servo_arc = {path = "../servo_arc"}
-servo_config = {path = "../config"}
-servo_url = {path = "../url"}
-tokio = "0.1"
+servo_allocator = { path = "../allocator" }
+servo_arc = { path = "../servo_arc" }
+servo_config = { path = "../config" }
+servo_url = { path = "../url" }
 time = "0.1.17"
+tokio = "0.1"
 url = "2.0"
-uuid = {version = "0.8", features = ["v4"]}
-webrender_api = {git = "https://github.com/servo/webrender"}
+uuid = { version = "0.8", features = ["v4"] }
+webrender_api = { git = "https://github.com/servo/webrender" }
 ws = { version = "0.9", features = ["ssl"] }
 
 [dev-dependencies]
-std_test_override = { path = "../std_test_override" }
 futures = "0.1"
+std_test_override = { path = "../std_test_override" }
 tokio-openssl = "0.3"
 
 [[test]]
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
index 74ada1cc62a..f4d8808c869 100644
--- a/components/script/Cargo.toml
+++ b/components/script/Cargo.toml
@@ -73,7 +73,7 @@ malloc_size_of_derive = "0.1"
 media = { path = "../media" }
 metrics = { path = "../metrics" }
 mime = "0.3.13"
-mime_guess = "2.0.0-alpha.6"
+mime_guess = "2.0.0"
 mitochondria = "1.1.2"
 msg = { path = "../msg" }
 net_traits = { path = "../net_traits" }
@@ -92,6 +92,7 @@ script_traits = { path = "../script_traits" }
 selectors = { path = "../selectors" }
 serde = { version = "1", features = ["derive"] }
 serde_bytes = "0.11"
+servo-media = { git = "https://github.com/servo/media" }
 servo_allocator = { path = "../allocator" }
 servo_arc = { path = "../servo_arc" }
 servo_atoms = { path = "../atoms" }
@@ -99,7 +100,6 @@ servo_config = { path = "../config" }
 servo_geometry = { path = "../geometry" }
 servo_rand = { path = "../rand" }
 servo_url = { path = "../url" }
-servo-media = { git = "https://github.com/servo/media" }
 smallvec = { version = "0.6", features = ["std", "union"] }
 sparkle = "0.1"
 style = { path = "../style", features = ["servo"] }
diff --git a/ports/gstplugin/Cargo.toml b/ports/gstplugin/Cargo.toml
index 4cf09356c17..3bba16a1522 100644
--- a/ports/gstplugin/Cargo.toml
+++ b/ports/gstplugin/Cargo.toml
@@ -25,14 +25,14 @@ gstreamer-gl = "0.15"
 gstreamer-gl-sys = { version = "0.8", features = ["wayland"] }
 gstreamer-sys = "0.8"
 gstreamer-video = "0.15"
-log = "0.4"
 lazy_static = "1.4"
-libservo = {path = "../../components/servo"}
-servo-media = {git = "https://github.com/servo/media"}
+libservo = { path = "../../components/servo" }
+log = "0.4"
+servo-media = { git = "https://github.com/servo/media" }
 sparkle = "0.1"
 surfman = { git = "https://github.com/servo/surfman" }
-surfman-chains-api = "0.2"
 surfman-chains = { git = "https://github.com/asajeffrey/surfman-chains" }
+surfman-chains-api = "0.2"
 
 [build-dependencies]
 gst-plugin-version-helper = "0.2"
diff --git a/ports/libmlservo/Cargo.toml b/ports/libmlservo/Cargo.toml
index ba5b8ad6e90..c3ff6e865ac 100644
--- a/ports/libmlservo/Cargo.toml
+++ b/ports/libmlservo/Cargo.toml
@@ -18,12 +18,11 @@ layout-2013 = ["simpleservo/layout-2013"]
 layout-2020 = ["simpleservo/layout-2020"]
 
 [dependencies]
-libservo = { path = "../../components/servo", features = ["no_static_freetype"] }
-simpleservo = { path = "../libsimpleservo/api", features = ["no_static_freetype"] }
-webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] }
-webxr = { git = "https://github.com/servo/webxr", features = ["ipc", "magicleap"] }
 libc = "0.2"
+libservo = { path = "../../components/servo", features = ["no_static_freetype"] }
 log = "0.4"
 servo-egl = "0.2"
+simpleservo = { path = "../libsimpleservo/api", features = ["no_static_freetype"] }
 smallvec = "1.3"
-
+webxr = { git = "https://github.com/servo/webxr", features = ["ipc", "magicleap"] }
+webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] }