Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 07:13:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup Stylo dependencies (#36046)

Browse source 
Now that Stylo considers `servo` as the default feature, Servo doesn't
need to specify `features = ["servo"]`.

Also use the same crate names as Stylo, rather than renaming them with
`package`.

Signed-off-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
Oriol Brufau 2025-03-19 09:53:26 +01:00 • committed by GitHub
parent 3a3c3aeb75
commit 4acaa08cf5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
21 changed files with 63 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Cargo.toml
View file

@ -124,7 +124,7 @@ serde_json = "1.0"
servo-media = { git = "https://github.com/servo/media" } servo-media = { git = "https://github.com/servo/media" }
servo-media-dummy = { git = "https://github.com/servo/media" } servo-media-dummy = { git = "https://github.com/servo/media" }
servo-media-gstreamer = { git = "https://github.com/servo/media" } servo-media-gstreamer = { git = "https://github.com/servo/media" }
servo_arc = { git = "https://github.com/servo/stylo", branch = "2025-03-15", features = ["servo"] } servo_arc = { git = "https://github.com/servo/stylo", branch = "2025-03-15" }
stylo_atoms = { git = "https://github.com/servo/stylo", branch = "2025-03-15" } stylo_atoms = { git = "https://github.com/servo/stylo", branch = "2025-03-15" }
smallbitvec = "2.6.0" smallbitvec = "2.6.0"
smallvec = "1.14" smallvec = "1.14"
@ -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"], package = "stylo" } stylo = { git = "https://github.com/servo/stylo", branch = "2025-03-15" }
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 = "stylo_malloc_size_of", git = "https://github.com/servo/stylo", branch = "2025-03-15", features = ["servo"] } stylo_malloc_size_of = { git = "https://github.com/servo/stylo", branch = "2025-03-15" }
style_traits = { git = "https://github.com/servo/stylo", branch = "2025-03-15", features = ["servo"], package = "stylo_traits" } stylo_traits = { git = "https://github.com/servo/stylo", branch = "2025-03-15" }
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", package = "stylo" } # stylo = { path = "../stylo/style" }
# 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 = "stylo_malloc_size_of" } # stylo_malloc_size_of = { path = "../stylo/malloc_size_of" }
# style_traits = { path = "../stylo/style_traits", package = "stylo_traits" } # stylo_traits = { path = "../stylo/style_traits" }
# #
# Or for WebRender: # Or for WebRender:
# #

2
components/canvas/Cargo.toml
View file

@ -37,7 +37,7 @@ pixels = { path = "../pixels" }
range = { path = "../range" } range = { path = "../range" }
raqote = "0.8.5" raqote = "0.8.5"
servo_arc = { workspace = true } servo_arc = { workspace = true }
style = { workspace = true } stylo = { workspace = true }
surfman = { workspace = true } surfman = { workspace = true }
unicode-script = { workspace = true } unicode-script = { workspace = true }
webrender = { workspace = true } webrender = { workspace = true }

2
components/compositing/Cargo.toml
View file

@ -36,7 +36,7 @@ profile_traits = { workspace = true }
script_traits = { workspace = true } script_traits = { workspace = true }
servo_config = { path = "../config" } servo_config = { path = "../config" }
servo_geometry = { path = "../geometry" } servo_geometry = { path = "../geometry" }
style_traits = { workspace = true } stylo_traits = { workspace = true }
tracing = { workspace = true, optional = true } tracing = { workspace = true, optional = true }
webrender = { workspace = true } webrender = { workspace = true }
webrender_api = { workspace = true } webrender_api = { workspace = true }

2
components/constellation/Cargo.toml
View file

@ -45,7 +45,7 @@ serde = { workspace = true }
servo_config = { path = "../config" } servo_config = { path = "../config" }
servo_rand = { path = "../rand" } servo_rand = { path = "../rand" }
servo_url = { path = "../url" } servo_url = { path = "../url" }
style_traits = { workspace = true } stylo_traits = { workspace = true }
tracing = { workspace = true, optional = true } tracing = { workspace = true, optional = true }
webgpu = { path = "../webgpu" } webgpu = { path = "../webgpu" }
webrender = { workspace = true } webrender = { workspace = true }

2
components/fonts/Cargo.toml
View file

