Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +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

4
components/malloc_size_of/Cargo.toml
View file

@ -25,9 +25,9 @@ servo_allocator = { path = "../allocator" }
servo_arc = { workspace = true }
smallvec = { workspace = true }
string_cache = { workspace = true }
style = { workspace = true }
stylo = { workspace = true }
stylo_dom = { workspace = true }
style_malloc_size_of = { workspace = true }
stylo_malloc_size_of = { workspace = true }
thin-vec = { workspace = true }
tokio = { workspace = true, features = ["sync"] }
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::sync::Arc;
pub use style_malloc_size_of::MallocSizeOfOps;
pub use stylo_malloc_size_of::MallocSizeOfOps;
use uuid::Uuid;
/// 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::RepeatMode);
macro_rules! malloc_size_of_is_style_malloc_size_of(
macro_rules! malloc_size_of_is_stylo_malloc_size_of(
($($ty:ty),+) => (
$(
impl MallocSizeOf for $ty {
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
S: style::stylesheets::StylesheetInDocument
+ std::cmp::PartialEq
+ style_malloc_size_of::MallocSizeOf,
+ stylo_malloc_size_of::MallocSizeOf,
{
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
S: style::stylesheets::StylesheetInDocument
+ std::cmp::PartialEq
+ style_malloc_size_of::MallocSizeOf,
+ stylo_malloc_size_of::MallocSizeOf,
{
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_style_malloc_size_of!(style::attr::AttrIdentifier);
malloc_size_of_is_style_malloc_size_of!(style::attr::AttrValue);
malloc_size_of_is_style_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_style_malloc_size_of!(style::dom::OpaqueNode);
malloc_size_of_is_style_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_style_malloc_size_of!(style::properties::style_structs::Font);
malloc_size_of_is_style_malloc_size_of!(style::selector_parser::PseudoElement);
malloc_size_of_is_style_malloc_size_of!(style::selector_parser::RestyleDamage);
malloc_size_of_is_style_malloc_size_of!(style::selector_parser::Snapshot);
malloc_size_of_is_style_malloc_size_of!(style::shared_lock::SharedRwLock);
malloc_size_of_is_style_malloc_size_of!(style::stylesheets::DocumentStyleSheet);
malloc_size_of_is_style_malloc_size_of!(style::stylist::Stylist);
malloc_size_of_is_style_malloc_size_of!(style::values::computed::FontStretch);
malloc_size_of_is_style_malloc_size_of!(style::values::computed::FontStyle);
malloc_size_of_is_style_malloc_size_of!(style::values::computed::FontWeight);
malloc_size_of_is_style_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!(style::animation::DocumentAnimationSet);
malloc_size_of_is_stylo_malloc_size_of!(style::attr::AttrIdentifier);
malloc_size_of_is_stylo_malloc_size_of!(style::attr::AttrValue);
malloc_size_of_is_stylo_malloc_size_of!(style::color::AbsoluteColor);
malloc_size_of_is_stylo_malloc_size_of!(style::computed_values::font_variant_caps::T);
malloc_size_of_is_stylo_malloc_size_of!(style::dom::OpaqueNode);
malloc_size_of_is_stylo_malloc_size_of!(style::invalidation::element::restyle_hints::RestyleHint);
malloc_size_of_is_stylo_malloc_size_of!(style::media_queries::MediaList);
malloc_size_of_is_stylo_malloc_size_of!(style::properties::style_structs::Font);
malloc_size_of_is_stylo_malloc_size_of!(style::selector_parser::PseudoElement);
malloc_size_of_is_stylo_malloc_size_of!(style::selector_parser::RestyleDamage);
malloc_size_of_is_stylo_malloc_size_of!(style::selector_parser::Snapshot);
malloc_size_of_is_stylo_malloc_size_of!(style::shared_lock::SharedRwLock);
malloc_size_of_is_stylo_malloc_size_of!(style::stylesheets::DocumentStyleSheet);
malloc_size_of_is_stylo_malloc_size_of!(style::stylist::Stylist);
malloc_size_of_is_stylo_malloc_size_of!(style::values::computed::FontStretch);
malloc_size_of_is_stylo_malloc_size_of!(style::values::computed::FontStyle);
malloc_size_of_is_stylo_malloc_size_of!(style::values::computed::FontWeight);
malloc_size_of_is_stylo_malloc_size_of!(style::values::computed::font::SingleFontFamily);
malloc_size_of_is_stylo_malloc_size_of!(stylo_dom::ElementState);