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

style: Make #[css(field_bound)] and #[css(iterable)] work properly

Browse source 
For now, use IntoIterator to figure the right type to add the bound.

If we need this on types that are iterable but don't provide
IntoIterator, we can add another attribute field or something.

Differential Revision: https://phabricator.services.mozilla.com/D129962
This commit is contained in:
Emilio Cobos Álvarez 2023-06-07 14:03:41 +02:00 • committed by Oriol Brufau
parent 155fbf8804
commit 327812e3eb
2 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/style_derive/to_css.rs
View file

@ -140,11 +140,19 @@ fn derive_variant_fields_expr(
Some(pair) => pair,
None => return quote! { Ok(()) },
};
if attrs.field_bound {
let ty = &first.ast().ty;
// TODO(emilio): IntoIterator might not be enough for every type of
// iterable thing (like ArcSlice<> or what not). We might want to expose
// an `item = "T"` attribute to handle that in the future.
let predicate = if attrs.iterable {
parse_quote!(<#ty as IntoIterator>::Item: style_traits::ToCss)
} else {
parse_quote!(#ty: style_traits::ToCss)
};
cg::add_predicate(where_clause, predicate);
}
if !attrs.iterable && iter.peek().is_none() {
if attrs.field_bound {
let ty = &first.ast().ty;
cg::add_predicate(where_clause, parse_quote!(#ty: style_traits::ToCss));
}
let mut expr = quote! { style_traits::ToCss::to_css(#first, dest) };
if let Some(condition) = attrs.skip_if {
expr = quote! {

16
components/style_traits/owned_slice.rs
View file

@ -93,12 +93,6 @@ impl<T: Sized> OwnedSlice<T> {
ret
}
/// Iterate over all the elements in the slice taking ownership of them.
#[inline]
pub fn into_iter(self) -> impl Iterator<Item = T> + ExactSizeIterator {
self.into_vec().into_iter()
}
/// Convert the regular slice into an owned slice.
#[inline]
pub fn from_slice(s: &[T]) -> Self
@ -109,6 +103,16 @@ impl<T: Sized> OwnedSlice<T> {
}
}
impl<T> IntoIterator for OwnedSlice<T> {
type Item = T;
type IntoIter = <Vec<T> as IntoIterator>::IntoIter;
#[inline]
fn into_iter(self) -> Self::IntoIter {
self.into_vec().into_iter()
}
}
impl<T> Deref for OwnedSlice<T> {
type Target = [T];