Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 05:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Bump Stylo to df459ec (#36011)

Browse source 
Changelog: 6aa5733a36...df459eca2e

This fixes some potential compilation problems since servo/stylo#150
renamed some crates.

Signed-off-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
Oriol Brufau 2025-03-17 20:11:09 +01:00 • committed by GitHub
parent b3c0794084
commit 6807a6e532
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 114 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

216
Cargo.lock generated
View file

@ -798,7 +798,7 @@ dependencies = [
"range", "range",
"raqote", "raqote",
"servo_arc", "servo_arc",
"style", "stylo",
"surfman", "surfman",
"unicode-script", "unicode-script",
"webrender", "webrender",
@ -823,7 +823,7 @@ dependencies = [
"serde_bytes", "serde_bytes",
"servo_config", "servo_config",
"servo_malloc_size_of", "servo_malloc_size_of",
"style", "stylo",
"webrender_api", "webrender_api",
"webxr-api", "webxr-api",
] ]
@ -1100,7 +1100,7 @@ dependencies = [
"script_traits", "script_traits",
"servo_config", "servo_config",
"servo_geometry", "servo_geometry",
"style_traits", "stylo_traits",
"surfman", "surfman",
"tracing", "tracing",
"webrender", "webrender",
@ -1124,7 +1124,7 @@ dependencies = [
"script_traits", "script_traits",
"servo_url", "servo_url",
"strum_macros", "strum_macros",
"style_traits", "stylo_traits",
"webrender_api", "webrender_api",
"webrender_traits", "webrender_traits",
] ]
@ -1169,7 +1169,7 @@ dependencies = [
"servo_config", "servo_config",
"servo_rand", "servo_rand",
"servo_url", "servo_url",
"style_traits", "stylo_traits",
"tracing", "tracing",
"webgpu", "webgpu",
"webrender", "webrender",
@ -1907,7 +1907,7 @@ dependencies = [
"servo_malloc_size_of", "servo_malloc_size_of",
"servo_url", "servo_url",
"strum_macros", "strum_macros",
"style_traits", "stylo_traits",
"url", "url",
"webdriver", "webdriver",
"webrender_api", "webrender_api",
@ -2190,7 +2190,7 @@ dependencies = [
"servo_malloc_size_of", "servo_malloc_size_of",
"servo_url", "servo_url",
"smallvec", "smallvec",
"style", "stylo",
"stylo_atoms", "stylo_atoms",
"tracing", "tracing",
"truetype", "truetype",
@ -4175,8 +4175,8 @@ dependencies = [
"servo_config", "servo_config",
"servo_geometry", "servo_geometry",
"servo_url", "servo_url",
"style", "stylo",
"style_traits", "stylo_traits",
"taffy", "taffy",
"tracing", "tracing",
"unicode-bidi", "unicode-bidi",
@ -4214,9 +4214,9 @@ dependencies = [
"servo_config", "servo_config",
"servo_malloc_size_of", "servo_malloc_size_of",
"servo_url", "servo_url",
"style", "stylo",
"style_traits",
"stylo_atoms", "stylo_atoms",
"stylo_traits",
"tracing", "tracing",
"url", "url",
"webrender_api", "webrender_api",
@ -4361,8 +4361,8 @@ dependencies = [
"servo_config", "servo_config",
"servo_geometry", "servo_geometry",
"servo_url", "servo_url",
"style", "stylo",
"style_traits", "stylo_traits",
"surfman", "surfman",
"tracing", "tracing",
"url", "url",
@ -4467,23 +4467,6 @@ dependencies = [
"libc", "libc",
] ]
[[package]]
name = "malloc_size_of"
version = "0.0.1"
source = "git+https://github.com/servo/stylo?branch=2025-03-15#6aa5733a36de47b6f22879ee664266a1d59877d4"
dependencies = [
"app_units",
"cssparser",
"euclid",
"selectors",
"servo_arc",
"smallbitvec",
"smallvec",
"string_cache",
"thin-vec",
"void",
]
[[package]] [[package]]
name = "malloc_size_of_derive" name = "malloc_size_of_derive"
version = "0.1.3" version = "0.1.3"
@ -6324,7 +6307,6 @@ dependencies = [
"keyboard-types", "keyboard-types",
"libc", "libc",
"log", "log",
"malloc_size_of",
"malloc_size_of_derive", "malloc_size_of_derive",
"media", "media",
"metrics", "metrics",
@ -6361,10 +6343,11 @@ dependencies = [
"smallvec", "smallvec",
"strum", "strum",
"strum_macros", "strum_macros",
"style", "stylo",
"style_traits",
"stylo_atoms", "stylo_atoms",
"stylo_dom", "stylo_dom",
"stylo_malloc_size_of",
"stylo_traits",
"swapper", "swapper",
"tempfile", "tempfile",
"tendril", "tendril",
@ -6408,7 +6391,7 @@ dependencies = [
"servo_config", "servo_config",
"servo_malloc_size_of", "servo_malloc_size_of",
"smallvec", "smallvec",
"style", "stylo",
"stylo_atoms", "stylo_atoms",
"tendril", "tendril",
"webxr-api", "webxr-api",
@ -6442,8 +6425,8 @@ dependencies = [
"servo_arc", "servo_arc",
"servo_malloc_size_of", "servo_malloc_size_of",
"servo_url", "servo_url",
"style", "stylo",
"style_traits", "stylo_traits",
"webrender_api", "webrender_api",
"webrender_traits", "webrender_traits",
] ]
@ -6488,8 +6471,8 @@ dependencies = [
"servo_url", "servo_url",
"strum", "strum",
"strum_macros", "strum_macros",
"style_traits",
"stylo_atoms", "stylo_atoms",
"stylo_traits",
"uuid", "uuid",
"webdriver", "webdriver",
"webgpu", "webgpu",
@ -6514,7 +6497,7 @@ dependencies = [
[[package]] [[package]]
name = "selectors" name = "selectors"
version = "0.26.0" version = "0.26.0"
source = "git+https://github.com/servo/stylo?branch=2025-03-15#6aa5733a36de47b6f22879ee664266a1d59877d4" source = "git+https://github.com/servo/stylo?branch=2025-03-15#df459eca2e8e71b5e85c7c20a64208f3410184e0"
dependencies = [ dependencies = [
"bitflags 2.9.0", "bitflags 2.9.0",
"cssparser", "cssparser",
@ -6799,7 +6782,7 @@ dependencies = [
[[package]] [[package]]
name = "servo_arc" name = "servo_arc"
version = "0.4.0" version = "0.4.0"
source = "git+https://github.com/servo/stylo?branch=2025-03-15#6aa5733a36de47b6f22879ee664266a1d59877d4" source = "git+https://github.com/servo/stylo?branch=2025-03-15#df459eca2e8e71b5e85c7c20a64208f3410184e0"
dependencies = [ dependencies = [
"serde", "serde",
"stable_deref_trait", "stable_deref_trait",
@ -6850,14 +6833,14 @@ dependencies = [
"indexmap", "indexmap",
"ipc-channel", "ipc-channel",
"keyboard-types", "keyboard-types",
"malloc_size_of",
"markup5ever", "markup5ever",
"servo_allocator", "servo_allocator",
"servo_arc", "servo_arc",
"smallvec", "smallvec",
"string_cache", "string_cache",
"style", "stylo",
"stylo_dom", "stylo_dom",
"stylo_malloc_size_of",
"thin-vec", "thin-vec",
"tokio", "tokio",
"url", "url",
@ -7229,9 +7212,27 @@ dependencies = [
] ]
[[package]] [[package]]
name = "style" name = "style_tests"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/stylo?branch=2025-03-15#6aa5733a36de47b6f22879ee664266a1d59877d4" dependencies = [
"app_units",
"cssparser",
"euclid",
"html5ever",
"rayon",
"selectors",
"serde_json",
"servo_arc",
"stylo",
"stylo_atoms",
"stylo_traits",
"url",
]
[[package]]
name = "stylo"
version = "0.0.1"
source = "git+https://github.com/servo/stylo?branch=2025-03-15#df459eca2e8e71b5e85c7c20a64208f3410184e0"
dependencies = [ dependencies = [
"app_units", "app_units",
"arrayvec", "arrayvec",
@ -7249,7 +7250,6 @@ dependencies = [
"itoa", "itoa",
"lazy_static", "lazy_static",
"log", "log",
"malloc_size_of",
"malloc_size_of_derive", "malloc_size_of_derive",
"markup5ever", "markup5ever",
"matches", "matches",
@ -7270,12 +7270,13 @@ dependencies = [
"smallvec", "smallvec",
"static_assertions", "static_assertions",
"string_cache", "string_cache",
"style_derive",
"style_traits",
"stylo_atoms", "stylo_atoms",
"stylo_config", "stylo_config",
"stylo_derive",
"stylo_dom", "stylo_dom",
"stylo_malloc_size_of",
"stylo_static_prefs", "stylo_static_prefs",
"stylo_traits",
"thin-vec", "thin-vec",
"to_shmem", "to_shmem",
"to_shmem_derive", "to_shmem_derive",
@ -7287,9 +7288,23 @@ dependencies = [
] ]
[[package]] [[package]]
name = "style_derive" name = "stylo_atoms"
version = "0.1.0"
source = "git+https://github.com/servo/stylo?branch=2025-03-15#df459eca2e8e71b5e85c7c20a64208f3410184e0"
dependencies = [
"string_cache",
"string_cache_codegen",
]
[[package]]
name = "stylo_config"
version = "0.1.0"
source = "git+https://github.com/servo/stylo?branch=2025-03-15#df459eca2e8e71b5e85c7c20a64208f3410184e0"
[[package]]
name = "stylo_derive"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/stylo?branch=2025-03-15#6aa5733a36de47b6f22879ee664266a1d59877d4" source = "git+https://github.com/servo/stylo?branch=2025-03-15#df459eca2e8e71b5e85c7c20a64208f3410184e0"
dependencies = [ dependencies = [
"darling", "darling",
"proc-macro2", "proc-macro2",
@ -7298,72 +7313,57 @@ dependencies = [
"synstructure", "synstructure",
] ]
[[package]]
name = "style_tests"
version = "0.0.1"
dependencies = [
"app_units",
"cssparser",
"euclid",
"html5ever",
"rayon",
"selectors",
"serde_json",
"servo_arc",
"style",
"style_traits",
"stylo_atoms",
"url",
]
[[package]]
name = "style_traits"
version = "0.0.1"
source = "git+https://github.com/servo/stylo?branch=2025-03-15#6aa5733a36de47b6f22879ee664266a1d59877d4"
dependencies = [
"app_units",
"bitflags 2.9.0",
"cssparser",
"euclid",
"malloc_size_of",
"malloc_size_of_derive",
"selectors",
"serde",
"servo_arc",
"stylo_atoms",
"thin-vec",
"to_shmem",
"to_shmem_derive",
"url",
]
[[package]]
name = "stylo_atoms"
version = "0.1.0"
source = "git+https://github.com/servo/stylo?branch=2025-03-15#6aa5733a36de47b6f22879ee664266a1d59877d4"
dependencies = [
"string_cache",
"string_cache_codegen",
]
[[package]]
name = "stylo_config"
version = "0.1.0"
source = "git+https://github.com/servo/stylo?branch=2025-03-15#6aa5733a36de47b6f22879ee664266a1d59877d4"
[[package]] [[package]]
name = "stylo_dom" name = "stylo_dom"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/stylo?branch=2025-03-15#6aa5733a36de47b6f22879ee664266a1d59877d4" source = "git+https://github.com/servo/stylo?branch=2025-03-15#df459eca2e8e71b5e85c7c20a64208f3410184e0"
dependencies = [ dependencies = [
"bitflags 2.9.0", "bitflags 2.9.0",
"malloc_size_of", "stylo_malloc_size_of",
]
[[package]]
name = "stylo_malloc_size_of"
version = "0.0.1"
source = "git+https://github.com/servo/stylo?branch=2025-03-15#df459eca2e8e71b5e85c7c20a64208f3410184e0"
dependencies = [
"app_units",
"cssparser",
"euclid",
"selectors",
"servo_arc",
"smallbitvec",
"smallvec",
"string_cache",
"thin-vec",
"void",
] ]
[[package]] [[package]]
name = "stylo_static_prefs" name = "stylo_static_prefs"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/stylo?branch=2025-03-15#6aa5733a36de47b6f22879ee664266a1d59877d4" source = "git+https://github.com/servo/stylo?branch=2025-03-15#df459eca2e8e71b5e85c7c20a64208f3410184e0"
[[package]]
name = "stylo_traits"
version = "0.0.1"
source = "git+https://github.com/servo/stylo?branch=2025-03-15#df459eca2e8e71b5e85c7c20a64208f3410184e0"
dependencies = [
"app_units",
"bitflags 2.9.0",
"cssparser",
"euclid",
"malloc_size_of_derive",
"selectors",
"serde",
"servo_arc",
"stylo_atoms",
"stylo_malloc_size_of",
"thin-vec",
"to_shmem",
"to_shmem_derive",
"url",
]
[[package]] [[package]]
name = "subtle" name = "subtle"
@ -7730,7 +7730,7 @@ dependencies = [
[[package]] [[package]]
name = "to_shmem" name = "to_shmem"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/stylo?branch=2025-03-15#6aa5733a36de47b6f22879ee664266a1d59877d4" source = "git+https://github.com/servo/stylo?branch=2025-03-15#df459eca2e8e71b5e85c7c20a64208f3410184e0"
dependencies = [ dependencies = [
"cssparser", "cssparser",
"servo_arc", "servo_arc",
@ -7743,7 +7743,7 @@ dependencies = [
[[package]] [[package]]
name = "to_shmem_derive" name = "to_shmem_derive"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/stylo?branch=2025-03-15#6aa5733a36de47b6f22879ee664266a1d59877d4" source = "git+https://github.com/servo/stylo?branch=2025-03-15#df459eca2e8e71b5e85c7c20a64208f3410184e0"
dependencies = [ dependencies = [
"darling", "darling",
"proc-macro2", "proc-macro2",
@ -8522,7 +8522,7 @@ dependencies = [
"serde_json", "serde_json",
"servo_config", "servo_config",
"servo_url", "servo_url",
"style_traits", "stylo_traits",
"uuid", "uuid",
"webdriver", "webdriver",
] ]
@ -8638,7 +8638,7 @@ dependencies = [
"serde", "serde",
"servo-media", "servo-media",
"servo_geometry", "servo_geometry",
"style", "stylo",
"surfman", "surfman",
"webrender_api", "webrender_api",
] ]

12
Cargo.toml
View file

@ -133,11 +133,11 @@ string_cache = "0.8"
string_cache_codegen = "0.5" string_cache_codegen = "0.5"
strum = "0.26" strum = "0.26"
strum_macros = "0.26" strum_macros = "0.26"
style = { git = "https://github.com/servo/stylo", branch = "2025-03-15", features = ["servo"] } style = { git = "https://github.com/servo/stylo", branch = "2025-03-15", features = ["servo"], package = "stylo" }
stylo_config = { git = "https://github.com/servo/stylo", branch = "2025-03-15" } stylo_config = { git = "https://github.com/servo/stylo", branch = "2025-03-15" }
stylo_dom = { git = "https://github.com/servo/stylo", branch = "2025-03-15" } stylo_dom = { git = "https://github.com/servo/stylo", branch = "2025-03-15" }
style_malloc_size_of = { package = "malloc_size_of", git = "https://github.com/servo/stylo", branch = "2025-03-15", features = ["servo"] } style_malloc_size_of = { package = "stylo_malloc_size_of", git = "https://github.com/servo/stylo", branch = "2025-03-15", features = ["servo"] }
style_traits = { git = "https://github.com/servo/stylo", branch = "2025-03-15", features = ["servo"] } style_traits = { git = "https://github.com/servo/stylo", branch = "2025-03-15", features = ["servo"], package = "stylo_traits" }
surfman = { git = "https://github.com/servo/surfman", rev = "f7688b4585f9e0b5d4bf8ee8e4a91e82349610b1", features = ["chains"] } surfman = { git = "https://github.com/servo/surfman", rev = "f7688b4585f9e0b5d4bf8ee8e4a91e82349610b1", features = ["chains"] }
syn = { version = "2", default-features = false, features = ["clone-impls", "derive", "parsing"] } syn = { version = "2", default-features = false, features = ["clone-impls", "derive", "parsing"] }
synstructure = "0.13" synstructure = "0.13"
@ -217,11 +217,11 @@ codegen-units = 1
# selectors = { path = "../stylo/selectors" } # selectors = { path = "../stylo/selectors" }
# servo_arc = { path = "../stylo/servo_arc" } # servo_arc = { path = "../stylo/servo_arc" }
# stylo_atoms = { path = "../stylo/stylo_atoms" } # stylo_atoms = { path = "../stylo/stylo_atoms" }
# style = { path = "../stylo/style" } # style = { path = "../stylo/style", package = "stylo" }
# stylo_config = { path = "../stylo/stylo_config" } # stylo_config = { path = "../stylo/stylo_config" }
# stylo_dom = { path = "../stylo/stylo_dom" } # stylo_dom = { path = "../stylo/stylo_dom" }
# style_malloc_size_of = { path = "../stylo/malloc_size_of", package = "malloc_size_of" } # style_malloc_size_of = { path = "../stylo/malloc_size_of", package = "stylo_malloc_size_of" }
# style_traits = { path = "../stylo/style_traits" } # style_traits = { path = "../stylo/style_traits", package = "stylo_traits" }
# #
# Or for WebRender: # Or for WebRender:
# #