@ -44,7 +44,7 @@ stylo_atoms = { workspace = true }
servo_config = { path = "../config" } servo_config = { path = "../config" }
servo_url = { path = "../url" } servo_url = { path = "../url" }
smallvec = { workspace = true, features = ["union"] } smallvec = { workspace = true, features = ["union"] }
style = { workspace = true } stylo = { workspace = true }
tracing = { workspace = true, optional = true } tracing = { workspace = true, optional = true }
unicode-properties = { workspace = true } unicode-properties = { workspace = true }
unicode-script = { workspace = true } unicode-script = { workspace = true }

4
components/layout_2020/Cargo.toml
View file

@ -46,8 +46,8 @@ servo_arc = { workspace = true }
servo_config = { path = "../config" } servo_config = { path = "../config" }
servo_geometry = { path = "../geometry" } servo_geometry = { path = "../geometry" }
servo_url = { path = "../url" } servo_url = { path = "../url" }
style = { workspace = true } stylo = { workspace = true }
style_traits = { workspace = true } stylo_traits = { workspace = true }
taffy = { workspace = true } taffy = { workspace = true }
tracing = { workspace = true, optional = true } tracing = { workspace = true, optional = true }
unicode-bidi = { workspace = true } unicode-bidi = { workspace = true }

4
components/layout_thread_2020/Cargo.toml
View file

@ -39,8 +39,8 @@ servo_arc = { workspace = true }
stylo_atoms = { workspace = true } stylo_atoms = { workspace = true }
servo_config = { path = "../config" } servo_config = { path = "../config" }
servo_url = { path = "../url" } servo_url = { path = "../url" }
style = { workspace = true } stylo = { workspace = true }
style_traits = { workspace = true } stylo_traits = { workspace = true }
tracing = { workspace = true, optional = true } tracing = { workspace = true, optional = true }
url = { workspace = true } url = { workspace = true }
webrender_api = { workspace = true } webrender_api = { workspace = true }

4
components/malloc_size_of/Cargo.toml
View file

@ -25,9 +25,9 @@ servo_allocator = { path = "../allocator" }
servo_arc = { workspace = true } servo_arc = { workspace = true }
smallvec = { workspace = true } smallvec = { workspace = true }
string_cache = { workspace = true } string_cache = { workspace = true }
style = { workspace = true } stylo = { workspace = true }
stylo_dom = { workspace = true } stylo_dom = { workspace = true }
style_malloc_size_of = { workspace = true } stylo_malloc_size_of = { workspace = true }
thin-vec = { workspace = true } thin-vec = { workspace = true }
tokio = { workspace = true, features = ["sync"] } tokio = { workspace = true, features = ["sync"] }
url = { workspace = true } url = { workspace = true }

54
components/malloc_size_of/lib.rs
View file

