From 5a0332f57e984344714ad3f52e395d1ee7d372fe Mon Sep 17 00:00:00 2001
From: Alex Touchet <26315797+atouchet@users.noreply.github.com>
Date: Fri, 19 Sep 2025 20:09:37 -0700
Subject: [PATCH] Cargo.toml cleanup (#39403)

Cargo.toml cleanups. Mostly ordering fixes.

Testing: No tests for Cargo.toml edits.

---------

Signed-off-by: Alex Touchet <26315797+atouchet@users.noreply.github.com>
---
 Cargo.toml                                    | 10 ++++----
 components/background_hang_monitor/Cargo.toml |  2 +-
 components/bluetooth/Cargo.toml               |  2 +-
 components/canvas/Cargo.toml                  | 19 +++++++--------
 components/compositing/Cargo.toml             |  4 ++--
 components/constellation/Cargo.toml           | 10 ++++----
 components/devtools/Cargo.toml                |  3 +--
 components/fonts/Cargo.toml                   |  4 ++--
 components/layout/Cargo.toml                  |  2 +-
 components/media/Cargo.toml                   |  2 +-
 components/net/Cargo.toml                     | 12 +++++-----
 components/script/Cargo.toml                  |  8 +++----
 components/script_bindings/Cargo.toml         |  2 +-
 components/servo/Cargo.toml                   | 24 +++++++++----------
 components/servo_tracing/Cargo.toml           |  2 +-
 components/shared/compositing/Cargo.toml      |  4 ++--
 components/shared/constellation/Cargo.toml    |  2 +-
 components/shared/devtools/Cargo.toml         |  4 ++--
 components/shared/embedder/Cargo.toml         |  6 ++---
 components/shared/layout/Cargo.toml           |  8 +++----
 components/shared/net/Cargo.toml              |  2 +-
 components/shared/script/Cargo.toml           |  4 ++--
 components/webdriver_server/Cargo.toml        |  4 ++--
 components/webgl/Cargo.toml                   |  2 +-
 components/webgpu/Cargo.toml                  |  2 +-
 components/webxr/Cargo.toml                   |  4 ++--
 ports/servoshell/Cargo.toml                   | 14 +++++------
 27 files changed, 80 insertions(+), 82 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 180dafc4b37..945471cd93a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,10 +13,10 @@ authors = ["The Servo Project Developers"]
 license = "MPL-2.0"
 edition = "2024"
 publish = false
-# We have yet to decide on a policy for updating the minimum supported rust version.
-# Before increasing this, please open a discussion on zulip explaining the reason
-# why we should consider increasing our minimum supported rust version.
-# Please also note, that the **default** rust version in rust-toolchain.toml may be
+# We have yet to decide on a policy for updating the minimum supported Rust version.
+# Before increasing this, please open a discussion on Zulip explaining the reason
+# why we should consider increasing our minimum supported Rust version.
+# Please also note, that the **default** Rust version in rust-toolchain.toml may be
 # bumped freely.
 rust-version = "1.86.0"
 
@@ -122,10 +122,10 @@ rayon = "1"
 read-fonts = "0.33.1"
 regex = "1.11"
 resvg = "0.45.0"
+rustc-hash = "2.1.1"
 rustls = { version = "0.23", default-features = false, features = ["logging", "std", "tls12"] }
 rustls-pemfile = "2.0"
 rustls-pki-types = "1.12"
-rustc-hash = "2.1.1"
 script_traits = { path = "components/shared/script" }
 selectors = { git = "https://github.com/servo/stylo", branch = "2025-09-02" }
 serde = "1.0.225"
diff --git a/components/background_hang_monitor/Cargo.toml b/components/background_hang_monitor/Cargo.toml
index 5e7162711d3..68eaaafd1d3 100644
--- a/components/background_hang_monitor/Cargo.toml
+++ b/components/background_hang_monitor/Cargo.toml
@@ -17,12 +17,12 @@ doctest = false
 background_hang_monitor_api = { workspace = true }
 backtrace = { workspace = true }
 base = { workspace = true }
-rustc-hash = { workspace = true }
 crossbeam-channel = { workspace = true }
 ipc-channel = { workspace = true }
 libc = { workspace = true }
 log = { workspace = true }
 rustc-demangle = { version = "0.1", optional = true }
+rustc-hash = { workspace = true }
 serde_json = { workspace = true }
 
 [target.'cfg(target_os = "macos")'.dependencies]
diff --git a/components/bluetooth/Cargo.toml b/components/bluetooth/Cargo.toml
index 4be0c04c6bf..316dd74ccb6 100644
--- a/components/bluetooth/Cargo.toml
+++ b/components/bluetooth/Cargo.toml
@@ -34,5 +34,5 @@ blurmac = { path = "../../third_party/blurmac", optional = true }
 
 [features]
 default = ["bluetooth-test"]
-native-bluetooth = ["blurz", "blurdroid", "blurmac", "bluetooth-test"]
 bluetooth-test = ["blurmock"]
+native-bluetooth = ["bluetooth-test", "blurdroid", "blurmac", "blurz"]
diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml
index 2f53ff64f7e..0c54b4c782b 100644
--- a/components/canvas/Cargo.toml
+++ b/components/canvas/Cargo.toml
@@ -12,9 +12,9 @@ name = "canvas"
 path = "lib.rs"
 
 [features]
+tracing = ["dep:tracing"]
 vello = ["dep:vello", "dep:pollster", "dep:futures-intrusive", "dep:peniko"]
 vello_cpu = ["dep:vello_cpu", "dep:peniko"]
-tracing = ["dep:tracing"]
 
 [dependencies]
 app_units = { workspace = true }
@@ -26,23 +26,22 @@ crossbeam-channel = { workspace = true }
 cssparser = { workspace = true }
 euclid = { workspace = true }
 fonts = { path = "../fonts" }
+futures-intrusive = { version = "0.5", optional = true }
 ipc-channel = { workspace = true }
 kurbo = { workspace = true }
-rustc-hash = { workspace = true }
 log = { workspace = true }
 net_traits = { workspace = true }
 peniko = { workspace = true, optional = true }
 pixels = { path = "../pixels" }
+pollster = { version = "0.4", optional = true }
 range = { path = "../range" }
+rustc-hash = { workspace = true }
+servo-tracing = { workspace = true }
 servo_arc = { workspace = true }
-stylo = { workspace = true }
-unicode-script = { workspace = true }
-webrender_api = { workspace = true }
 servo_config = { path = "../config" }
+stylo = { workspace = true }
+tracing = { workspace = true, optional = true }
+unicode-script = { workspace = true }
 vello = { workspace = true, optional = true }
 vello_cpu = { workspace = true, optional = true }
-pollster = { version = "0.4", optional = true }
-futures-intrusive = { version = "0.5", optional = true }
-
-tracing = { workspace = true, optional = true }
-servo-tracing = { workspace = true }
+webrender_api = { workspace = true }
diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml
index c65a5ab5284..03572476027 100644
--- a/components/compositing/Cargo.toml
+++ b/components/compositing/Cargo.toml
@@ -28,7 +28,6 @@ compositing_traits = { workspace = true }
 constellation_traits = { workspace = true }
 crossbeam-channel = { workspace = true }
 dpi = { workspace = true }
-rustc-hash = { workspace = true }
 embedder_traits = { workspace = true }
 euclid = { workspace = true }
 gleam = { workspace = true }
@@ -38,10 +37,11 @@ log = { workspace = true }
 malloc_size_of = { workspace = true }
 pixels = { path = "../pixels" }
 profile_traits = { workspace = true }
+rustc-hash = { workspace = true }
+servo-tracing = { workspace = true }
 servo_allocator = { path = "../allocator" }
 servo_config = { path = "../config" }
 servo_geometry = { path = "../geometry" }
-servo-tracing = { workspace = true }
 stylo_traits = { workspace = true }
 timers = { path = "../timers" }
 tracing = { workspace = true, optional = true }
diff --git a/components/constellation/Cargo.toml b/components/constellation/Cargo.toml
index ea6f8c2bdfb..5a212acc600 100644
--- a/components/constellation/Cargo.toml
+++ b/components/constellation/Cargo.toml
@@ -12,12 +12,12 @@ name = "constellation"
 path = "lib.rs"
 
 [features]
-bluetooth = ["bluetooth_traits"]
 default = []
+bluetooth = ["bluetooth_traits"]
 tracing = ["dep:tracing", "canvas/tracing"]
-webgpu = ["script_traits/webgpu"]
 vello = ["canvas/vello"]
 vello_cpu = ["canvas/vello_cpu"]
+webgpu = ["script_traits/webgpu"]
 
 [lints.clippy]
 unwrap_used = "deny"
@@ -40,7 +40,6 @@ euclid = { workspace = true }
 fonts = { path = "../fonts" }
 ipc-channel = { workspace = true }
 keyboard-types = { workspace = true }
-rustc-hash = { workspace = true }
 layout_api = { workspace = true }
 log = { workspace = true }
 media = { path = "../media" }
@@ -49,20 +48,21 @@ net_traits = { workspace = true }
 parking_lot = { workspace = true }
 profile = { path = "../profile" }
 profile_traits = { workspace = true }
+rustc-hash = { workspace = true }
 script_traits = { workspace = true }
 serde = { workspace = true }
+servo-tracing = { workspace = true }
 servo_config = { path = "../config" }
 servo_rand = { path = "../rand" }
 servo_url = { path = "../url" }
-stylo_traits = { workspace = true }
 stylo = { workspace = true }
+stylo_traits = { workspace = true }
 tracing = { workspace = true, optional = true }
 webgpu = { path = "../webgpu" }
 webgpu_traits = { workspace = true }
 webrender = { workspace = true }
 webrender_api = { workspace = true }
 webxr-api = { workspace = true, features = ["ipc"] }
-servo-tracing = { workspace = true }
 
 [target.'cfg(any(target_os="macos", all(not(target_os = "windows"), not(target_os = "ios"), not(target_os="android"), not(target_env="ohos"), not(target_arch="arm"), not(target_arch="aarch64"))))'.dependencies]
 gaol = "0.2.1"
diff --git a/components/devtools/Cargo.toml b/components/devtools/Cargo.toml
index 27047e053f7..1d3f0fb22c9 100644
--- a/components/devtools/Cargo.toml
+++ b/components/devtools/Cargo.toml
@@ -15,7 +15,6 @@ path = "lib.rs"
 base = { workspace = true }
 base64 = { workspace = true }
 chrono = { workspace = true }
-rustc-hash = { workspace = true }
 crossbeam-channel = { workspace = true }
 devtools_traits = { workspace = true }
 embedder_traits = { workspace = true }
@@ -25,6 +24,7 @@ ipc-channel = { workspace = true }
 log = { workspace = true }
 net = { path = "../net" }
 net_traits = { workspace = true }
+rustc-hash = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 servo_config = { path = "../config" }
@@ -32,6 +32,5 @@ servo_rand = { path = "../rand" }
 servo_url = { path = "../url" }
 uuid = { workspace = true }
 
-
 [build-dependencies]
 chrono = { workspace = true }
diff --git a/components/fonts/Cargo.toml b/components/fonts/Cargo.toml
index 55f08d158de..a22f053f133 100644
--- a/components/fonts/Cargo.toml
+++ b/components/fonts/Cargo.toml
@@ -37,9 +37,10 @@ net_traits = { workspace = true }
 num-traits = { workspace = true }
 parking_lot = { workspace = true }
 profile_traits = { workspace = true }
-read-fonts = { workspace = true }
 range = { path = "../range" }
+read-fonts = { workspace = true }
 serde = { workspace = true }
+servo-tracing = { workspace = true }
 servo_arc = { workspace = true }
 servo_config = { path = "../config" }
 servo_url = { path = "../url" }
@@ -53,7 +54,6 @@ unicode-properties = { workspace = true }
 unicode-script = { workspace = true }
 url = { workspace = true }
 webrender_api = { workspace = true }
-servo-tracing = { workspace = true }
 
 [target.'cfg(target_os = "macos")'.dependencies]
 byteorder = { workspace = true }
diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml
index 20a4a581b9c..9b61883a51a 100644
--- a/components/layout/Cargo.toml
+++ b/components/layout/Cargo.toml
@@ -49,6 +49,7 @@ rustc-hash = { workspace = true }
 script = { path = "../script" }
 script_traits = { workspace = true }
 selectors = { workspace = true }
+servo-tracing = { workspace = true }
 servo_arc = { workspace = true }
 servo_config = { path = "../config" }
 servo_geometry = { path = "../geometry" }
@@ -65,7 +66,6 @@ unicode-script = { workspace = true }
 url = { workspace = true }
 webrender_api = { workspace = true }
 xi-unicode = { workspace = true }
-servo-tracing = { workspace = true }
 
 [dev-dependencies]
 num-traits = { workspace = true }
diff --git a/components/media/Cargo.toml b/components/media/Cargo.toml
index c80f39cddbe..2e51731a504 100644
--- a/components/media/Cargo.toml
+++ b/components/media/Cargo.toml
@@ -14,9 +14,9 @@ path = "lib.rs"
 [dependencies]
 compositing_traits = { workspace = true }
 euclid = { workspace = true }
-rustc-hash = { workspace = true }
 ipc-channel = { workspace = true }
 log = { workspace = true }
+rustc-hash = { workspace = true }
 serde = { workspace = true }
 servo-media = { workspace = true }
 servo_config = { path = "../config" }
diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml
index eb7c81b2dc8..404c8e8a260 100644
--- a/components/net/Cargo.toml
+++ b/components/net/Cargo.toml
@@ -15,7 +15,7 @@ test = false
 doctest = false
 
 [dependencies]
-async-compression = { version = "0.4.12", default-features = false, features = ["tokio", "brotli", "gzip", "zlib", "zstd"] }
+async-compression = { version = "0.4.12", default-features = false, features = ["brotli", "gzip", "tokio", "zlib", "zstd"] }
 async-recursion = "1.1"
 async-tungstenite = { workspace = true }
 base = { workspace = true }
@@ -31,7 +31,6 @@ data-url = { workspace = true }
 devtools_traits = { workspace = true }
 embedder_traits = { workspace = true }
 fst = "0.4"
-rustc-hash = { workspace = true }
 futures = { version = "0.3", package = "futures" }
 futures-core = { version = "0.3.30", default-features = false }
 futures-util = { version = "0.3.30", default-features = false }
@@ -56,12 +55,13 @@ nom = { workspace = true }
 pixels = { path = "../pixels" }
 profile_traits = { workspace = true }
 rayon = { workspace = true }
+resvg = { workspace = true }
+rusqlite = { version = "0.37", features = ["bundled"] }
+rustc-hash = { workspace = true }
 rustls = { workspace = true }
 rustls-pemfile = { workspace = true }
 rustls-pki-types = { workspace = true }
-resvg = { workspace = true }
-rusqlite = { version = "0.37", features = ["bundled"] }
-sea-query = { version = "1.0.0-rc.9", default-features = false, features = ["derive", "backend-sqlite"] }
+sea-query = { version = "1.0.0-rc.9", default-features = false, features = ["backend-sqlite", "derive"] }
 sea-query-rusqlite = { version = "0.8.0-rc.8" }
 serde = { workspace = true }
 serde_json = { workspace = true }
@@ -70,7 +70,7 @@ servo_config = { path = "../config" }
 servo_url = { path = "../url" }
 sha2 = "0.10"
 time = { workspace = true }
-tokio = { workspace = true, features = ["sync", "macros", "rt-multi-thread"] }
+tokio = { workspace = true, features = ["macros", "rt-multi-thread", "sync"] }
 tokio-rustls = { workspace = true }
 tokio-stream = "0.1"
 tokio-util = { version = "0.7.12", default-features = false, features = ["codec", "io"] }
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
index 01a21e44e6d..41e8029c0a4 100644
--- a/components/script/Cargo.toml
+++ b/components/script/Cargo.toml
@@ -17,14 +17,14 @@ bluetooth = ['bluetooth_traits', 'script_bindings/bluetooth']
 crown = ['js/crown']
 debugmozjs = ['js/debugmozjs']
 jitspew = ['js/jitspew']
+js_backtrace = []
 profilemozjs = ['js/profilemozjs']
+refcell_backtrace = ["accountable-refcell"]
 testbinding = ["script_bindings/testbinding"]
 tracing = ["dep:tracing", "script_bindings/tracing"]
 webgl_backtrace = ["canvas_traits/webgl_backtrace"]
-js_backtrace = []
-refcell_backtrace = ["accountable-refcell"]
-webxr = ["webxr-api", "script_bindings/webxr"]
 webgpu = ["script_bindings/webgpu", "script_traits/webgpu"]
+webxr = ["webxr-api", "script_bindings/webxr"]
 
 [lints.rust]
 unexpected_cfgs = { level = "warn", check-cfg = ['cfg(crown)'] }
@@ -99,10 +99,10 @@ parking_lot = { workspace = true }
 percent-encoding = { workspace = true }
 phf = "0.11"
 pixels = { path = "../pixels" }
-rustc-hash = { workspace = true }
 profile_traits = { workspace = true }
 range = { path = "../range" }
 regex = { workspace = true }
+rustc-hash = { workspace = true }
 script_bindings = { path = "../script_bindings" }
 script_traits = { workspace = true }
 selectors = { workspace = true }
diff --git a/components/script_bindings/Cargo.toml b/components/script_bindings/Cargo.toml
index 0833d155c9d..18d88f86ae9 100644
--- a/components/script_bindings/Cargo.toml
+++ b/components/script_bindings/Cargo.toml
@@ -26,9 +26,9 @@ html5ever = { workspace = true }
 indexmap = { workspace = true }
 js = { workspace = true }
 jstraceable_derive = { path = "../jstraceable_derive" }
+keyboard-types = { workspace = true }
 libc = { workspace = true }
 log = { workspace = true }
-keyboard-types = { workspace = true }
 malloc_size_of = { workspace = true }
 malloc_size_of_derive = { workspace = true }
 num-traits = { workspace = true }
diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml
index af1daa1a560..b967a9bbf71 100644
--- a/components/servo/Cargo.toml
+++ b/components/servo/Cargo.toml
@@ -13,6 +13,8 @@ path = "lib.rs"
 crate-type = ["rlib"]
 
 [features]
+default = ["clipboard", "vello_cpu"]
+background_hang_monitor = ["background_hang_monitor/sampler"]
 bluetooth = [
     "bluetooth_traits",
     "dep:bluetooth",
@@ -21,17 +23,15 @@ bluetooth = [
     "script/bluetooth",
     "script_traits/bluetooth",
 ]
-default = ["clipboard", "vello_cpu"]
 clipboard = ["dep:arboard"]
 crown = ["script/crown"]
 debugmozjs = ["script/debugmozjs"]
-background_hang_monitor = ["background_hang_monitor/sampler"]
+dynamic_freetype = ["webrender/dynamic_freetype"]
 jitspew = ["script/jitspew"]
 js_backtrace = ["script/js_backtrace"]
 media-gstreamer = ["servo-media-gstreamer", "gstreamer"]
 native-bluetooth = ["bluetooth/native-bluetooth"]
 no-wgl = ["mozangle/egl", "mozangle/build_dlls", "surfman/sm-angle-default", "compositing_traits/no-wgl"]
-dynamic_freetype = ["webrender/dynamic_freetype"]
 profilemozjs = ["script/profilemozjs"]
 refcell_backtrace = ["script/refcell_backtrace"]
 testbinding = ["script/testbinding"]
@@ -44,11 +44,18 @@ tracing = [
     "profile_traits/tracing",
     "script/tracing",
 ]
+vello = ["constellation/vello"]
+vello_cpu = ["constellation/vello_cpu"]
 webgl_backtrace = [
     "script/webgl_backtrace",
     "webgl/webgl_backtrace",
     "canvas_traits/webgl_backtrace",
 ]
+webgpu = [
+    "script/webgpu",
+    "constellation/webgpu",
+    "constellation_traits/webgpu",
+]
 webxr = [
     "dep:webxr",
     "dep:webxr-api",
@@ -56,22 +63,13 @@ webxr = [
     "webgl/webxr",
     "script/webxr",
 ]
-webgpu = [
-    "script/webgpu",
-    "constellation/webgpu",
-    "constellation_traits/webgpu",
-]
-vello = ["constellation/vello"]
-vello_cpu = ["constellation/vello_cpu"]
 
 [dependencies]
 background_hang_monitor = { path = "../background_hang_monitor" }
 base = { workspace = true }
-rustc-hash = { workspace = true }
 bincode = { workspace = true }
 bluetooth = { path = "../bluetooth", optional = true }
 bluetooth_traits = { workspace = true, optional = true }
-webgl = { path = "../webgl", default-features = false }
 canvas_traits = { workspace = true }
 compositing = { path = "../compositing" }
 compositing_traits = { workspace = true }
@@ -100,6 +98,7 @@ parking_lot = { workspace = true }
 profile = { path = "../profile" }
 profile_traits = { workspace = true }
 rayon = { workspace = true }
+rustc-hash = { workspace = true }
 script = { path = "../script" }
 script_traits = { workspace = true }
 serde = { workspace = true }
@@ -116,6 +115,7 @@ stylo_traits = { workspace = true }
 surfman = { workspace = true }
 tracing = { workspace = true, optional = true }
 url = { workspace = true }
+webgl = { path = "../webgl", default-features = false }
 webgpu = { path = "../webgpu" }
 webrender = { workspace = true }
 webrender_api = { workspace = true }
diff --git a/components/servo_tracing/Cargo.toml b/components/servo_tracing/Cargo.toml
index 1660aa7f691..12fe9a79427 100644
--- a/components/servo_tracing/Cargo.toml
+++ b/components/servo_tracing/Cargo.toml
@@ -8,8 +8,8 @@ publish.workspace = true
 rust-version.workspace = true
 
 [dependencies]
-quote = { workspace = true }
 proc-macro2 = { workspace = true }
+quote = { workspace = true }
 syn = { version = "2", features = ["full"] }
 
 [lib]
diff --git a/components/shared/compositing/Cargo.toml b/components/shared/compositing/Cargo.toml
index eb0110c1884..19036d08be8 100644
--- a/components/shared/compositing/Cargo.toml
+++ b/components/shared/compositing/Cargo.toml
@@ -16,7 +16,6 @@ no-wgl = ["surfman/sm-angle-default"]
 
 [dependencies]
 base = { workspace = true }
-rustc-hash = { workspace = true }
 bincode = { workspace = true }
 bitflags = { workspace = true }
 crossbeam-channel = { workspace = true }
@@ -31,7 +30,8 @@ log = { workspace = true }
 malloc_size_of = { workspace = true }
 malloc_size_of_derive = { workspace = true }
 profile_traits = { path = '../profile' }
-raw-window-handle = { version = "0.6" }
+raw-window-handle = "0.6"
+rustc-hash = { workspace = true }
 serde = { workspace = true }
 servo_geometry = { path = "../../geometry" }
 smallvec = { workspace = true }
diff --git a/components/shared/constellation/Cargo.toml b/components/shared/constellation/Cargo.toml
index 315d150528f..ab620ed17e3 100644
--- a/components/shared/constellation/Cargo.toml
+++ b/components/shared/constellation/Cargo.toml
@@ -23,7 +23,6 @@ devtools_traits = { workspace = true }
 embedder_traits = { workspace = true }
 euclid = { workspace = true }
 fonts_traits = { workspace = true }
-rustc-hash = { workspace = true }
 http = { workspace = true }
 hyper_serde = { workspace = true }
 ipc-channel = { workspace = true }
@@ -33,6 +32,7 @@ malloc_size_of_derive = { workspace = true }
 net_traits = { workspace = true }
 pixels = { path = "../../pixels" }
 profile_traits = { workspace = true }
+rustc-hash = { workspace = true }
 serde = { workspace = true }
 servo_config = { path = "../../config" }
 servo_url = { path = "../../url" }
diff --git a/components/shared/devtools/Cargo.toml b/components/shared/devtools/Cargo.toml
index b6d2ff3f831..d525e2c6a5c 100644
--- a/components/shared/devtools/Cargo.toml
+++ b/components/shared/devtools/Cargo.toml
@@ -14,13 +14,13 @@ path = "lib.rs"
 [dependencies]
 base = { workspace = true }
 bitflags = { workspace = true }
-log = { workspace = true }
+embedder_traits = { workspace = true }
 http = { workspace = true }
 ipc-channel = { workspace = true }
+log = { workspace = true }
 malloc_size_of = { workspace = true }
 malloc_size_of_derive = { workspace = true }
 net_traits = { workspace = true }
 serde = { workspace = true }
 servo_url = { path = "../../url" }
 uuid = { workspace = true, features = ["serde"] }
-embedder_traits = { workspace = true }
diff --git a/components/shared/embedder/Cargo.toml b/components/shared/embedder/Cargo.toml
index 08e8959bf1c..b0a33453a8c 100644
--- a/components/shared/embedder/Cargo.toml
+++ b/components/shared/embedder/Cargo.toml
@@ -25,19 +25,19 @@ http = { workspace = true }
 hyper_serde = { workspace = true }
 ipc-channel = { workspace = true }
 keyboard-types = { workspace = true }
-rustc-hash = { workspace = true }
 log = { workspace = true }
 malloc_size_of = { workspace = true }
 malloc_size_of_derive = { workspace = true }
 num-derive = "0.4"
 pixels = { path = "../../pixels" }
+rustc-hash = { workspace = true }
 serde = { workspace = true }
+servo_geometry = { path = "../../geometry" }
 servo_url = { path = "../../url" }
 strum_macros = { workspace = true }
-stylo_traits = { workspace = true }
 stylo = { workspace = true }
+stylo_traits = { workspace = true }
 url = { workspace = true }
 uuid = { workspace = true }
 webdriver = { workspace = true }
 webrender_api = { workspace = true }
-servo_geometry = { path = "../../geometry" }
diff --git a/components/shared/layout/Cargo.toml b/components/shared/layout/Cargo.toml
index e856e464477..68948e9e756 100644
--- a/components/shared/layout/Cargo.toml
+++ b/components/shared/layout/Cargo.toml
@@ -12,10 +12,10 @@ name = "layout_api"
 path = "lib.rs"
 
 [dependencies]
-base = { workspace = true }
-bitflags = { workspace = true }
 app_units = { workspace = true }
 atomic_refcell = { workspace = true }
+base = { workspace = true }
+bitflags = { workspace = true }
 compositing_traits = { workspace = true }
 constellation_traits = { workspace = true }
 embedder_traits = { workspace = true }
@@ -31,13 +31,13 @@ net_traits = { workspace = true }
 parking_lot = { workspace = true }
 pixels = { path = "../../pixels" }
 profile_traits = { workspace = true }
-rustc-hash = { workspace = true }
 range = { path = "../../range" }
+rustc-hash = { workspace = true }
 script_traits = { workspace = true }
 selectors = { workspace = true }
 serde = { workspace = true }
 servo_arc = { workspace = true }
 servo_url = { path = "../../url" }
-stylo_traits = { workspace = true }
 stylo = { workspace = true }
+stylo_traits = { workspace = true }
 webrender_api = { workspace = true }
diff --git a/components/shared/net/Cargo.toml b/components/shared/net/Cargo.toml
index 5bcad0b938d..2187d455c5f 100644
--- a/components/shared/net/Cargo.toml
+++ b/components/shared/net/Cargo.toml
@@ -22,7 +22,6 @@ crossbeam-channel = { workspace = true }
 data-url = { workspace = true }
 embedder_traits = { workspace = true }
 headers = { workspace = true }
-rustc-hash = { workspace = true }
 http = { workspace = true }
 hyper-util = { workspace = true }
 hyper_serde = { workspace = true }
@@ -35,6 +34,7 @@ num-traits = { workspace = true }
 percent-encoding = { workspace = true }
 pixels = { path = "../../pixels" }
 profile_traits = { path = "../profile" }
+rustc-hash = { workspace = true }
 rustls-pki-types = { workspace = true }
 serde = { workspace = true }
 servo_arc = { workspace = true }
diff --git a/components/shared/script/Cargo.toml b/components/shared/script/Cargo.toml
index 2c153117a89..910cfed6f88 100644
--- a/components/shared/script/Cargo.toml
+++ b/components/shared/script/Cargo.toml
@@ -26,15 +26,16 @@ crossbeam-channel = { workspace = true }
 devtools_traits = { workspace = true }
 embedder_traits = { workspace = true }
 euclid = { workspace = true }
-rustc-hash = { workspace = true }
 ipc-channel = { workspace = true }
 keyboard-types = { workspace = true }
+log = "0.4.27"
 malloc_size_of = { workspace = true }
 malloc_size_of_derive = { workspace = true }
 media = { path = "../../media" }
 net_traits = { workspace = true }
 pixels = { path = "../../pixels" }
 profile_traits = { workspace = true }
+rustc-hash = { workspace = true }
 serde = { workspace = true }
 servo_config = { path = "../../config" }
 servo_url = { path = "../../url" }
@@ -45,4 +46,3 @@ stylo_traits = { workspace = true }
 webgpu_traits = { workspace = true, optional = true }
 webrender_api = { workspace = true }
 webxr-api = { workspace = true, features = ["ipc"] }
-log = "0.4.27"
diff --git a/components/webdriver_server/Cargo.toml b/components/webdriver_server/Cargo.toml
index 9b4c693b312..4a48ce05d1e 100644
--- a/components/webdriver_server/Cargo.toml
+++ b/components/webdriver_server/Cargo.toml
@@ -18,15 +18,15 @@ cookie = { workspace = true }
 crossbeam-channel = { workspace = true }
 embedder_traits = { workspace = true }
 euclid = { workspace = true }
-http = { version = "0.2" }
+http = "0.2"
 image = { workspace = true }
 ipc-channel = { workspace = true }
 keyboard-types = { workspace = true }
 log = { workspace = true }
 pixels = { path = "../pixels" }
+rustc-hash = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
-rustc-hash = { workspace = true }
 servo_config = { path = "../config" }
 servo_geometry = { path = "../geometry" }
 servo_url = { path = "../url" }
diff --git a/components/webgl/Cargo.toml b/components/webgl/Cargo.toml
index a973813225a..413919679b7 100644
--- a/components/webgl/Cargo.toml
+++ b/components/webgl/Cargo.toml
@@ -19,7 +19,6 @@ webxr = ["dep:webxr", "dep:webxr-api"]
 base = { workspace = true }
 bitflags = { workspace = true }
 byteorder = { workspace = true }
-rustc-hash = { workspace = true }
 canvas_traits = { workspace = true }
 compositing_traits = { workspace = true }
 crossbeam-channel = { workspace = true }
@@ -30,6 +29,7 @@ ipc-channel = { workspace = true }
 itertools = { workspace = true }
 log = { workspace = true }
 pixels = { path = "../pixels" }
+rustc-hash = { workspace = true }
 surfman = { workspace = true }
 webrender = { workspace = true }
 webrender_api = { workspace = true }
diff --git a/components/webgpu/Cargo.toml b/components/webgpu/Cargo.toml
index 4c5539478a7..45c7bffb184 100644
--- a/components/webgpu/Cargo.toml
+++ b/components/webgpu/Cargo.toml
@@ -15,11 +15,11 @@ path = "lib.rs"
 arrayvec = { workspace = true, features = ["serde"] }
 base = { workspace = true }
 compositing_traits = { workspace = true }
-rustc-hash = { workspace = true }
 euclid = { workspace = true }
 ipc-channel = { workspace = true }
 log = { workspace = true }
 pixels = { path = "../pixels" }
+rustc-hash = { workspace = true }
 serde = { workspace = true, features = ["serde_derive"] }
 servo_config = { path = "../config" }
 webgpu_traits = { workspace = true }
diff --git a/components/webxr/Cargo.toml b/components/webxr/Cargo.toml
index 809e8483bd4..4348db62771 100644
--- a/components/webxr/Cargo.toml
+++ b/components/webxr/Cargo.toml
@@ -17,12 +17,12 @@ path = "lib.rs"
 
 [features]
 default = ["x11"]
-x11 = ["surfman/sm-x11"]
 angle = ["surfman/sm-angle"]
 glwindow = []
 headless = []
 ipc = ["webxr-api/ipc", "serde"]
 openxr-api = ["angle", "openxr", "winapi", "wio", "surfman/sm-angle-default"]
+x11 = ["surfman/sm-x11"]
 
 [dependencies]
 crossbeam-channel = { workspace = true }
@@ -36,5 +36,5 @@ surfman = { workspace = true, features = ["chains", "sm-raw-window-handle-06"] }
 webxr-api = { workspace = true }
 
 [target.'cfg(target_os = "windows")'.dependencies]
-winapi = { workspace = true, features = ["dxgi", "d3d11", "winerror"], optional = true }
+winapi = { workspace = true, features = ["d3d11", "dxgi", "winerror"], optional = true }
 wio = { workspace = true, optional = true }
diff --git a/ports/servoshell/Cargo.toml b/ports/servoshell/Cargo.toml
index 46c86bd4590..b47516d2919 100644
--- a/ports/servoshell/Cargo.toml
+++ b/ports/servoshell/Cargo.toml
@@ -18,8 +18,8 @@ name = "servo"
 path = "main.rs"
 bench = false
 
-# Some of these dependencies are only needed for a specific target os, but
-# since build-scripts can't detect the cargo target os at build-time, we
+# Some of these dependencies are only needed for a specific target OS, but
+# since build-scripts can't detect the Cargo target OS at build-time, we
 # must unconditionally add these dependencies. See https://github.com/rust-lang/cargo/issues/4932
 [build-dependencies]
 # macOS only
@@ -35,9 +35,9 @@ OriginalFilename = "servo.exe"
 ProductName = "Servo"
 
 [features]
+default = ["max_log_level", "webgpu", "webxr"]
 crown = ["libservo/crown"]
 debugmozjs = ["libservo/debugmozjs"]
-default = ["max_log_level", "webgpu", "webxr"]
 jitspew = ["libservo/jitspew"]
 js_backtrace = ["libservo/js_backtrace"]
 max_log_level = ["log/release_max_level_info"]
@@ -48,11 +48,11 @@ refcell_backtrace = ["libservo/refcell_backtrace"]
 tracing = ["dep:tracing", "dep:tracing-subscriber", "libservo/tracing"]
 tracing-hitrace = ["tracing", "dep:hitrace"]
 tracing-perfetto = ["tracing", "dep:tracing-perfetto"]
+vello = ["libservo/vello"]
+vello_cpu = ["libservo/vello_cpu"]
 webgl_backtrace = ["libservo/webgl_backtrace"]
 webgpu = ["libservo/webgpu"]
 webxr = ["libservo/webxr"]
-vello = ["libservo/vello"]
-vello_cpu = ["libservo/vello_cpu"]
 
 [dependencies]
 bpaf = { version = "0.9.20", features = ["derive"] }
@@ -94,10 +94,10 @@ hilog = "0.2.2"
 ipc-channel = { workspace = true, features = ["force-inprocess"] }
 napi-derive-ohos = "1.1.0"
 napi-ohos = "1.1.0"
+ohos-abilitykit-sys = { version = "0.1.2", features = ["api-14"] }
+ohos-deviceinfo = "0.1.0"
 ohos-ime = "0.4.0"
 ohos-ime-sys = "0.2.2"
-ohos-deviceinfo = "0.1.0"
-ohos-abilitykit-sys = { version = "0.1.2", features = ["api-14"] }
 ohos-vsync = "0.1.3"
 ohos-window-manager-sys = { version = "0.1", features = ["api-14"] }
 xcomponent-sys = { version = "0.3.4", features = ["api-14", "keyboard-types"] }