aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Schwender <55576758+jschwe@users.noreply.github.com>2024-11-25 11:29:58 +0100
committerGitHub <noreply@github.com>2024-11-25 10:29:58 +0000
commit810a91ecac71f656ca6573045ff51e7fee35ca53 (patch)
tree25ad144e8598a2ca235553384cf2ebc6926ab429
parent0d91da610a73b7abeb76f2d1d49a23c9ca3e704d (diff)
downloadservo-810a91ecac71f656ca6573045ff51e7fee35ca53.tar.gz
servo-810a91ecac71f656ca6573045ff51e7fee35ca53.zip
Remove some unused dependencies (#34355)
* Remove unused deps This doesn't seem to remove any deps from the workspace. Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com> * ohos: Remove gaol dependency Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com> --------- Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>
-rw-r--r--Cargo.lock33
-rw-r--r--components/canvas/Cargo.toml3
-rw-r--r--components/compositing/Cargo.toml5
-rw-r--r--components/constellation/Cargo.toml3
-rw-r--r--components/constellation/sandboxing.rs5
-rw-r--r--components/fonts/Cargo.toml4
-rw-r--r--components/layout/Cargo.toml1
-rw-r--r--components/layout_2020/Cargo.toml3
-rw-r--r--components/media/Cargo.toml1
-rw-r--r--components/metrics/Cargo.toml1
-rw-r--r--components/net/Cargo.toml1
-rw-r--r--components/servo/Cargo.toml3
-rw-r--r--components/shared/background_hang_monitor/Cargo.toml4
-rw-r--r--components/shared/compositing/Cargo.toml1
-rw-r--r--components/shared/fonts/Cargo.toml2
-rw-r--r--components/shared/net/Cargo.toml2
-rw-r--r--components/shared/script/Cargo.toml2
-rw-r--r--components/shared/script_layout/Cargo.toml1
-rw-r--r--components/shared/webrender/Cargo.toml1
-rw-r--r--ports/servoshell/Cargo.toml1
20 files changed, 8 insertions, 69 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 9a91b19b8b7..7b26a8e6f57 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -369,11 +369,7 @@ version = "0.0.1"
dependencies = [
"base",
"ipc-channel",
- "malloc_size_of_derive",
- "parking_lot",
"serde",
- "servo_malloc_size_of",
- "webrender_api",
]
[[package]]
@@ -708,14 +704,11 @@ dependencies = [
"lyon_geom",
"net_traits",
"num-traits",
- "parking_lot",
- "pathfinder_geometry",
"pixels",
"range",
"raqote",
"servo_arc",
"style",
- "style_traits",
"surfman",
"unicode-script",
"webrender",
@@ -991,14 +984,11 @@ name = "compositing"
version = "0.0.1"
dependencies = [
"base",
- "canvas",
"compositing_traits",
"crossbeam-channel",
"embedder_traits",
"euclid",
"fnv",
- "fonts",
- "fonts_traits",
"gleam",
"image",
"ipc-channel",
@@ -1006,11 +996,9 @@ dependencies = [
"libc",
"log",
"net",
- "net_traits",
"pixels",
"profile_traits",
"script_traits",
- "servo-media",
"servo_config",
"servo_geometry",
"servo_url",
@@ -1031,7 +1019,6 @@ dependencies = [
"crossbeam-channel",
"embedder_traits",
"euclid",
- "fonts_traits",
"ipc-channel",
"keyboard-types",
"log",
@@ -1068,7 +1055,6 @@ dependencies = [
"embedder_traits",
"euclid",
"fonts",
- "fonts_traits",
"gaol",
"http",
"ipc-channel",
@@ -2031,7 +2017,6 @@ dependencies = [
"core-graphics",
"core-text",
"crossbeam-channel",
- "cssparser",
"dwrote",
"euclid",
"fnv",
@@ -2058,16 +2043,13 @@ dependencies = [
"servo_url",
"smallvec",
"style",
- "surfman",
"tracing",
"truetype",
- "unicode-bidi",
"unicode-properties",
"unicode-script",
"url",
"webrender_api",
"webrender_traits",
- "xi-unicode",
"xml-rs",
"yeslogic-fontconfig-sys",
]
@@ -2076,12 +2058,10 @@ dependencies = [
name = "fonts_traits"
version = "0.0.1"
dependencies = [
- "ipc-channel",
"malloc_size_of_derive",
"range",
"serde",
"servo_malloc_size_of",
- "webrender_api",
]
[[package]]
@@ -3875,7 +3855,6 @@ dependencies = [
"euclid",
"fnv",
"fonts",
- "fonts_traits",
"html5ever",
"ipc-channel",
"log",
@@ -3935,7 +3914,6 @@ dependencies = [
"range",
"rayon",
"script_layout_interface",
- "script_traits",
"serde",
"serde_json",
"servo_arc",
@@ -4138,7 +4116,6 @@ dependencies = [
"env_logger 0.10.2",
"euclid",
"fonts",
- "fonts_traits",
"gaol",
"gleam",
"gstreamer",
@@ -4341,7 +4318,6 @@ dependencies = [
"log",
"serde",
"servo-media",
- "servo_config",
"webrender_api",
"webrender_traits",
]
@@ -4404,7 +4380,6 @@ name = "metrics"
version = "0.0.1"
dependencies = [
"base",
- "fonts_traits",
"ipc-channel",
"log",
"malloc_size_of_derive",
@@ -4674,7 +4649,6 @@ dependencies = [
"mime",
"mime_guess",
"net_traits",
- "percent-encoding",
"pixels",
"profile_traits",
"rayon",
@@ -4715,7 +4689,6 @@ dependencies = [
"http",
"hyper",
"hyper_serde",
- "image",
"ipc-channel",
"log",
"malloc_size_of_derive",
@@ -4731,7 +4704,6 @@ dependencies = [
"servo_url",
"url",
"uuid",
- "webrender_api",
"webrender_traits",
]
@@ -6142,7 +6114,6 @@ dependencies = [
"selectors",
"serde",
"servo_arc",
- "servo_atoms",
"servo_malloc_size_of",
"servo_url",
"style",
@@ -6175,7 +6146,6 @@ dependencies = [
"devtools_traits",
"embedder_traits",
"euclid",
- "fonts_traits",
"http",
"hyper_serde",
"ipc-channel",
@@ -6191,7 +6161,6 @@ dependencies = [
"servo_atoms",
"servo_malloc_size_of",
"servo_url",
- "smallvec",
"style_traits",
"uuid",
"webdriver",
@@ -6670,7 +6639,6 @@ dependencies = [
"ohos-vsync",
"raw-window-handle",
"serde_json",
- "servo-media",
"servo_allocator",
"shellwords",
"sig",
@@ -8320,7 +8288,6 @@ name = "webrender_traits"
version = "0.0.1"
dependencies = [
"base",
- "crossbeam-channel",
"embedder_traits",
"euclid",
"ipc-channel",
diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml
index b60bd2f1558..bba2189cd5d 100644
--- a/components/canvas/Cargo.toml
+++ b/components/canvas/Cargo.toml
@@ -33,14 +33,11 @@ log = { workspace = true }
lyon_geom = "1.0.4"
net_traits = { workspace = true }
num-traits = { workspace = true }
-parking_lot = { workspace = true }
-pathfinder_geometry = "0.5"
pixels = { path = "../pixels" }
range = { path = "../range" }
raqote = "0.8.5"
servo_arc = { workspace = true }
style = { workspace = true }
-style_traits = { workspace = true }
surfman = { workspace = true }
unicode-script = { workspace = true }
webrender = { workspace = true }
diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml
index 32acf07504d..ca18767baf2 100644
--- a/components/compositing/Cargo.toml
+++ b/components/compositing/Cargo.toml
@@ -19,14 +19,11 @@ webxr = ["dep:webxr"]
[dependencies]
base = { workspace = true }
-canvas = { path = "../canvas" }
compositing_traits = { workspace = true }
crossbeam-channel = { workspace = true }
embedder_traits = { workspace = true }
euclid = { workspace = true }
fnv = { workspace = true }
-fonts = { path = "../fonts" }
-fonts_traits = { workspace = true }
gleam = { workspace = true }
image = { workspace = true }
ipc-channel = { workspace = true }
@@ -34,12 +31,10 @@ keyboard-types = { workspace = true }
libc = { workspace = true }
log = { workspace = true }
net = { path = "../net" }
-net_traits = { workspace = true }
pixels = { path = "../pixels" }
profile_traits = { workspace = true }
script_traits = { workspace = true }
servo_config = { path = "../config" }
-servo-media = { workspace = true }
servo_geometry = { path = "../geometry" }
servo_url = { path = "../url" }
style_traits = { workspace = true }
diff --git a/components/constellation/Cargo.toml b/components/constellation/Cargo.toml
index 5e2b36827ec..67194128d1d 100644
--- a/components/constellation/Cargo.toml
+++ b/components/constellation/Cargo.toml
@@ -29,7 +29,6 @@ devtools_traits = { workspace = true }
embedder_traits = { workspace = true }
euclid = { workspace = true }
fonts = { path = "../fonts" }
-fonts_traits = { workspace = true }
http = { workspace = true }
ipc-channel = { workspace = true }
keyboard-types = { workspace = true }
@@ -53,5 +52,5 @@ webrender_api = { workspace = true }
webrender_traits = { workspace = true }
webxr-api = { workspace = true, features = ["ipc"] }
-[target.'cfg(any(target_os="macos", all(not(target_os = "windows"), not(target_os = "ios"), not(target_os="android"), not(target_arch="arm"), not(target_arch="aarch64"))))'.dependencies]
+[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/constellation/sandboxing.rs b/components/constellation/sandboxing.rs
index 458659ad8fd..c7f4e55ae0e 100644
--- a/components/constellation/sandboxing.rs
+++ b/components/constellation/sandboxing.rs
@@ -14,6 +14,7 @@ use std::process;
not(target_os = "windows"),
not(target_os = "ios"),
not(target_os = "android"),
+ not(target_env = "ohos"),
not(target_arch = "arm"),
not(target_arch = "aarch64")
)
@@ -98,6 +99,7 @@ pub fn content_process_sandbox_profile() -> Profile {
not(target_os = "windows"),
not(target_os = "ios"),
not(target_os = "android"),
+ not(target_env = "ohos"),
not(target_arch = "arm"),
not(target_arch = "aarch64")
))]
@@ -128,6 +130,7 @@ pub fn content_process_sandbox_profile() -> Profile {
target_os = "windows",
target_os = "ios",
target_os = "android",
+ target_env = "ohos",
target_arch = "arm",
// exclude apple arm devices
@@ -140,6 +143,7 @@ pub fn content_process_sandbox_profile() {
#[cfg(any(
target_os = "android",
+ target_env = "ohos",
target_arch = "arm",
all(target_arch = "aarch64", not(target_os = "windows"))
))]
@@ -168,6 +172,7 @@ pub fn spawn_multiprocess(content: UnprivilegedContent) -> Result<(), Error> {
not(target_os = "windows"),
not(target_os = "ios"),
not(target_os = "android"),
+ not(target_env = "ohos"),
not(target_arch = "arm"),
not(target_arch = "aarch64")
))]
diff --git a/components/fonts/Cargo.toml b/components/fonts/Cargo.toml
index fa84e432e17..a1013380826 100644
--- a/components/fonts/Cargo.toml
+++ b/components/fonts/Cargo.toml
@@ -21,7 +21,6 @@ app_units = { workspace = true }
atomic_refcell = { workspace = true }
base = { workspace = true }
bitflags = { workspace = true }
-cssparser = { workspace = true }
crossbeam-channel = { workspace = true }
euclid = { workspace = true }
fnv = { workspace = true }
@@ -45,16 +44,13 @@ servo_atoms = { workspace = true }
servo_config = { path = "../config" }
servo_url = { path = "../url" }
smallvec = { workspace = true, features = ["union"] }
-surfman = { workspace = true }
style = { workspace = true }
tracing = { workspace = true, optional = true }
-unicode-bidi = { workspace = true, features = ["with_serde"] }
unicode-properties = { workspace = true }
unicode-script = { workspace = true }
url = { workspace = true }
webrender_api = { workspace = true }
webrender_traits = { workspace = true }
-xi-unicode = { workspace = true }
[lints.rust]
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(ohos_mock)'] }
diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml
index cf7617790f8..2ac1462ed57 100644
--- a/components/layout/Cargo.toml
+++ b/components/layout/Cargo.toml
@@ -26,7 +26,6 @@ embedder_traits = { workspace = true }
euclid = { workspace = true }
fnv = { workspace = true }
fonts = { path = "../fonts" }
-fonts_traits = { workspace = true }
html5ever = { workspace = true }
ipc-channel = { workspace = true }
log = { workspace = true }
diff --git a/components/layout_2020/Cargo.toml b/components/layout_2020/Cargo.toml
index 31a78ed2361..6e4b1ccb884 100644
--- a/components/layout_2020/Cargo.toml
+++ b/components/layout_2020/Cargo.toml
@@ -40,7 +40,6 @@ pixels = { path = "../pixels" }
range = { path = "../range" }
rayon = { workspace = true }
script_layout_interface = { workspace = true }
-script_traits = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
servo_arc = { workspace = true }
@@ -51,7 +50,7 @@ style = { workspace = true }
style_traits = { workspace = true }
taffy = { workspace = true }
tracing = { workspace = true, optional = true }
-unicode-bidi = { workspace = true }
+unicode-bidi = { workspace = true, features = ["with_serde"] }
unicode-script = { workspace = true }
url = { workspace = true }
webrender_api = { workspace = true }
diff --git a/components/media/Cargo.toml b/components/media/Cargo.toml
index 4e21db50bc8..e9724ee9bf6 100644
--- a/components/media/Cargo.toml
+++ b/components/media/Cargo.toml
@@ -18,6 +18,5 @@ 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/metrics/Cargo.toml b/components/metrics/Cargo.toml
index 94b13355ef3..a62ff8c98dc 100644
--- a/components/metrics/Cargo.toml
+++ b/components/metrics/Cargo.toml
@@ -13,7 +13,6 @@ path = "lib.rs"
[dependencies]
base = { workspace = true }
-fonts_traits = { workspace = true }
ipc-channel = { workspace = true }
log = { workspace = true }
malloc_size_of = { workspace = true }
diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml
index d6d083d3dcb..74fd8f956d9 100644
--- a/components/net/Cargo.toml
+++ b/components/net/Cargo.toml
@@ -44,7 +44,6 @@ malloc_size_of_derive = { workspace = true }
mime = { workspace = true }
mime_guess = { workspace = true }
net_traits = { workspace = true }
-percent-encoding = { workspace = true }
pixels = { path = "../pixels" }
profile_traits = { workspace = true }
rayon = { workspace = true }
diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml
index 85ca01df8ca..c71d8130f29 100644
--- a/components/servo/Cargo.toml
+++ b/components/servo/Cargo.toml
@@ -58,7 +58,6 @@ embedder_traits = { workspace = true }
env_logger = { workspace = true }
euclid = { workspace = true }
fonts = { path = "../fonts" }
-fonts_traits = { workspace = true }
gleam = { workspace = true }
gstreamer = { workspace = true, optional = true }
ipc-channel = { workspace = true }
@@ -93,5 +92,5 @@ webrender_traits = { workspace = true }
webxr = { workspace = true, optional = true }
webxr-api = { workspace = true, optional = true }
-[target.'cfg(all(not(target_os = "windows"), not(target_os = "ios"), not(target_os = "android"), not(target_arch = "arm"), not(target_arch = "aarch64")))'.dependencies]
+[target.'cfg(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/shared/background_hang_monitor/Cargo.toml b/components/shared/background_hang_monitor/Cargo.toml
index 4eed7c0430c..5d8c8a50658 100644
--- a/components/shared/background_hang_monitor/Cargo.toml
+++ b/components/shared/background_hang_monitor/Cargo.toml
@@ -16,8 +16,4 @@ doctest = false
[dependencies]
base = { workspace = true }
ipc-channel = { workspace = true }
-malloc_size_of = { workspace = true }
-malloc_size_of_derive = { workspace = true }
-parking_lot = { workspace = true }
serde = { workspace = true }
-webrender_api = { workspace = true }
diff --git a/components/shared/compositing/Cargo.toml b/components/shared/compositing/Cargo.toml
index cec60977a3c..60fe7f05941 100644
--- a/components/shared/compositing/Cargo.toml
+++ b/components/shared/compositing/Cargo.toml
@@ -16,7 +16,6 @@ base = { workspace = true }
crossbeam-channel = { workspace = true }
embedder_traits = { workspace = true }
euclid = { workspace = true }
-fonts_traits = { workspace = true }
ipc-channel = { workspace = true }
keyboard-types = { workspace = true }
log = { workspace = true }
diff --git a/components/shared/fonts/Cargo.toml b/components/shared/fonts/Cargo.toml
index 3a717a23d0e..25eb260b525 100644
--- a/components/shared/fonts/Cargo.toml
+++ b/components/shared/fonts/Cargo.toml
@@ -12,9 +12,7 @@ name = "fonts_traits"
path = "lib.rs"
[dependencies]
-ipc-channel = { workspace = true }
malloc_size_of = { workspace = true }
malloc_size_of_derive = { workspace = true }
range = { path = "../../range" }
serde = { workspace = true }
-webrender_api = { workspace = true }
diff --git a/components/shared/net/Cargo.toml b/components/shared/net/Cargo.toml
index d4b7abbbc18..87336b44670 100644
--- a/components/shared/net/Cargo.toml
+++ b/components/shared/net/Cargo.toml
@@ -23,7 +23,6 @@ headers = { workspace = true }
http = { workspace = true }
hyper = { workspace = true }
hyper_serde = { workspace = true }
-image = { workspace = true }
ipc-channel = { workspace = true }
log = { workspace = true }
malloc_size_of = { workspace = true }
@@ -39,5 +38,4 @@ servo_rand = { path = "../../rand" }
servo_url = { path = "../../url" }
url = { workspace = true }
uuid = { workspace = true }
-webrender_api = { workspace = true }
webrender_traits = { workspace = true }
diff --git a/components/shared/script/Cargo.toml b/components/shared/script/Cargo.toml
index 94279827822..1ba83763ac4 100644
--- a/components/shared/script/Cargo.toml
+++ b/components/shared/script/Cargo.toml
@@ -22,7 +22,6 @@ crossbeam-channel = { workspace = true }
devtools_traits = { workspace = true }
embedder_traits = { workspace = true }
euclid = { workspace = true }
-fonts_traits = { workspace = true }
http = { workspace = true }
hyper_serde = { workspace = true }
ipc-channel = { workspace = true }
@@ -38,7 +37,6 @@ profile_traits = { workspace = true }
serde = { workspace = true }
servo_atoms = { workspace = true }
servo_url = { path = "../../url" }
-smallvec = { workspace = true }
style_traits = { workspace = true }
uuid = { workspace = true }
webdriver = { workspace = true }
diff --git a/components/shared/script_layout/Cargo.toml b/components/shared/script_layout/Cargo.toml
index 4da04eadf01..5de7c95f9c7 100644
--- a/components/shared/script_layout/Cargo.toml
+++ b/components/shared/script_layout/Cargo.toml
@@ -34,7 +34,6 @@ script_traits = { workspace = true }
selectors = { workspace = true }
serde = { workspace = true }
servo_arc = { workspace = true }
-servo_atoms = { workspace = true }
servo_url = { path = "../../url" }
style = { workspace = true }
style_traits = { workspace = true }
diff --git a/components/shared/webrender/Cargo.toml b/components/shared/webrender/Cargo.toml
index 14e1c405468..74c46dce662 100644
--- a/components/shared/webrender/Cargo.toml
+++ b/components/shared/webrender/Cargo.toml
@@ -13,7 +13,6 @@ path = "lib.rs"
[dependencies]
base = { workspace = true }
-crossbeam-channel = { workspace = true }
embedder_traits = { workspace = true }
euclid = { workspace = true }
ipc-channel = { workspace = true }
diff --git a/ports/servoshell/Cargo.toml b/ports/servoshell/Cargo.toml
index 57380bdf1c7..c72467de6f0 100644
--- a/ports/servoshell/Cargo.toml
+++ b/ports/servoshell/Cargo.toml
@@ -66,7 +66,6 @@ getopts = { workspace = true }
hitrace = { workspace = true, optional = true }
mime_guess = { workspace = true }
url = { workspace = true }
-servo-media = { workspace = true }
tokio = { workspace = true }
tracing = { workspace = true, optional = true }
tracing-subscriber = { workspace = true, optional = true, features = ["env-filter"] }