cargo: Rename Workspace-local dependencies starting with b to servo-* (#43526)

Also reorders alphabetically for the corresponding user .toml.

Signed-off-by: Euclid Ye <yezhizhenjiakang@gmail.com>

Cargo.toml

@@ -229,11 +229,6 @@ xml5ever = "0.39"
 # be listed here, between the `Begin` and `End` comments, so that we can easily find and
 # update the version requirements when bumping the workspace version.
 # Begin workspace-version dependencies - Don't change this comment, we grep for it in scripts!
-background_hang_monitor = { package = "servo-background-hang-monitor", version = "0.0.6", path = "components/background_hang_monitor" }
-background_hang_monitor_api = { package = "servo-background-hang-monitor-api", version = "0.0.6", path = "components/shared/background_hang_monitor" }
-base = { package = "servo-base", version = "0.0.6", path = "components/shared/base" }
-bluetooth = { package = "servo-bluetooth", version = "0.0.6", path = "components/bluetooth" }
-bluetooth_traits = { package = "servo-bluetooth-traits", version = "0.0.6", path = "components/shared/bluetooth" }
 canvas = { package = "servo-canvas", version = "0.0.6", path = "components/canvas" }
 canvas_traits = { package = "servo-canvas-traits", version = "0.0.6", path = "components/shared/canvas" }
 constellation = { package = "servo-constellation", version = "0.0.6", path = "components/constellation" }
@@ -262,6 +257,15 @@ script = { package = "servo-script", version = "0.0.6", path = "components/scrip
 script_bindings = { package = "servo-script-bindings", version = "0.0.6", path = "components/script_bindings" }
 script_traits = { package = "servo-script-traits", version = "0.0.6", path = "components/shared/script" }
 servo = { version = "0.0.6", path = "components/servo", default-features = false }
+servo-allocator = { version = "0.0.6", path = "components/allocator" }
+servo-background-hang-monitor = { version = "0.0.6", path = "components/background_hang_monitor" }
+servo-background-hang-monitor-api = { version = "0.0.6", path = "components/shared/background_hang_monitor" }
+servo-base = { version = "0.0.6", path = "components/shared/base" }
+servo-bluetooth = { version = "0.0.6", path = "components/bluetooth" }
+servo-bluetooth-traits = { version = "0.0.6", path = "components/shared/bluetooth" }
+servo-config = { version = "0.0.6", path = "components/config" }
+servo-config-macro = { version = "0.0.6", path = "components/config/macro" }
+servo-geometry = { version = "0.0.6", path = "components/geometry" }
 servo-media = { version = "0.0.6", path = "components/media/servo-media" }
 servo-media-audio = { version = "0.0.6", path = "components/media/audio" }
 servo-media-auto = { version = "0.0.6", path = "components/media/backends/auto" }
@@ -277,10 +281,6 @@ servo-media-traits = { version = "0.0.6", path = "components/media/traits" }
 servo-media-webrtc = { version = "0.0.6", path = "components/media/webrtc" }
 servo-tracing = { version = "0.0.6", path = "components/servo_tracing" }
 servo-url = { version = "0.0.6", path = "components/url" }
-servo-allocator = { version = "0.0.6", path = "components/allocator" }
-servo-config = { version = "0.0.6", path = "components/config" }
-servo-config-macro = { version = "0.0.6", path = "components/config/macro" }
-servo-geometry = { version = "0.0.6", path = "components/geometry" }
 storage = { package = "servo-storage", version = "0.0.6", path = "components/storage" }
 storage_traits = { package = "servo-storage-traits", version = "0.0.6", path = "components/shared/storage" }
 timers = { package = "servo-timers", version = "0.0.6", path = "components/timers" }

components/background_hang_monitor/Cargo.toml

@@ -16,15 +16,15 @@ test = false
 doctest = false
 
 [dependencies]
-background_hang_monitor_api = { workspace = true }
 backtrace = { workspace = true }
-base = { workspace = true }
 crossbeam-channel = { workspace = true }
 libc = { workspace = true }
 log = { workspace = true }
 rustc-demangle = { version = "0.1", optional = true }
 rustc-hash = { workspace = true }
 serde_json = { workspace = true }
+servo-background-hang-monitor-api = { workspace = true }
+servo-base = { workspace = true }
 
 [target.'cfg(target_os = "macos")'.dependencies]
 mach2 = { workspace = true, optional = true }

components/bluetooth/Cargo.toml

@@ -14,13 +14,13 @@ name = "bluetooth"
 path = "lib.rs"
 
 [dependencies]
-base = { workspace = true }
 bitflags = { workspace = true }
-bluetooth_traits = { workspace = true }
 blurmock = { version = "0.1.2", optional = true }
 embedder_traits = { workspace = true }
 log = { workspace = true }
 rand = { workspace = true }
+servo-base = { workspace = true }
+servo-bluetooth-traits = { workspace = true }
 servo-config = { workspace = true }
 uuid = { workspace = true }
 

components/canvas/Cargo.toml

@@ -18,7 +18,6 @@ tracing = ["dep:tracing"]
 vello = ["dep:vello", "dep:pollster", "dep:futures-intrusive"]
 
 [dependencies]
-base = { workspace = true }
 bytemuck = { workspace = true, features = ["extern_crate_alloc"] }
 canvas_traits = { workspace = true }
 crossbeam-channel = { workspace = true }
@@ -30,11 +29,12 @@ log = { workspace = true }
 paint_api = { workspace = true }
 peniko = { workspace = true }
 pixels = { workspace = true }
-profile_traits = { workspace = true }
 pollster = { version = "0.4", optional = true }
+profile_traits = { workspace = true }
 rustc-hash = { workspace = true }
-servo-tracing = { workspace = true }
+servo-base = { workspace = true }
 servo-config = { workspace = true }
+servo-tracing = { workspace = true }
 stylo = { workspace = true }
 tracing = { workspace = true, optional = true }
 vello = { workspace = true, optional = true }

components/constellation/Cargo.toml

@@ -15,7 +15,7 @@ path = "lib.rs"
 
 [features]
 default = []
-bluetooth = ["bluetooth_traits"]
+bluetooth = ["servo-bluetooth-traits"]
 gamepad = ["embedder_traits/gamepad"]
 tracing = ["dep:tracing", "canvas/tracing"]
 vello = ["canvas/vello"]
@@ -26,11 +26,7 @@ unwrap_used = "deny"
 panic = "deny"
 
 [dependencies]
-background_hang_monitor = { workspace = true }
-background_hang_monitor_api = { workspace = true }
 backtrace = { workspace = true }
-base = { workspace = true }
-bluetooth_traits = { workspace = true, optional = true }
 canvas = { workspace = true }
 canvas_traits = { workspace = true }
 constellation_traits = { workspace = true }
@@ -54,8 +50,12 @@ rand = { workspace = true }
 rustc-hash = { workspace = true }
 script_traits = { workspace = true }
 serde = { workspace = true }
-servo-tracing = { workspace = true }
+servo-background-hang-monitor = { workspace = true }
+servo-background-hang-monitor-api = { workspace = true }
+servo-base = { workspace = true }
+servo-bluetooth-traits = { workspace = true, optional = true }
 servo-config = { workspace = true }
+servo-tracing = { workspace = true }
 servo-url = { workspace = true }
 storage_traits = { workspace = true }
 stylo = { workspace = true }

components/devtools/Cargo.toml

@@ -15,7 +15,6 @@ path = "lib.rs"
 
 [dependencies]
 atomic_refcell = { workspace = true }
-base = { workspace = true }
 base64 = { workspace = true }
 chrono = { workspace = true }
 crossbeam-channel = { workspace = true }
@@ -33,6 +32,7 @@ rand = { workspace = true }
 rustc-hash = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
+servo-base = { workspace = true }
 servo-config = { workspace = true }
 servo-url = { workspace = true }
 uuid = { workspace = true }

components/fonts/Cargo.toml

@@ -20,7 +20,6 @@ tracing = ["dep:tracing"]
 
 [dependencies]
 app_units = { workspace = true }
-base = { workspace = true }
 bitflags = { workspace = true }
 content-security-policy = { workspace = true }
 euclid = { workspace = true }
@@ -41,14 +40,15 @@ paint_api = { workspace = true }
 parking_lot = { workspace = true }
 profile_traits = { workspace = true }
 read-fonts = { workspace = true }
+rustc-hash = { workspace = true }
 serde = { workspace = true }
-servo-tracing = { workspace = true }
 servo_arc = { workspace = true }
+servo-base = { workspace = true }
 servo-config = { workspace = true }
+servo-tracing = { workspace = true }
 servo-url = { workspace = true }
 skrifa = { workspace = true }
 smallvec = { workspace = true }
-rustc-hash = { workspace = true }
 stylo = { workspace = true }
 stylo_atoms = { workspace = true }
 tracing = { workspace = true, optional = true }

components/layout/Cargo.toml

@@ -21,7 +21,6 @@ tracing = ["dep:tracing"]
 [dependencies]
 app_units = { workspace = true }
 atomic_refcell = { workspace = true }
-base = { workspace = true }
 bitflags = { workspace = true }
 data-url = { workspace = true }
 embedder_traits = { workspace = true }
@@ -47,10 +46,11 @@ rustc-hash = { workspace = true }
 script = { workspace = true }
 script_traits = { workspace = true }
 selectors = { workspace = true }
-servo-tracing = { workspace = true }
 servo_arc = { workspace = true }
+servo-base = { workspace = true }
 servo-config = { workspace = true }
 servo-geometry = { workspace = true }
+servo-tracing = { workspace = true }
 servo-url = { workspace = true }
 smallvec = { workspace = true }
 strum = { workspace = true }
@@ -60,8 +60,8 @@ stylo_traits = { workspace = true }
 taffy = { workspace = true }
 tracing = { workspace = true, optional = true }
 unicode-bidi = { workspace = true }
-unicode_categories = { workspace = true }
 unicode-script = { workspace = true }
+unicode_categories = { workspace = true }
 url = { workspace = true }
 webrender_api = { workspace = true }
 xi-unicode = { workspace = true }

components/metrics/Cargo.toml

@@ -14,11 +14,11 @@ name = "metrics"
 path = "lib.rs"
 
 [dependencies]
-base = { workspace = true }
 malloc_size_of = { workspace = true }
 malloc_size_of_derive = { workspace = true }
 paint_api = { workspace = true }
 profile_traits = { workspace = true }
 script_traits = { workspace = true }
+servo-base = { workspace = true }
 servo-config = { workspace = true }
 servo-url = { workspace = true }

components/net/Cargo.toml

@@ -23,7 +23,6 @@ test-util = ["hyper-util/server-graceful"]
 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 }
 base64 = { workspace = true }
 bytes = "1"
 chrono = { workspace = true }
@@ -68,6 +67,7 @@ rustls-pki-types = { workspace = true }
 rustls-platform-verifier = { workspace = true }
 serde = { workspace = true }
 servo_arc = { workspace = true }
+servo-base = { workspace = true }
 servo-config = { workspace = true }
 servo-url = { workspace = true }
 sha2 = { workspace = true }

components/paint/Cargo.toml

@@ -24,7 +24,6 @@ unwrap_used = "deny"
 panic = "deny"
 
 [dependencies]
-base = { workspace = true }
 bitflags = { workspace = true }
 canvas_traits = { workspace = true }
 constellation_traits = { workspace = true }
@@ -36,16 +35,17 @@ gleam = { workspace = true }
 image = { workspace = true }
 ipc-channel = { workspace = true }
 log = { workspace = true }
-media = { workspace = true }
 malloc_size_of = { workspace = true }
+media = { workspace = true }
 paint_api = { workspace = true }
 profile_traits = { workspace = true }
 rayon = { workspace = true }
 rustc-hash = { workspace = true }
-servo-tracing = { workspace = true }
 servo-allocator = { workspace = true }
+servo-base = { workspace = true }
 servo-config = { workspace = true }
 servo-geometry = { workspace = true }
+servo-tracing = { workspace = true }
 smallvec = { workspace = true }
 stylo_traits = { workspace = true }
 surfman = { workspace = true }

components/pixels/Cargo.toml

@@ -14,13 +14,13 @@ name = "pixels"
 path = "lib.rs"
 
 [dependencies]
-base = { workspace = true }
 euclid = { workspace = true }
 image = { workspace = true }
 log = { workspace = true }
 malloc_size_of = { workspace = true }
 malloc_size_of_derive = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
+servo-base = { workspace = true }
 webrender_api = { workspace = true }
 
 [dev-dependencies]

components/profile/Cargo.toml

@@ -14,12 +14,12 @@ name = "profile"
 path = "lib.rs"
 
 [dependencies]
-base = { workspace = true }
 log = { workspace = true }
 profile_traits = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 servo-allocator = { workspace = true }
+servo-base = { workspace = true }
 servo-config = { workspace = true }
 time = { workspace = true }
 

components/script/Cargo.toml

@@ -15,7 +15,7 @@ name = "script"
 path = "lib.rs"
 
 [features]
-bluetooth = ['bluetooth_traits', 'script_bindings/bluetooth']
+bluetooth = ['servo-bluetooth-traits', 'script_bindings/bluetooth']
 crown = ['js/crown']
 debugmozjs = ['js/debugmozjs']
 gamepad = ["script_bindings/gamepad", "embedder_traits/gamepad"]
@@ -43,13 +43,10 @@ argon2 = { workspace = true }
 arrayvec = { workspace = true }
 atomic_refcell = { workspace = true }
 aws-lc-rs = { workspace = true }
-background_hang_monitor_api = { workspace = true }
 backtrace = { workspace = true }
-base = { workspace = true }
 base64 = { workspace = true }
 base64ct = { workspace = true }
 bitflags = { workspace = true }
-bluetooth_traits = { workspace = true, optional = true }
 brotli = { workspace = true }
 canvas_traits = { workspace = true }
 cbc = { workspace = true }
@@ -108,10 +105,10 @@ num-bigint-dig = { workspace = true }
 num-traits = { workspace = true }
 num_cpus = { workspace = true }
 ocb3 = { workspace = true }
-paint_api = { workspace = true }
 p256 = { workspace = true }
 p384 = { workspace = true }
 p521 = { workspace = true }
+paint_api = { workspace = true }
 parking_lot = { workspace = true }
 percent-encoding = { workspace = true }
 phf = "0.13"
@@ -129,11 +126,14 @@ sec1 = { workspace = true }
 selectors = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true, features = ["preserve_order"] }
