diff --git a/components/allocator/Cargo.toml b/components/allocator/Cargo.toml index ce66c31833b..ae38e78db82 100644 --- a/components/allocator/Cargo.toml +++ b/components/allocator/Cargo.toml @@ -14,9 +14,9 @@ path = "lib.rs" use-system-allocator = ["libc"] [target.'cfg(not(any(windows, target_env = "ohos")))'.dependencies] -tikv-jemallocator = { workspace = true } -tikv-jemalloc-sys = { workspace = true } libc = { workspace = true, optional = true } +tikv-jemalloc-sys = { workspace = true } +tikv-jemallocator = { workspace = true } [target.'cfg(windows)'.dependencies] windows-sys = { workspace = true, features = ["Win32_System_Memory"] } diff --git a/components/background_hang_monitor/Cargo.toml b/components/background_hang_monitor/Cargo.toml index 2fce92ec05d..20216ec78b7 100644 --- a/components/background_hang_monitor/Cargo.toml +++ b/components/background_hang_monitor/Cargo.toml @@ -23,12 +23,12 @@ libc = { workspace = true } log = { workspace = true } serde_json = { workspace = true } -[features] -sampler = ["unwind-sys", "mach2", "nix"] - [target.'cfg(target_os = "macos")'.dependencies] mach2 = { version = "0.4", optional = true } [target.'cfg(all(target_os = "linux", not(any(target_arch = "arm", target_arch = "aarch64", target_env = "ohos", target_env = "musl"))))'.dependencies] nix = { workspace = true, features = ["signal"], optional = true } unwind-sys = { version = "0.1.4", optional = true } + +[features] +sampler = ["unwind-sys", "mach2", "nix"] diff --git a/components/bluetooth/Cargo.toml b/components/bluetooth/Cargo.toml index 8b22ccbd137..4be0c04c6bf 100644 --- a/components/bluetooth/Cargo.toml +++ b/components/bluetooth/Cargo.toml @@ -23,11 +23,6 @@ servo_config = { path = "../config" } servo_rand = { path = "../rand" } uuid = { workspace = true } -[features] -default = ["bluetooth-test"] -native-bluetooth = ["blurz", "blurdroid", "blurmac", "bluetooth-test"] -bluetooth-test = ["blurmock"] - [target.'cfg(target_os = "linux")'.dependencies] blurz = { version = "0.3", optional = true } @@ -36,3 +31,8 @@ blurdroid = { version = "0.1.2", optional = true } [target.'cfg(target_os = "macos")'.dependencies] blurmac = { path = "../../third_party/blurmac", optional = true } + +[features] +default = ["bluetooth-test"] +native-bluetooth = ["blurz", "blurdroid", "blurmac", "bluetooth-test"] +bluetooth-test = ["blurmock"] diff --git a/components/constellation/Cargo.toml b/components/constellation/Cargo.toml index 10623c540d6..3c7ff9990c3 100644 --- a/components/constellation/Cargo.toml +++ b/components/constellation/Cargo.toml @@ -19,8 +19,8 @@ tracing = ["dep:tracing"] webgpu = ["script_traits/webgpu"] [dependencies] -background_hang_monitor_api = { workspace = true } background_hang_monitor = { path = "../background_hang_monitor" } +background_hang_monitor_api = { workspace = true } backtrace = { workspace = true } base = { workspace = true } bluetooth_traits = { workspace = true, optional = true } diff --git a/components/devtools/Cargo.toml b/components/devtools/Cargo.toml index a74cbb88b9b..bc7322d9ebc 100644 --- a/components/devtools/Cargo.toml +++ b/components/devtools/Cargo.toml @@ -11,9 +11,6 @@ rust-version.workspace = true name = "devtools" path = "lib.rs" -[build-dependencies] -chrono = { workspace = true } - [dependencies] base = { workspace = true } chrono = { workspace = true } @@ -31,3 +28,6 @@ servo_config = { path = "../config" } 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 15f5d6e81e2..ee8a4f36412 100644 --- a/components/fonts/Cargo.toml +++ b/components/fonts/Cargo.toml @@ -23,8 +23,8 @@ base = { workspace = true } bitflags = { workspace = true } euclid = { workspace = true } fnv = { workspace = true } -fontsan = { git = "https://github.com/servo/fontsan" } fonts_traits = { workspace = true } +fontsan = { git = "https://github.com/servo/fontsan" } # FIXME (#34517): macOS only needs this when building libservo without `--features media-gstreamer` harfbuzz-sys = { workspace = true, features = ["bundled"] } ipc-channel = { workspace = true } @@ -40,11 +40,11 @@ parking_lot = { workspace = true } range = { path = "../range" } serde = { workspace = true } servo_arc = { workspace = true } -stylo_atoms = { workspace = true } servo_config = { path = "../config" } servo_url = { path = "../url" } smallvec = { workspace = true, features = ["union"] } stylo = { workspace = true } +stylo_atoms = { workspace = true } tracing = { workspace = true, optional = true } unicode-properties = { workspace = true } unicode-script = { workspace = true } @@ -52,9 +52,6 @@ url = { workspace = true } webrender_api = { workspace = true } webrender_traits = { workspace = true } -[lints.rust] -unexpected_cfgs = { level = "warn", check-cfg = ['cfg(ohos_mock)'] } - [target.'cfg(target_os = "macos")'.dependencies] byteorder = { workspace = true } core-foundation = "0.9" @@ -74,3 +71,6 @@ xml-rs = "0.8" [target.'cfg(target_os = "windows")'.dependencies] dwrote = "0.11.2" truetype = { version = "0.47.3", features = ["ignore-invalid-language-ids"] } + +[lints.rust] +unexpected_cfgs = { level = "warn", check-cfg = ['cfg(ohos_mock)'] } diff --git a/components/layout_thread_2020/Cargo.toml b/components/layout_thread_2020/Cargo.toml index c3f09d4bfd0..0bf77400403 100644 --- a/components/layout_thread_2020/Cargo.toml +++ b/components/layout_thread_2020/Cargo.toml @@ -21,9 +21,9 @@ constellation_traits = { workspace = true } embedder_traits = { workspace = true } euclid = { workspace = true } fnv = { workspace = true } -fxhash = { workspace = true } fonts = { path = "../fonts" } fonts_traits = { workspace = true } +fxhash = { workspace = true } ipc-channel = { workspace = true } layout = { path = "../layout_2020", package = "layout_2020" } log = { workspace = true } @@ -37,10 +37,10 @@ script_layout_interface = { workspace = true } script_traits = { workspace = true } servo_allocator = { path = "../allocator" } servo_arc = { workspace = true } -stylo_atoms = { workspace = true } servo_config = { path = "../config" } servo_url = { path = "../url" } stylo = { workspace = true } +stylo_atoms = { workspace = true } stylo_traits = { workspace = true } tracing = { workspace = true, optional = true } url = { workspace = true } diff --git a/components/media/Cargo.toml b/components/media/Cargo.toml index 7fabf427d90..4e21db50bc8 100644 --- a/components/media/Cargo.toml +++ b/components/media/Cargo.toml @@ -12,12 +12,12 @@ name = "media" path = "lib.rs" [dependencies] -servo_config = { path = "../config" } euclid = { workspace = true } fnv = { workspace = true } ipc-channel = { workspace = true } log = { workspace = true } serde = { workspace = true } servo-media = { workspace = true } +servo_config = { path = "../config" } webrender_api = { workspace = true } webrender_traits = { workspace = true } diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml index d28b4e65ffe..abdc63259e7 100644 --- a/components/net/Cargo.toml +++ b/components/net/Cargo.toml @@ -21,6 +21,7 @@ async-tungstenite = { workspace = true } base = { workspace = true } base64 = { workspace = true } bytes = "1" +chrono = { workspace = true } content-security-policy = { workspace = true } cookie = { workspace = true } crossbeam-channel = { workspace = true } @@ -36,8 +37,8 @@ http = { workspace = true } http-body-util = { workspace = true } hyper = { workspace = true, features = ["client", "http1", "http2"] } hyper-rustls = { workspace = true } -hyper_serde = { workspace = true } hyper-util = { workspace = true } +hyper_serde = { workspace = true } imsz = { workspace = true } ipc-channel = { workspace = true } log = { workspace = true } @@ -59,19 +60,18 @@ servo_arc = { workspace = true } servo_config = { path = "../config" } servo_url = { path = "../url" } sha2 = "0.10" -chrono = { workspace = true } time = { workspace = true } tokio = { workspace = true, features = ["sync", "macros", "rt-multi-thread"] } -tokio-util = { version = "0.7.12", default-features = false, features = ["codec", "io"] } tokio-rustls = { workspace = true } tokio-stream = "0.1" +tokio-util = { version = "0.7.12", default-features = false, features = ["codec", "io"] } tower-service = { workspace = true } tungstenite = { workspace = true } url = { workspace = true } uuid = { workspace = true } +webpki-roots = { workspace = true } webrender_api = { workspace = true } webrender_traits = { workspace = true } -webpki-roots = { workspace = true } [dev-dependencies] flate2 = "1" diff --git a/components/pixels/Cargo.toml b/components/pixels/Cargo.toml index 4d5b16ab9a4..9ba20db80c0 100644 --- a/components/pixels/Cargo.toml +++ b/components/pixels/Cargo.toml @@ -13,11 +13,11 @@ path = "lib.rs" [dependencies] euclid = { workspace = true } -ipc-channel = { workspace = true } image = { workspace = true } +ipc-channel = { workspace = true } +log = { workspace = true } malloc_size_of = { workspace = true } malloc_size_of_derive = { workspace = true } -log = { workspace = true } serde = { workspace = true, features = ["derive"] } webrender_api = { workspace = true } diff --git a/components/profile/Cargo.toml b/components/profile/Cargo.toml index 546ba273f4a..977b6aee34f 100644 --- a/components/profile/Cargo.toml +++ b/components/profile/Cargo.toml @@ -29,5 +29,6 @@ regex = { workspace = true } [target.'cfg(not(target_os = "windows"))'.dependencies] libc = { workspace = true } + [target.'cfg(not(any(target_os = "windows", target_env = "ohos")))'.dependencies] tikv-jemalloc-sys = { workspace = true } diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 1aeb3e95567..07dacd3735f 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -30,13 +30,14 @@ unexpected_cfgs = { level = "warn", check-cfg = ['cfg(crown)'] } unsafe_op_in_unsafe_fn = { level = "allow" } [dependencies] -aes = { workspace = true } -aes-kw = { workspace = true } -aes-gcm = { workspace = true } accountable-refcell = { workspace = true, optional = true } +aes = { workspace = true } +aes-gcm = { workspace = true } +aes-kw = { workspace = true } app_units = { 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 } @@ -45,10 +46,10 @@ bincode = { workspace = true } bitflags = { workspace = true } bluetooth_traits = { workspace = true, optional = true } canvas_traits = { workspace = true } -constellation_traits = { workspace = true } cbc = { workspace = true } -cipher = { workspace = true } chrono = { workspace = true } +cipher = { workspace = true } +constellation_traits = { workspace = true } content-security-policy = { workspace = true } cookie = { workspace = true } crossbeam-channel = { workspace = true } @@ -63,9 +64,10 @@ embedder_traits = { workspace = true } encoding_rs = { workspace = true } euclid = { workspace = true } fnv = { workspace = true } -fxhash = { workspace = true } -fonts_traits = { workspace = true } fonts = { path = "../fonts" } +fonts_traits = { workspace = true } +fxhash = { workspace = true } +glow = { workspace = true } headers = { workspace = true } html5ever = { workspace = true } http = { workspace = true } @@ -86,8 +88,9 @@ metrics = { path = "../metrics" } mime = { workspace = true } mime_guess = { workspace = true } net_traits = { workspace = true } -num_cpus = { workspace = true } +nom = "7.1.3" num-traits = { workspace = true } +num_cpus = { workspace = true } parking_lot = { workspace = true } percent-encoding = { workspace = true } phf = "0.11" @@ -96,7 +99,6 @@ profile_traits = { workspace = true } range = { path = "../range" } ref_filter_map = "1.0.1" regex = { workspace = true } -aws-lc-rs = { workspace = true } script_bindings = { path = "../script_bindings" } script_layout_interface = { workspace = true } script_traits = { workspace = true } @@ -106,18 +108,17 @@ serde_json = { workspace = true } servo-media = { workspace = true } servo_allocator = { path = "../allocator" } servo_arc = { workspace = true } -stylo_atoms = { workspace = true } servo_config = { path = "../config" } servo_geometry = { path = "../geometry" } servo_rand = { path = "../rand" } servo_url = { path = "../url" } smallvec = { workspace = true, features = ["union"] } -stylo_malloc_size_of = { workspace = true } -glow = { workspace = true } strum = { workspace = true } strum_macros = { workspace = true } stylo = { workspace = true } +stylo_atoms = { workspace = true } stylo_dom = { workspace = true } +stylo_malloc_size_of = { workspace = true } stylo_traits = { workspace = true } swapper = "0.1" tempfile = "3" @@ -136,7 +137,6 @@ webrender_api = { workspace = true } webrender_traits = { workspace = true } webxr-api = { workspace = true, features = ["ipc"], optional = true } xml5ever = { workspace = true } -nom = "7.1.3" [target.'cfg(not(target_os = "ios"))'.dependencies] mozangle = { workspace = true } diff --git a/components/script_bindings/Cargo.toml b/components/script_bindings/Cargo.toml index 891f6a7a026..7d19ab39c25 100644 --- a/components/script_bindings/Cargo.toml +++ b/components/script_bindings/Cargo.toml @@ -15,11 +15,6 @@ links = "script_bindings_crate" name = "script_bindings" path = "lib.rs" -[build-dependencies] -phf_codegen = "0.11" -phf_shared = "0.11" -serde_json = { workspace = true } - [dependencies] bitflags = { workspace = true } crossbeam-channel = { workspace = true } @@ -36,14 +31,19 @@ num-traits = { workspace = true } parking_lot = { workspace = true } regex = { workspace = true } servo_arc = { workspace = true } -smallvec = { workspace = true } -stylo_atoms = { workspace = true } servo_config = { path = "../config" } +smallvec = { workspace = true } stylo = { workspace = true } +stylo_atoms = { workspace = true } tendril = { version = "0.4.1", features = ["encoding_rs"] } webxr-api = { workspace = true, optional = true } xml5ever = { workspace = true } +[build-dependencies] +phf_codegen = "0.11" +phf_shared = "0.11" +serde_json = { workspace = true } + [features] bluetooth = [] webgpu = [] diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml index 080968b176c..31cdd44aac6 100644 --- a/components/servo/Cargo.toml +++ b/components/servo/Cargo.toml @@ -85,10 +85,10 @@ media = { path = "../media" } mozangle = { workspace = true } net = { path = "../net" } net_traits = { workspace = true } -rayon = { workspace = true } parking_lot = { workspace = true } profile = { path = "../profile" } profile_traits = { workspace = true } +rayon = { workspace = true } script = { path = "../script" } script_layout_interface = { workspace = true } script_traits = { workspace = true } diff --git a/components/shared/base/Cargo.toml b/components/shared/base/Cargo.toml index a009e0e7bde..fea06db6ed0 100644 --- a/components/shared/base/Cargo.toml +++ b/components/shared/base/Cargo.toml @@ -20,9 +20,9 @@ malloc_size_of = { workspace = true } malloc_size_of_derive = { workspace = true } parking_lot = { workspace = true } serde = { workspace = true } +static_assertions = { workspace = true } time = { workspace = true } webrender_api = { workspace = true } -static_assertions = { workspace = true } [target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies] mach2 = { workspace = true } diff --git a/components/shared/embedder/Cargo.toml b/components/shared/embedder/Cargo.toml index 1592fb94822..66c8d179a46 100644 --- a/components/shared/embedder/Cargo.toml +++ b/components/shared/embedder/Cargo.toml @@ -25,9 +25,9 @@ hyper_serde = { workspace = true } ipc-channel = { workspace = true } keyboard-types = { workspace = true } log = { workspace = true } -num-derive = "0.4" malloc_size_of = { workspace = true } malloc_size_of_derive = { workspace = true } +num-derive = "0.4" num-traits = { workspace = true } pixels = { path = "../../pixels" } serde = { workspace = true } diff --git a/components/shared/net/Cargo.toml b/components/shared/net/Cargo.toml index 056d48146f2..511460b4f98 100644 --- a/components/shared/net/Cargo.toml +++ b/components/shared/net/Cargo.toml @@ -21,8 +21,8 @@ crossbeam-channel = { workspace = true } embedder_traits = { workspace = true } headers = { workspace = true } http = { workspace = true } -hyper_serde = { workspace = true } hyper-util = { workspace = true } +hyper_serde = { workspace = true } ipc-channel = { workspace = true } log = { workspace = true } malloc_size_of = { workspace = true } diff --git a/components/shared/script/Cargo.toml b/components/shared/script/Cargo.toml index e083e263834..ef80573473c 100644 --- a/components/shared/script/Cargo.toml +++ b/components/shared/script/Cargo.toml @@ -40,10 +40,10 @@ net_traits = { workspace = true } pixels = { path = "../../pixels" } profile_traits = { workspace = true } serde = { workspace = true } -strum_macros = { workspace = true } -stylo_atoms = { workspace = true } servo_url = { path = "../../url" } strum = { workspace = true, features = ["derive"] } +strum_macros = { workspace = true } +stylo_atoms = { workspace = true } stylo_traits = { workspace = true } uuid = { workspace = true } webdriver = { workspace = true } diff --git a/components/shared/webrender/Cargo.toml b/components/shared/webrender/Cargo.toml index 12599c9070d..6ecaa7cdee3 100644 --- a/components/shared/webrender/Cargo.toml +++ b/components/shared/webrender/Cargo.toml @@ -18,19 +18,19 @@ no-wgl = ["surfman/sm-angle-default"] [dependencies] base = { workspace = true } constellation_traits = { workspace = true } +dpi = { version = "0.1" } embedder_traits = { workspace = true } euclid = { workspace = true } -image = { workspace = true } -ipc-channel = { workspace = true } -log = { workspace = true } -libc = { workspace = true } gleam = { workspace = true } glow = { workspace = true } -webrender_api = { workspace = true } +image = { workspace = true } +ipc-channel = { workspace = true } +libc = { workspace = true } +log = { workspace = true } +raw-window-handle = { version = "0.6" } serde = { workspace = true } -servo_geometry = { path = "../../geometry" } servo-media = { workspace = true } +servo_geometry = { path = "../../geometry" } stylo = { workspace = true } surfman = { workspace = true, features = ["sm-x11"] } -raw-window-handle = { version = "0.6" } -dpi = { version = "0.1" } +webrender_api = { workspace = true } diff --git a/components/webxr/Cargo.toml b/components/webxr/Cargo.toml index 84faa7d6ac4..809e8483bd4 100644 --- a/components/webxr/Cargo.toml +++ b/components/webxr/Cargo.toml @@ -25,15 +25,15 @@ ipc = ["webxr-api/ipc", "serde"] openxr-api = ["angle", "openxr", "winapi", "wio", "surfman/sm-angle-default"] [dependencies] -webxr-api = { workspace = true } crossbeam-channel = { workspace = true } euclid = { workspace = true } +glow = { workspace = true } log = { workspace = true } openxr = { workspace = true, optional = true } -serde = { workspace = true, optional = true } -glow = { workspace = true } raw-window-handle = { workspace = true } +serde = { workspace = true, optional = true } 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 }