Auto merge of #26721 - atouchet:master, r=jdm

More Cargo.toml updates

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [ ] `./mach test-tidy` does not report any errors
- [ ] These changes fix #___ (GitHub issue number if applicable)

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because ___

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

components/net_traits/Cargo.toml

@@ -20,7 +20,6 @@ headers = "0.2"
 http = "0.1"
 hyper = "0.12"
 hyper_serde = "0.11"
-piston_image = {package = "image", version = "0.23"}
 ipc-channel = "0.14"
 lazy_static = "1"
 log = "0.4"
@@ -30,6 +29,7 @@ mime = "0.3"
 msg = { path = "../msg" }
 num-traits = "0.2"
 percent-encoding = "2.0"
+piston_image = { package = "image", version = "0.23" }
 pixels = { path = "../pixels" }
 serde = "1.0"
 servo_arc = { path = "../servo_arc" }

components/profile/Cargo.toml

@@ -11,10 +11,10 @@ name = "profile"
 path = "lib.rs"
 
 [dependencies]
-profile_traits = {path = "../profile_traits"}
-ipc-channel = "0.14"
 heartbeats-simple = "0.4"
+ipc-channel = "0.14"
 log = "0.4"
+profile_traits = { path = "../profile_traits" }
 serde = "1.0"
 serde_json = "1.0"
 servo_config = { path = "../config" }

components/profile_traits/Cargo.toml

@@ -11,7 +11,7 @@ name = "profile_traits"
 path = "lib.rs"
 
 [features]
-energy-profiling = ["energymon", "energy-monitor"]
+energy-profiling = ["energy-monitor", "energymon"]
 
 [dependencies]
 crossbeam-channel = "0.4"

components/range/Cargo.toml

@@ -1,5 +1,4 @@
 [package]
-
 name = "range"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]

components/selectors/Cargo.toml

@@ -1,10 +1,8 @@
 [package]
-
 name = "selectors"
 version = "0.22.0"
 authors = ["The Servo Project Developers"]
 documentation = "https://docs.rs/selectors/"
-
 description = "CSS Selectors matching for Rust"
 repository = "https://github.com/servo/servo"
 readme = "README.md"
@@ -23,8 +21,8 @@ bench = []
 bitflags = "1.0"
 cssparser = "0.27"
 derive_more = "0.99"
-log = "0.4"
 fxhash = "0.2"
+log = "0.4"
 phf = "0.8"
 precomputed-hash = "0.1"
 servo_arc = { version = "0.1", path = "../servo_arc" }

components/servo/Cargo.toml

@@ -15,33 +15,33 @@ crate-type = ["rlib"]
 debugmozjs = ["script/debugmozjs"]
 egl = ["mozangle/egl"]
 energy-profiling = ["profile_traits/energy-profiling"]
-profilemozjs = ["script/profilemozjs"]
 googlevr = ["webxr/googlevr"]
 jitspew = ["script/jitspew"]
 js_backtrace = ["script/js_backtrace"]
 layout-2013 = ["layout_thread_2013"]
 layout-2020 = ["layout_thread_2020"]
 max_log_level = ["log/release_max_level_info"]
+media-dummy = ["servo-media-dummy"]
+media-gstreamer = ["servo-media-gstreamer", "gstreamer"]
 native-bluetooth = ["bluetooth/native-bluetooth"]
 no-wgl = ["canvas/no-wgl"]
-uwp = ["servo_config/uwp", "script/uwp"]
-webrender_debugger = ["webrender/debugger"]
 no_static_freetype = ["webrender/no_static_freetype"]
+profilemozjs = ["script/profilemozjs"]
 refcell_backtrace = ["script/refcell_backtrace"]
+uwp = ["servo_config/uwp", "script/uwp"]
 webdriver = ["webdriver_server"]
 webgl_backtrace = [
     "script/webgl_backtrace",
     "canvas/webgl_backtrace",
     "canvas_traits/webgl_backtrace",
 ]
-media-dummy = ["servo-media-dummy"]
+webrender_debugger = ["webrender/debugger"]
-media-gstreamer = ["servo-media-gstreamer", "gstreamer"]
 xr-profile = ["canvas/xr-profile", "canvas_traits/xr-profile", "script/xr-profile", "webxr/profile"]
 
 [dependencies]
 background_hang_monitor = { path = "../background_hang_monitor" }
-bluetooth_traits = {path = "../bluetooth_traits"}
 bluetooth = { path = "../bluetooth" }
+bluetooth_traits = { path = "../bluetooth_traits" }
 canvas = { path = "../canvas", default-features = false }
 canvas_traits = { path = "../canvas_traits" }
 compositing = { path = "../compositing", features = ["gl"] }
@@ -55,6 +55,7 @@ env_logger = "0.7"
 euclid = "0.20"
 gfx = { path = "../gfx" }
 gleam = "0.11"
+gstreamer = { version = "0.15", optional = true }
 ipc-channel = "0.14"
 keyboard-types = "0.4"
 layout_thread_2013 = { path = "../layout_thread", optional = true }
@@ -69,25 +70,24 @@ profile_traits = {path = "../profile_traits"}
 script = { path = "../script" }
 script_layout_interface = { path = "../script_layout_interface" }
 script_traits = { path = "../script_traits" }
-servo_config = {path = "../config"}
-servo_geometry = {path = "../geometry"}
 servo-media = { git = "https://github.com/servo/media" }
 servo-media-dummy = { git = "https://github.com/servo/media", optional = true }
 servo-media-gstreamer = { git = "https://github.com/servo/media", optional = true }
+servo_config = { path = "../config" }
+servo_geometry = { path = "../geometry" }
 servo_url = { path = "../url" }
 sparkle = "0.1"
 style = { path = "../style", features = ["servo"] }
 style_traits = { path = "../style_traits", features = ["servo"] }
+surfman = "0.2"
+webdriver_server = { path = "../webdriver_server", optional = true }
 webgpu = { path = "../webgpu" }
 webrender = { git = "https://github.com/servo/webrender" }
 webrender_api = { git = "https://github.com/servo/webrender" }
 webrender_surfman = { path = "../webrender_surfman" }
 webrender_traits = { path = "../webrender_traits" }
-webdriver_server = {path = "../webdriver_server", optional = true}
-webxr-api = {git = "https://github.com/servo/webxr"}
 webxr = { git = "https://github.com/servo/webxr" }
-surfman = "0.2"
+webxr-api = { git = "https://github.com/servo/webxr" }
-gstreamer = { version = "0.15", optional = true }
 
 [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 = "0.2.1"

components/servo_arc/Cargo.toml

@@ -11,8 +11,8 @@ name = "servo_arc"
 path = "lib.rs"
 
 [features]
-servo = ["serde"]
 gecko_refcount_logging = []
+servo = ["serde"]
 
 [dependencies]
 nodrop = { version = "0.1.8" }