-servo-media = { workspace = true }
-servo_arc = { workspace = true }
+servo-background-hang-monitor-api = { workspace = true }
+servo-base = { workspace = true }
+servo-bluetooth-traits = { workspace = true, optional = true }
 servo-config = { workspace = true }
 servo-geometry = { workspace = true }
+servo-media = { workspace = true }
 servo-url = { workspace = true }
+servo_arc = { workspace = true }
 sha1 = { workspace = true }
 sha2 = { workspace = true }
 sha3 = { workspace = true }

components/script_bindings/Cargo.toml

@@ -20,7 +20,6 @@ name = "script_bindings"
 path = "lib.rs"
 
 [dependencies]
-base = { workspace = true }
 bitflags = { workspace = true }
 crossbeam-channel = { workspace = true }
 deny_public_fields = { workspace = true }
@@ -40,9 +39,10 @@ parking_lot = { workspace = true }
 phf = "0.13"
 profile_traits = { workspace = true }
 regex = { workspace = true }
-servo_arc = { workspace = true }
+servo-base = { workspace = true }
 servo-config = { workspace = true }
 servo-url = { workspace = true }
+servo_arc = { workspace = true }
 smallvec = { workspace = true }
 stylo = { workspace = true }
 stylo_atoms = { workspace = true }

