diff --git a/Cargo.toml b/Cargo.toml index c5dd2c2ceb2..d4c2ed65720 100644 --- a/Cargo.toml +++ b/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" } diff --git a/components/background_hang_monitor/Cargo.toml b/components/background_hang_monitor/Cargo.toml index 6d25f7d1833..5faad81c3aa 100644 --- a/components/background_hang_monitor/Cargo.toml +++ b/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 } diff --git a/components/bluetooth/Cargo.toml b/components/bluetooth/Cargo.toml index 70a3d517546..99eaa791040 100644 --- a/components/bluetooth/Cargo.toml +++ b/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 } diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml index 74caad5f6d1..cb802c7ac79 100644 --- a/components/canvas/Cargo.toml +++ b/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 } diff --git a/components/constellation/Cargo.toml b/components/constellation/Cargo.toml index 84b7cbb2f35..f6a3e2cc083 100644 --- a/components/constellation/Cargo.toml +++ b/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 } diff --git a/components/devtools/Cargo.toml b/components/devtools/Cargo.toml index 405048a900d..1c581449d26 100644 --- a/components/devtools/Cargo.toml +++ b/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 } diff --git a/components/fonts/Cargo.toml b/components/fonts/Cargo.toml index ef07496a039..fd80aba158f 100644 --- a/components/fonts/Cargo.toml +++ b/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 } diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml index 375ee192145..bfe8fb5ebc9 100644 --- a/components/layout/Cargo.toml +++ b/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 } diff --git a/components/metrics/Cargo.toml b/components/metrics/Cargo.toml index 87163ceb050..bf20ea545d1 100644 --- a/components/metrics/Cargo.toml +++ b/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 } diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml index 0f65d3d55f0..839571f7456 100644 --- a/components/net/Cargo.toml +++ b/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 } diff --git a/components/paint/Cargo.toml b/components/paint/Cargo.toml index ac207953030..bcab14e753a 100644 --- a/components/paint/Cargo.toml +++ b/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 } diff --git a/components/pixels/Cargo.toml b/components/pixels/Cargo.toml index a99056067a8..020d0900466 100644 --- a/components/pixels/Cargo.toml +++ b/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] diff --git a/components/profile/Cargo.toml b/components/profile/Cargo.toml index 638bf880d1e..7f8d3847524 100644 --- a/components/profile/Cargo.toml +++ b/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 } diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index b18639a7cbf..26037394427 100644 --- a/components/script/Cargo.toml +++ b/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 } diff --git a/components/script_bindings/Cargo.toml b/components/script_bindings/Cargo.toml index dc5eb0228ca..4fd46b6dd74 100644 --- a/components/script_bindings/Cargo.toml +++ b/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 } diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml index aa9679168d3..dd5dd8cc289 100644 --- a/components/servo/Cargo.toml +++ b/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 } diff --git a/components/shared/background_hang_monitor/Cargo.toml b/components/shared/background_hang_monitor/Cargo.toml index 1a07a8e9dbe..f5c7cf197ce 100644 --- a/components/shared/background_hang_monitor/Cargo.toml +++ b/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 } diff --git a/components/shared/bluetooth/Cargo.toml b/components/shared/bluetooth/Cargo.toml index 9c5d265ee4e..ae5dea2053e 100644 --- a/components/shared/bluetooth/Cargo.toml +++ b/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 } diff --git a/components/shared/canvas/Cargo.toml b/components/shared/canvas/Cargo.toml index 4a092229812..573e583dfac 100644 --- a/components/shared/canvas/Cargo.toml +++ b/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 } diff --git a/components/shared/constellation/Cargo.toml b/components/shared/constellation/Cargo.toml index 19238ab2c58..62d15c2ceb9 100644 --- a/components/shared/constellation/Cargo.toml +++ b/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 } diff --git a/components/shared/devtools/Cargo.toml b/components/shared/devtools/Cargo.toml index 8f7e1ad4eda..6f4a4e8c950 100644 --- a/components/shared/devtools/Cargo.toml +++ b/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"] } diff --git a/components/shared/embedder/Cargo.toml b/components/shared/embedder/Cargo.toml index 35e94d45385..ed0ab295ae4 100644 --- a/components/shared/embedder/Cargo.toml +++ b/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 } diff --git a/components/shared/fonts/Cargo.toml b/components/shared/fonts/Cargo.toml index 5a9a868e66f..588df1560e3 100644 --- a/components/shared/fonts/Cargo.toml +++ b/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 } diff --git a/components/shared/layout/Cargo.toml b/components/shared/layout/Cargo.toml index 3f221a7a656..6c1343fe9e3 100644 --- a/components/shared/layout/Cargo.toml +++ b/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 } diff --git a/components/shared/net/Cargo.toml b/components/shared/net/Cargo.toml index eca4f035e6d..e6f0fc20205 100644 --- a/components/shared/net/Cargo.toml +++ b/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 } diff --git a/components/shared/paint/Cargo.toml b/components/shared/paint/Cargo.toml index 63b7d916a60..07bfc241fab 100644 --- a/components/shared/paint/Cargo.toml +++ b/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"] } diff --git a/components/shared/profile/Cargo.toml b/components/shared/profile/Cargo.toml index 987bef3b388..87d8ea3480b 100644 --- a/components/shared/profile/Cargo.toml +++ b/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 } diff --git a/components/shared/script/Cargo.toml b/components/shared/script/Cargo.toml index 795ef61be33..3634a2f88c1 100644 --- a/components/shared/script/Cargo.toml +++ b/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 } diff --git a/components/shared/storage/Cargo.toml b/components/shared/storage/Cargo.toml index 516e5ae77c5..ecbaa23bda5 100644 --- a/components/shared/storage/Cargo.toml +++ b/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"] } diff --git a/components/shared/webgpu/Cargo.toml b/components/shared/webgpu/Cargo.toml index 0972604d3af..f0a3d41ac9f 100644 --- a/components/shared/webgpu/Cargo.toml +++ b/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 } diff --git a/components/shared/webxr/Cargo.toml b/components/shared/webxr/Cargo.toml index 9c03d3eab97..2a5ae0ff5db 100644 --- a/components/shared/webxr/Cargo.toml +++ b/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 } diff --git a/components/storage/Cargo.toml b/components/storage/Cargo.toml index efb31296d49..8aedfdd7a24 100644 --- a/components/storage/Cargo.toml +++ b/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 } diff --git a/components/webdriver_server/Cargo.toml b/components/webdriver_server/Cargo.toml index b42a050fed9..29533c5de2b 100644 --- a/components/webdriver_server/Cargo.toml +++ b/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 } diff --git a/components/webgl/Cargo.toml b/components/webgl/Cargo.toml index 67aa4367f7a..0ba7873bd3a 100644 --- a/components/webgl/Cargo.toml +++ b/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 } diff --git a/components/webgpu/Cargo.toml b/components/webgpu/Cargo.toml index f0a37604d4d..e12b5ce4fd6 100644 --- a/components/webgpu/Cargo.toml +++ b/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 } diff --git a/components/webxr/Cargo.toml b/components/webxr/Cargo.toml index dbe06684a47..24ad9fa0703 100644 --- a/components/webxr/Cargo.toml +++ b/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 } diff --git a/ports/servoshell/Cargo.toml b/ports/servoshell/Cargo.toml index e78701796fd..69eee837ae5 100644 --- a/ports/servoshell/Cargo.toml +++ b/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"] } diff --git a/tests/unit/script/Cargo.toml b/tests/unit/script/Cargo.toml index 650b08ad8cf..ecce36aeab6 100644 --- a/tests/unit/script/Cargo.toml +++ b/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 }