Some Cargo.toml cleanups

components/background_hang_monitor/Cargo.toml

@@ -14,12 +14,12 @@ doctest = false
 
 [dependencies]
 backtrace = "0.3"
+crossbeam-channel = "0.4"
 ipc-channel = "0.14"
 libc = "0.2"
 log = "0.4"
 msg = { path = "../msg" }
 serde_json = "1.0"
-crossbeam-channel = "0.4"
 
 [dev-dependencies]
 lazy_static = "1.0"

components/bluetooth_traits/Cargo.toml

@@ -11,7 +11,7 @@ name = "bluetooth_traits"
 path = "lib.rs"
 
 [dependencies]
+embedder_traits = { path = "../embedder_traits" }
 ipc-channel = "0.14"
 regex = "1.1"
 serde = "1.0"
-embedder_traits = { path = "../embedder_traits" }

components/compositing/Cargo.toml

@@ -24,8 +24,8 @@ gfx_traits = {path = "../gfx_traits"}
 gleam = { version = "0.11", optional = true }
 image = "0.23"
 ipc-channel = "0.14"
-libc = "0.2"
 keyboard-types = "0.4.3"
+libc = "0.2"
 log = "0.4"
 msg = { path = "../msg" }
 net_traits = { path = "../net_traits" }
@@ -33,8 +33,8 @@ num-traits = "0.2"
 pixels = { path = "../pixels", optional = true }
 profile_traits = { path = "../profile_traits" }
 script_traits = { path = "../script_traits" }
-servo_geometry = {path = "../geometry"}
 servo-media = { git = "https://github.com/servo/media" }
+servo_geometry = { path = "../geometry" }
 servo_url = { path = "../url" }
 style_traits = { path = "../style_traits" }
 time = "0.1.17"

ports/glutin/Cargo.toml

@@ -27,17 +27,17 @@ OriginalFilename = "servo.exe"
 ProductName = "Servo"
 
 [features]
+debugmozjs = ["libservo/debugmozjs"]
 default = ["webdriver", "max_log_level"]
 egl = ["libservo/egl"]
 energy-profiling = ["libservo/energy-profiling"]
-debugmozjs = ["libservo/debugmozjs"]
-media-dummy = ["libservo/media-dummy"]
-media-gstreamer = ["libservo/media-gstreamer"]
 jitspew = ["libservo/jitspew"]
 js_backtrace = ["libservo/js_backtrace"]
 layout-2013 = ["libservo/layout-2013"]
 layout-2020 = ["libservo/layout-2020"]
 max_log_level = ["log/release_max_level_info"]
+media-dummy = ["libservo/media-dummy"]
+media-gstreamer = ["libservo/media-gstreamer"]
 native-bluetooth = ["libservo/native-bluetooth"]
 no-wgl = ["libservo/no-wgl"]
 profilemozjs = ["libservo/profilemozjs"]

ports/libsimpleservo/api/Cargo.toml

@@ -13,9 +13,8 @@ libservo = { path = "../../../components/servo" }
 log = "0.4"
 servo-media = { git = "https://github.com/servo/media" }
 surfman = { version = "0.2", features = ["sm-angle-default"] }
-
-webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] }
 webxr = { git = "https://github.com/servo/webxr"}
+webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] }
 
 [target.'cfg(not(target_os = "macos"))'.dependencies]
 libc = "0.2"
@@ -33,10 +32,8 @@ libloading = "0.5"
 gl_generator = "0.14"
 
 [features]
-default = ["webdriver", "max_log_level"]
 debugmozjs = ["libservo/debugmozjs"]
-media-dummy = ["libservo/media-dummy"]
+default = ["webdriver", "max_log_level"]
-media-gstreamer = ["libservo/media-gstreamer"]
 egl = ["libservo/egl"]
 energy-profiling = ["libservo/energy-profiling"]
 googlevr = ["libservo/googlevr"]
@@ -45,12 +42,14 @@ js_backtrace = ["libservo/js_backtrace"]
 layout-2013 = ["libservo/layout-2013"]
 layout-2020 = ["libservo/layout-2020"]
 max_log_level = ["log/release_max_level_info"]
+media-dummy = ["libservo/media-dummy"]
+media-gstreamer = ["libservo/media-gstreamer"]
 native-bluetooth = ["libservo/native-bluetooth"]
 no_static_freetype = ["libservo/no_static_freetype"]
 no-wgl = ["libservo/no-wgl"]
 profilemozjs = ["libservo/profilemozjs"]
 refcell_backtrace = ["libservo/refcell_backtrace"]
-webdriver = ["libservo/webdriver"]
 uwp = ["libservo/uwp", "webxr/openxr-api"]
+webdriver = ["libservo/webdriver"]
 webgl_backtrace = ["libservo/webgl_backtrace"]
 xr-profile = ["libservo/xr-profile"]

ports/libsimpleservo/capi/Cargo.toml

@@ -30,8 +30,6 @@ cbindgen = "0.14"
 [features]
 debugmozjs = ["simpleservo/debugmozjs"]
 default = ["webdriver", "max_log_level"]
-media-dummy = ["simpleservo/media-dummy"]
-media-gstreamer = ["simpleservo/media-gstreamer"]
 egl = ["simpleservo/egl"]
 energy-profiling = ["simpleservo/energy-profiling"]
 googlevr = ["simpleservo/googlevr"]
@@ -40,6 +38,8 @@ js_backtrace = ["simpleservo/js_backtrace"]
 layout-2013 = ["simpleservo/layout-2013"]
 layout-2020 = ["simpleservo/layout-2020"]
 max_log_level = ["simpleservo/max_log_level"]
+media-dummy = ["simpleservo/media-dummy"]
+media-gstreamer = ["simpleservo/media-gstreamer"]
 native-bluetooth = ["simpleservo/native-bluetooth"]
 no-wgl = ["simpleservo/no-wgl"]
 profilemozjs = ["simpleservo/profilemozjs"]

ports/libsimpleservo/jniapi/Cargo.toml

@@ -29,8 +29,6 @@ cc = "1.0"
 [features]
 debugmozjs = ["simpleservo/debugmozjs"]
 default = ["webdriver", "max_log_level"]
-media-dummy = ["simpleservo/media-dummy"]
-media-gstreamer = ["simpleservo/media-gstreamer"]
 egl = ["simpleservo/egl"]
 energy-profiling = ["simpleservo/energy-profiling"]
 googlevr = ["simpleservo/googlevr"]
@@ -38,6 +36,8 @@ js_backtrace = ["simpleservo/js_backtrace"]
 layout-2013 = ["simpleservo/layout-2013"]
 layout-2020 = ["simpleservo/layout-2020"]
 max_log_level = ["simpleservo/max_log_level"]
+media-dummy = ["simpleservo/media-dummy"]
+media-gstreamer = ["simpleservo/media-gstreamer"]
 native-bluetooth = ["simpleservo/native-bluetooth"]
 webdriver = ["simpleservo/webdriver"]
 webgl_backtrace = ["simpleservo/webgl_backtrace"]