components/servo/Cargo.toml

@@ -18,10 +18,10 @@ crate-type = ["rlib"]
 # Note: Servoshell does not use the default features of servo, so you also
 # need to add features that should be default to ports/servoshell/Cargo.toml
 default = ["clipboard", "js_jit"]
-background_hang_monitor = ["background_hang_monitor/sampler"]
+background_hang_monitor = ["servo-background-hang-monitor/sampler"]
 bluetooth = [
-    "bluetooth_traits",
-    "dep:bluetooth",
+    "servo-bluetooth-traits",
+    "dep:servo-bluetooth",
     "constellation/bluetooth",
     "constellation_traits/bluetooth",
     "script/bluetooth",
@@ -40,7 +40,7 @@ jitspew = ["script/jitspew"]
 js_backtrace = ["script/js_backtrace"]
 js_jit = ["script/js_jit"]
 media-gstreamer = ["servo-media-gstreamer", "gstreamer"]
-native-bluetooth = ["bluetooth/native-bluetooth"]
+native-bluetooth = ["servo-bluetooth/native-bluetooth"]
 no-wgl = ["mozangle/egl", "mozangle/build_dlls", "surfman/sm-angle-default", "paint_api/no-wgl"]
 profilemozjs = ["script/profilemozjs"]
 refcell_backtrace = ["script/refcell_backtrace"]
@@ -76,11 +76,7 @@ webxr = [
 
 [dependencies]
 accesskit = { workspace = true }
-background_hang_monitor = { workspace = true }
-base = { workspace = true }
 bitflags = { workspace = true }
-bluetooth = { workspace = true, optional = true }
-bluetooth_traits = { workspace = true, optional = true }
 canvas_traits = { workspace = true }
 constellation = { workspace = true }
 constellation_traits = { workspace = true }
@@ -112,12 +108,16 @@ rustc-hash = { workspace = true }
 script = { workspace = true }
 script_traits = { workspace = true }
 serde = { workspace = true }
+servo-background-hang-monitor = { workspace = true }
+servo-base = { workspace = true }
+servo-bluetooth = { workspace = true, optional = true }
+servo-bluetooth-traits = { workspace = true, optional = true }
+servo-config = { workspace = true }
+servo-geometry = { workspace = true }
 servo-media = { workspace = true }
 servo-media-dummy = { workspace = true }
 servo-media-gstreamer = { workspace = true, optional = true }
 servo-tracing = { workspace = true }
-servo-config = { workspace = true }
-servo-geometry = { workspace = true }
 servo-url = { workspace = true }
 storage = { workspace = true }
 storage_traits = { workspace = true }
@@ -151,11 +151,11 @@ accesskit_consumer = "0.35.0"
 http = { workspace = true }
 http-body-util = { workspace = true }
 hyper = { workspace = true }
+net = { workspace = true, features = ["test-util"] }
+rustls = { version = "0.23", default-features = false }
 # This must always be a path dependency, we don't want to add a dependency on a
 # crates.io version of ourselves - we want to enable a feature of ourselves.
 servo = { path = ".", features = ["tracing"] }
-net = { workspace = true, features = ["test-util"] }
-rustls = { version = "0.23", default-features = false }
 tracing = { workspace = true }
 winit = { workspace = true }
 

components/shared/background_hang_monitor/Cargo.toml

@@ -16,5 +16,5 @@ test = false
 doctest = false
 
 [dependencies]
-base = { workspace = true }
 serde = { workspace = true }
+servo-base = { workspace = true }

components/shared/bluetooth/Cargo.toml

@@ -14,7 +14,7 @@ name = "bluetooth_traits"
 path = "lib.rs"
 
 [dependencies]
-base = { workspace = true }
 embedder_traits = { workspace = true }
 regex = { workspace = true }
 serde = { workspace = true }
+servo-base = { workspace = true }

components/shared/canvas/Cargo.toml

@@ -17,7 +17,6 @@ path = "lib.rs"
 webgl_backtrace = []
 
 [dependencies]
-base = { workspace = true }
 crossbeam-channel = { workspace = true }
 euclid = { workspace = true }
 fonts_traits = { workspace = true }
@@ -27,6 +26,7 @@ malloc_size_of = { workspace = true }
 malloc_size_of_derive = { workspace = true }
 pixels = { workspace = true }
 serde = { workspace = true }
+servo-base = { workspace = true }
 strum = { workspace = true }
 stylo = { workspace = true }
 webrender_api = { workspace = true }

components/shared/constellation/Cargo.toml

@@ -18,7 +18,6 @@ bluetooth = []
 webgpu = ["wgpu-core"]
 
 [dependencies]
-base = { workspace = true }
 canvas_traits = { workspace = true }
 content-security-policy = { workspace = true }
 devtools_traits = { workspace = true }
@@ -38,6 +37,7 @@ pixels = { workspace = true }
 profile_traits = { workspace = true }
 rustc-hash = { workspace = true }
 serde = { workspace = true }
+servo-base = { workspace = true }
 servo-config = { workspace = true }
 servo-url = { workspace = true }
 storage_traits = { workspace = true }

components/shared/devtools/Cargo.toml

@@ -14,7 +14,6 @@ name = "devtools_traits"
 path = "lib.rs"
 
 [dependencies]
-base = { workspace = true }
 embedder_traits = { workspace = true }
 http = { workspace = true }
 malloc_size_of = { workspace = true }
@@ -22,5 +21,6 @@ malloc_size_of_derive = { workspace = true }
 net_traits = { workspace = true }
 profile_traits = { workspace = true }
 serde = { workspace = true }
+servo-base = { workspace = true }
 servo-url = { workspace = true }
 uuid = { workspace = true, features = ["serde"] }

components/shared/embedder/Cargo.toml

@@ -21,7 +21,6 @@ gamepad = []
 
 [dependencies]
 accesskit = { workspace = true }
-base = { workspace = true }
 bitflags = { workspace = true }
 cookie = { workspace = true }
 crossbeam-channel = { workspace = true }
@@ -36,6 +35,7 @@ malloc_size_of_derive = { workspace = true }
 pixels = { workspace = true }
 rustc-hash = { workspace = true }
 serde = { workspace = true }
+servo-base = { workspace = true }
 servo-geometry = { workspace = true }
 servo-url = { workspace = true }
 strum = { workspace = true }

components/shared/fonts/Cargo.toml

@@ -15,7 +15,6 @@ path = "lib.rs"
 
 [dependencies]
 atomic_refcell = { workspace = true }
-base = { workspace = true }
 log = { workspace = true }
 malloc_size_of = { workspace = true }
 malloc_size_of_derive = { workspace = true }
@@ -26,10 +25,11 @@ parking_lot = { workspace = true }
 profile_traits = { workspace = true }
 read-fonts = { workspace = true }
 serde = { workspace = true }
+servo-base = { workspace = true }
 servo-url = { workspace = true }
 stylo = { workspace = true }
-webrender_api = { workspace = true }
 uuid = { workspace = true }
+webrender_api = { workspace = true }
 
 [target.'cfg(target_os = "windows")'.dependencies]
 dwrote = { workspace = true }

components/shared/layout/Cargo.toml

@@ -16,8 +16,6 @@ path = "lib.rs"
 [dependencies]
 app_units = { workspace = true }
 atomic_refcell = { workspace = true }
-background_hang_monitor_api = { workspace = true }
-base = { workspace = true }
 bitflags = { workspace = true }
 embedder_traits = { workspace = true }
 euclid = { workspace = true }
@@ -35,8 +33,10 @@ rustc-hash = { workspace = true }
 script_traits = { workspace = true }
 selectors = { workspace = true }
 serde = { workspace = true }
-servo_arc = { workspace = true }
+servo-background-hang-monitor-api = { workspace = true }
+servo-base = { workspace = true }
 servo-url = { workspace = true }
+servo_arc = { workspace = true }
 stylo = { workspace = true }
 stylo_traits = { workspace = true }
 webrender_api = { workspace = true }

components/shared/net/Cargo.toml

@@ -16,7 +16,6 @@ test = false
 doctest = false
 
 [dependencies]
-base = { workspace = true }
 content-security-policy = { workspace = true }
 cookie = { workspace = true }
 crossbeam-channel = { workspace = true }
@@ -41,9 +40,10 @@ rand = { workspace = true }
 rustc-hash = { workspace = true }
 rustls-pki-types = { workspace = true }
 serde = { workspace = true }
-servo_arc = { workspace = true }
+servo-base = { workspace = true }
 servo-config = { workspace = true }
 servo-url = { workspace = true }
+servo_arc = { workspace = true }
 sys-locale = "0.3"
 tokio = { workspace = true }
 url = { workspace = true }

components/shared/paint/Cargo.toml

@@ -18,7 +18,6 @@ no-wgl = ["surfman/sm-angle-default"]
 tracing = ["dep:tracing"]
 
 [dependencies]
-base = { workspace = true }
 bitflags = { workspace = true }
 crossbeam-channel = { workspace = true }
 dpi = { workspace = true }
@@ -37,11 +36,12 @@ raw-window-handle = { workspace = true }
 rustc-hash = { workspace = true }
 serde = { workspace = true }
 serde_bytes = { workspace = true }
+servo-base = { workspace = true }
 servo-geometry = { workspace = true }
+servo-tracing = { workspace = true }
 servo-url = { workspace = true }
 smallvec = { workspace = true }
 strum = { workspace = true }
-servo-tracing = { workspace = true }
 stylo = { workspace = true }
 stylo_traits = { workspace = true }
 surfman = { workspace = true, features = ["sm-x11"] }

components/shared/profile/Cargo.toml

@@ -17,7 +17,6 @@ path = "lib.rs"
 tracing = ["dep:tracing"]
 
 [dependencies]
-base = { workspace = true }
 crossbeam-channel = { workspace = true }
 ipc-channel = { workspace = true }
 log = { workspace = true }
@@ -25,5 +24,6 @@ malloc_size_of = { workspace = true }
 malloc_size_of_derive = { workspace = true }
 serde = { workspace = true }
 servo-allocator = { workspace = true }
+servo-base = { workspace = true }
 time = { workspace = true }
 tracing = { workspace = true, optional = true }

components/shared/script/Cargo.toml

@@ -14,13 +14,11 @@ name = "script_traits"
 path = "lib.rs"
 
 [features]
-bluetooth = ["bluetooth_traits"]
+bluetooth = ["servo-bluetooth-traits"]
 webgpu = ["webgpu_traits"]
 
 [dependencies]
 accesskit = { workspace = true }
-base = { workspace = true }
-bluetooth_traits = { workspace = true, optional = true }
 canvas_traits = { workspace = true }
 constellation_traits = { workspace = true }
 crossbeam-channel = { workspace = true }
@@ -38,6 +36,8 @@ pixels = { workspace = true }
 profile_traits = { workspace = true }
 rustc-hash = { workspace = true }
 serde = { workspace = true }
+servo-base = { workspace = true }
+servo-bluetooth-traits = { workspace = true, optional = true }
 servo-config = { workspace = true }
 servo-url = { workspace = true }
 storage_traits = { workspace = true }

components/shared/storage/Cargo.toml

@@ -14,10 +14,10 @@ name = "storage_traits"
 path = "lib.rs"
 
 [dependencies]
-base = { workspace = true }
 malloc_size_of = { workspace = true }
 malloc_size_of_derive = { workspace = true }
 profile_traits = { workspace = true }
 serde = { workspace = true }
+servo-base = { workspace = true }
 servo-url = { workspace = true }
 uuid = { workspace = true, features = ["serde"] }

components/shared/webgpu/Cargo.toml

@@ -15,11 +15,11 @@ path = "lib.rs"
 
 [dependencies]
 arrayvec = { workspace = true }
-base = { workspace = true }
 malloc_size_of = { workspace = true }
 malloc_size_of_derive = { workspace = true }
 pixels = { workspace = true }
 serde = { workspace = true }
+servo-base = { workspace = true }
 webrender_api = { workspace = true }
 wgpu-core = { workspace = true, features = ["serde", "wgsl"] }
 wgpu-types = { workspace = true }

components/shared/webxr/Cargo.toml

@@ -17,12 +17,12 @@ but adapted to Rust design patterns.'''
 path = "lib.rs"
 
 [dependencies]
-base = { workspace = true }
 embedder_traits = { workspace = true }
-ipc-channel = { workspace = true }
-profile_traits = { workspace = true }
 euclid = { workspace = true }
-serde = { workspace = true }
+ipc-channel = { workspace = true }
 log = { workspace = true }
 malloc_size_of = { workspace = true }
 malloc_size_of_derive = { workspace = true }
+profile_traits = { workspace = true }
+serde = { workspace = true }
+servo-base = { workspace = true }

components/storage/Cargo.toml

@@ -15,12 +15,11 @@ name = "storage"
 path = "lib.rs"
 
 [dependencies]
-base = { workspace = true }
+libc = { workspace = true }
+log = { workspace = true }
 malloc_size_of = { workspace = true }
 malloc_size_of_derive = { workspace = true }
 net_traits = { workspace = true }
-libc = { workspace = true }
-log = { workspace = true }
 postcard = { workspace = true }
 profile_traits = { workspace = true }
 rusqlite = { version = "0.37", features = ["bundled"] }
@@ -28,6 +27,7 @@ rustc-hash = { workspace = true }
 sea-query = { workspace = true }
 sea-query-rusqlite = { workspace = true }
 serde = { workspace = true }
+servo-base = { workspace = true }
 servo-config = { workspace = true }
 servo-url = { workspace = true }
 storage_traits = { workspace = true }

components/webdriver_server/Cargo.toml

@@ -14,7 +14,6 @@ name = "webdriver_server"
 path = "lib.rs"
 
 [dependencies]
-base = { workspace = true }
 base64 = { workspace = true }
 cookie = { workspace = true }
 crossbeam-channel = { workspace = true }
@@ -27,6 +26,7 @@ log = { workspace = true }
 rustc-hash = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
+servo-base = { workspace = true }
 servo-config = { workspace = true }
 servo-geometry = { workspace = true }
 servo-url = { workspace = true }

components/webgl/Cargo.toml

@@ -18,7 +18,6 @@ webgl_backtrace = ["canvas_traits/webgl_backtrace"]
 webxr = ["dep:webxr", "dep:webxr-api"]
 
 [dependencies]
-base = { workspace = true }
 bitflags = { workspace = true }
 byteorder = { workspace = true }
 canvas_traits = { workspace = true }
@@ -32,6 +31,7 @@ paint_api = { workspace = true }
 parking_lot = { workspace = true }
 pixels = { workspace = true }
 rustc-hash = { workspace = true }
+servo-base = { workspace = true }
 surfman = { workspace = true }
 webrender_api = { workspace = true }
 webxr = { workspace = true, optional = true }

components/webgpu/Cargo.toml

@@ -15,12 +15,12 @@ path = "lib.rs"
 
 [dependencies]
 arrayvec = { workspace = true, features = ["serde"] }
-base = { workspace = true }
 euclid = { workspace = true }
 log = { workspace = true }
 paint_api = { workspace = true }
 pixels = { workspace = true }
 rustc-hash = { workspace = true }
+servo-base = { workspace = true }
 servo-config = { workspace = true }
 webgpu_traits = { workspace = true }
 webrender_api = { workspace = true }

components/webxr/Cargo.toml

@@ -25,14 +25,14 @@ openxr-api = ["angle", "openxr", "winapi", "wio", "surfman/sm-angle-default"]
 x11 = ["surfman/sm-x11"]
 
 [dependencies]
-base = { workspace = true }
 crossbeam-channel = { workspace = true }
 euclid = { workspace = true }
 glow = { workspace = true }
-profile_traits = { workspace = true }
 log = { workspace = true }
 openxr = { workspace = true, optional = true }
+profile_traits = { workspace = true }
 raw-window-handle = { workspace = true }
+servo-base = { workspace = true }
 surfman = { workspace = true, features = ["chains", "sm-raw-window-handle-06"] }
 webxr-api = { workspace = true }
 

ports/servoshell/Cargo.toml

@@ -72,11 +72,11 @@ hitrace = { workspace = true, optional = true }
 image = { workspace = true }
 keyboard-types = { workspace = true }
 libc = { workspace = true }
-servo = { workspace = true, features = ["background_hang_monitor", "bluetooth", "testbinding"], default-features = false }
 log = { workspace = true }
 mime_guess = { workspace = true }
 raw-window-handle = { workspace = true }
 rustls = { workspace = true, features = ["aws-lc-rs"] }
+servo = { workspace = true, features = ["background_hang_monitor", "bluetooth", "testbinding"], default-features = false }
 tokio = { workspace = true }
 tracing = { workspace = true, optional = true }
 tracing-perfetto = { workspace = true, optional = true }
@@ -108,7 +108,7 @@ ohos-window-manager-sys = { version = "0.1", features = ["api-14"] }
 xcomponent-sys = { version = "0.3.5", features = ["api-14", "keyboard-types"] }
 
 [target.'cfg(any(target_os = "android", target_env = "ohos"))'.dependencies]
-base = { workspace = true }
+servo-base = { workspace = true }
 nix = { workspace = true, features = ["fs"] }
 serde_json = { workspace = true }
 surfman = { workspace = true, features = ["sm-angle-default"] }

tests/unit/script/Cargo.toml

@@ -12,9 +12,9 @@ name = "script_tests"
 path = "lib.rs"
 
 [dependencies]
-base = { workspace = true }
 encoding_rs = { workspace = true }
 euclid = { workspace = true }
 keyboard-types = { workspace = true }
 script = { workspace = true }
+servo-base = { workspace = true }
 servo-url = { workspace = true }