@ -52,7 +52,7 @@ use std::hash::{BuildHasher, Hash};
use std::ops::Range; use std::ops::Range;
use std::sync::Arc; use std::sync::Arc;
pub use style_malloc_size_of::MallocSizeOfOps; pub use stylo_malloc_size_of::MallocSizeOfOps;
use uuid::Uuid; use uuid::Uuid;
/// Trait for measuring the "deep" heap usage of a data structure. This is the /// Trait for measuring the "deep" heap usage of a data structure. This is the
@ -750,12 +750,12 @@ malloc_size_of_is_webrender_malloc_size_of!(webrender_api::MixBlendMode);
malloc_size_of_is_webrender_malloc_size_of!(webrender_api::NormalBorder); malloc_size_of_is_webrender_malloc_size_of!(webrender_api::NormalBorder);
malloc_size_of_is_webrender_malloc_size_of!(webrender_api::RepeatMode); malloc_size_of_is_webrender_malloc_size_of!(webrender_api::RepeatMode);
macro_rules! malloc_size_of_is_style_malloc_size_of( macro_rules! malloc_size_of_is_stylo_malloc_size_of(
($($ty:ty),+) => ( ($($ty:ty),+) => (
$( $(
impl MallocSizeOf for $ty { impl MallocSizeOf for $ty {
fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize { fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize {
<$ty as style_malloc_size_of::MallocSizeOf>::size_of(self, ops) <$ty as stylo_malloc_size_of::MallocSizeOf>::size_of(self, ops)
} }
} }
)+ )+
@ -766,10 +766,10 @@ impl<S> MallocSizeOf for style::author_styles::GenericAuthorStyles<S>
where where
S: style::stylesheets::StylesheetInDocument S: style::stylesheets::StylesheetInDocument
+ std::cmp::PartialEq + std::cmp::PartialEq
+ style_malloc_size_of::MallocSizeOf, + stylo_malloc_size_of::MallocSizeOf,
{ {
fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize { fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize {
<style::author_styles::GenericAuthorStyles<S> as style_malloc_size_of::MallocSizeOf>::size_of(self, ops) <style::author_styles::GenericAuthorStyles<S> as stylo_malloc_size_of::MallocSizeOf>::size_of(self, ops)
} }
} }
@ -777,30 +777,30 @@ impl<S> MallocSizeOf for style::stylesheet_set::DocumentStylesheetSet<S>
where where
S: style::stylesheets::StylesheetInDocument S: style::stylesheets::StylesheetInDocument
+ std::cmp::PartialEq + std::cmp::PartialEq
+ style_malloc_size_of::MallocSizeOf, + stylo_malloc_size_of::MallocSizeOf,
{ {
fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize { fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize {
<style::stylesheet_set::DocumentStylesheetSet<S> as style_malloc_size_of::MallocSizeOf>::size_of(self, ops) <style::stylesheet_set::DocumentStylesheetSet<S> as stylo_malloc_size_of::MallocSizeOf>::size_of(self, ops)
} }
} }
malloc_size_of_is_style_malloc_size_of!(style::animation::DocumentAnimationSet); malloc_size_of_is_stylo_malloc_size_of!(style::animation::DocumentAnimationSet);
malloc_size_of_is_style_malloc_size_of!(style::attr::AttrIdentifier); malloc_size_of_is_stylo_malloc_size_of!(style::attr::AttrIdentifier);
malloc_size_of_is_style_malloc_size_of!(style::attr::AttrValue); malloc_size_of_is_stylo_malloc_size_of!(style::attr::AttrValue);
malloc_size_of_is_style_malloc_size_of!(style::color::AbsoluteColor); malloc_size_of_is_stylo_malloc_size_of!(style::color::AbsoluteColor);
malloc_size_of_is_style_malloc_size_of!(style::computed_values::font_variant_caps::T); malloc_size_of_is_stylo_malloc_size_of!(style::computed_values::font_variant_caps::T);
malloc_size_of_is_style_malloc_size_of!(style::dom::OpaqueNode); malloc_size_of_is_stylo_malloc_size_of!(style::dom::OpaqueNode);
malloc_size_of_is_style_malloc_size_of!(style::invalidation::element::restyle_hints::RestyleHint); malloc_size_of_is_stylo_malloc_size_of!(style::invalidation::element::restyle_hints::RestyleHint);
malloc_size_of_is_style_malloc_size_of!(style::media_queries::MediaList); malloc_size_of_is_stylo_malloc_size_of!(style::media_queries::MediaList);
malloc_size_of_is_style_malloc_size_of!(style::properties::style_structs::Font); malloc_size_of_is_stylo_malloc_size_of!(style::properties::style_structs::Font);
malloc_size_of_is_style_malloc_size_of!(style::selector_parser::PseudoElement); malloc_size_of_is_stylo_malloc_size_of!(style::selector_parser::PseudoElement);
malloc_size_of_is_style_malloc_size_of!(style::selector_parser::RestyleDamage); malloc_size_of_is_stylo_malloc_size_of!(style::selector_parser::RestyleDamage);
malloc_size_of_is_style_malloc_size_of!(style::selector_parser::Snapshot); malloc_size_of_is_stylo_malloc_size_of!(style::selector_parser::Snapshot);
malloc_size_of_is_style_malloc_size_of!(style::shared_lock::SharedRwLock); malloc_size_of_is_stylo_malloc_size_of!(style::shared_lock::SharedRwLock);
malloc_size_of_is_style_malloc_size_of!(style::stylesheets::DocumentStyleSheet); malloc_size_of_is_stylo_malloc_size_of!(style::stylesheets::DocumentStyleSheet);
malloc_size_of_is_style_malloc_size_of!(style::stylist::Stylist); malloc_size_of_is_stylo_malloc_size_of!(style::stylist::Stylist);
malloc_size_of_is_style_malloc_size_of!(style::values::computed::FontStretch); malloc_size_of_is_stylo_malloc_size_of!(style::values::computed::FontStretch);
malloc_size_of_is_style_malloc_size_of!(style::values::computed::FontStyle); malloc_size_of_is_stylo_malloc_size_of!(style::values::computed::FontStyle);
malloc_size_of_is_style_malloc_size_of!(style::values::computed::FontWeight); malloc_size_of_is_stylo_malloc_size_of!(style::values::computed::FontWeight);
malloc_size_of_is_style_malloc_size_of!(style::values::computed::font::SingleFontFamily); malloc_size_of_is_stylo_malloc_size_of!(style::values::computed::font::SingleFontFamily);
malloc_size_of_is_style_malloc_size_of!(stylo_dom::ElementState); malloc_size_of_is_stylo_malloc_size_of!(stylo_dom::ElementState);

6
components/script/Cargo.toml
View file

@ -111,13 +111,13 @@ servo_geometry = { path = "../geometry" }
servo_rand = { path = "../rand" } servo_rand = { path = "../rand" }
servo_url = { path = "../url" } servo_url = { path = "../url" }
smallvec = { workspace = true, features = ["union"] } smallvec = { workspace = true, features = ["union"] }
style_malloc_size_of = { workspace = true } stylo_malloc_size_of = { workspace = true }
glow = { workspace = true } glow = { workspace = true }
strum = { workspace = true } strum = { workspace = true }
strum_macros = { workspace = true } strum_macros = { workspace = true }
style = { workspace = true } stylo = { workspace = true }
stylo_dom = { workspace = true } stylo_dom = { workspace = true }
style_traits = { workspace = true } stylo_traits = { workspace = true }
swapper = "0.1" swapper = "0.1"
tempfile = "3" tempfile = "3"
tendril = { version = "0.4.1", features = ["encoding_rs"] } tendril = { version = "0.4.1", features = ["encoding_rs"] }

4
components/script/dom/documentorshadowroot.rs
View file

@ -41,8 +41,8 @@ pub(crate) struct StyleSheetInDocument {
// This is necessary because this type is contained within a Stylo type which needs // This is necessary because this type is contained within a Stylo type which needs
// Stylo's version of MallocSizeOf. // Stylo's version of MallocSizeOf.
impl style_malloc_size_of::MallocSizeOf for StyleSheetInDocument { impl stylo_malloc_size_of::MallocSizeOf for StyleSheetInDocument {
fn size_of(&self, ops: &mut style_malloc_size_of::MallocSizeOfOps) -> usize { fn size_of(&self, ops: &mut stylo_malloc_size_of::MallocSizeOfOps) -> usize {
<StyleSheetInDocument as malloc_size_of::MallocSizeOf>::size_of(self, ops) <StyleSheetInDocument as malloc_size_of::MallocSizeOf>::size_of(self, ops)
} }
} }

2
components/script_bindings/Cargo.toml
View file

@ -39,7 +39,7 @@ servo_arc = { workspace = true }
smallvec = { workspace = true } smallvec = { workspace = true }
stylo_atoms = { workspace = true } stylo_atoms = { workspace = true }
servo_config = { path = "../config" } servo_config = { path = "../config" }
style = { workspace = true } stylo = { workspace = true }
tendril = { version = "0.4.1", features = ["encoding_rs"] } tendril = { version = "0.4.1", features = ["encoding_rs"] }
webxr-api = { workspace = true, optional = true } webxr-api = { workspace = true, optional = true }
xml5ever = { workspace = true } xml5ever = { workspace = true }

4
components/servo/Cargo.toml
View file

@ -98,8 +98,8 @@ servo-media-gstreamer = { workspace = true, optional = true }
servo_config = { path = "../config" } servo_config = { path = "../config" }
servo_geometry = { path = "../geometry" } servo_geometry = { path = "../geometry" }
servo_url = { path = "../url" } servo_url = { path = "../url" }
style = { workspace = true } stylo = { workspace = true }
style_traits = { workspace = true } stylo_traits = { workspace = true }
surfman = { workspace = true } surfman = { workspace = true }
tracing = { workspace = true, optional = true } tracing = { workspace = true, optional = true }
url = { workspace = true } url = { workspace = true }

4
components/shared/canvas/Cargo.toml
View file

@ -18,6 +18,7 @@ webgl_backtrace = []
base = { workspace = true } base = { workspace = true }
crossbeam-channel = { workspace = true } crossbeam-channel = { workspace = true }
euclid = { workspace = true } euclid = { workspace = true }
glow = { workspace = true }
ipc-channel = { workspace = true } ipc-channel = { workspace = true }
malloc_size_of = { workspace = true } malloc_size_of = { workspace = true }
malloc_size_of_derive = { workspace = true } malloc_size_of_derive = { workspace = true }
@ -25,7 +26,6 @@ pixels = { path = "../../pixels" }
serde = { workspace = true } serde = { workspace = true }
serde_bytes = { workspace = true } serde_bytes = { workspace = true }
servo_config = { path = "../../config" } servo_config = { path = "../../config" }
glow = { workspace = true } stylo = { workspace = true }
style = { workspace = true }
webrender_api = { workspace = true } webrender_api = { workspace = true }
webxr-api = { workspace = true, features = ["ipc"] } webxr-api = { workspace = true, features = ["ipc"] }

2
components/shared/compositing/Cargo.toml
View file

@ -23,6 +23,6 @@ pixels = { path = '../../pixels' }
script_traits = { workspace = true } script_traits = { workspace = true }
servo_url = { path = "../../url" } servo_url = { path = "../../url" }
strum_macros = { workspace = true } strum_macros = { workspace = true }
style_traits = { workspace = true } stylo_traits = { workspace = true }
webrender_api = { workspace = true } webrender_api = { workspace = true }
webrender_traits = { workspace = true } webrender_traits = { workspace = true }

2
components/shared/embedder/Cargo.toml
View file

@ -33,7 +33,7 @@ pixels = { path = "../../pixels" }
serde = { workspace = true } serde = { workspace = true }
servo_url = { path = "../../url" } servo_url = { path = "../../url" }
strum_macros = { workspace = true } strum_macros = { workspace = true }
style_traits = { workspace = true } stylo_traits = { workspace = true }
url = { workspace = true } url = { workspace = true }
webdriver = { workspace = true } webdriver = { workspace = true }
webrender_api = { workspace = true } webrender_api = { workspace = true }

2
components/shared/script/Cargo.toml
View file

@ -43,7 +43,7 @@ strum_macros = { workspace = true }
stylo_atoms = { workspace = true } stylo_atoms = { workspace = true }
servo_url = { path = "../../url" } servo_url = { path = "../../url" }
strum = { workspace = true, features = ["derive"] } strum = { workspace = true, features = ["derive"] }
style_traits = { workspace = true } stylo_traits = { workspace = true }
uuid = { workspace = true } uuid = { workspace = true }
webdriver = { workspace = true } webdriver = { workspace = true }
webgpu = { path = "../../webgpu" } webgpu = { path = "../../webgpu" }

4
components/shared/script_layout/Cargo.toml
View file

@ -35,7 +35,7 @@ selectors = { workspace = true }
serde = { workspace = true } serde = { workspace = true }
servo_arc = { workspace = true } servo_arc = { workspace = true }
servo_url = { path = "../../url" } servo_url = { path = "../../url" }
style = { workspace = true } stylo = { workspace = true }
style_traits = { workspace = true } stylo_traits = { workspace = true }
webrender_api = { workspace = true } webrender_api = { workspace = true }
webrender_traits = { workspace = true } webrender_traits = { workspace = true }

2
components/shared/webrender/Cargo.toml
View file

@ -29,7 +29,7 @@ webrender_api = { workspace = true }
serde = { workspace = true } serde = { workspace = true }
servo_geometry = { path = "../../geometry" } servo_geometry = { path = "../../geometry" }
servo-media = { workspace = true } servo-media = { workspace = true }
style = { workspace = true } stylo = { workspace = true }
surfman = { workspace = true, features = ["sm-x11"] } surfman = { workspace = true, features = ["sm-x11"] }
raw-window-handle = { version = "0.6" } raw-window-handle = { version = "0.6" }
dpi = { version = "0.1" } dpi = { version = "0.1" }

2
components/webdriver_server/Cargo.toml
View file

@ -31,6 +31,6 @@ serde = { workspace = true }
serde_json = { workspace = true } serde_json = { workspace = true }
servo_config = { path = "../config" } servo_config = { path = "../config" }
servo_url = { path = "../url" } servo_url = { path = "../url" }
style_traits = { workspace = true } stylo_traits = { workspace = true }
uuid = { workspace = true } uuid = { workspace = true }
webdriver = { workspace = true } webdriver = { workspace = true }

4
tests/unit/style/Cargo.toml
View file

@ -22,6 +22,6 @@ serde_json = { workspace = true }
selectors = { workspace = true } selectors = { workspace = true }
servo_arc = { workspace = true } servo_arc = { workspace = true }
stylo_atoms = { workspace = true } stylo_atoms = { workspace = true }
style = { workspace = true } stylo = { workspace = true }
style_traits = { workspace = true } stylo_traits = { workspace = true }
url = { workspace = true } url = { workspace = true }