mirror of
https://github.com/servo/servo.git
synced 2025-08-07 14:35:33 +01:00
Auto merge of #20258 - servo:derive-all-the-things, r=emilio
Continue to improve style_derive <!-- Reviewable:start --> This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/20258) <!-- Reviewable:end -->
This commit is contained in:
commit
909ebff184
8 changed files with 80 additions and 84 deletions
|
@ -293,8 +293,7 @@ impl<'a, 'cx, 'cx_a: 'cx, S: ToComputedValue + 'a> Iterator for ComputedVecIter<
|
|||
///
|
||||
/// This trait is derivable with `#[derive(ToComputedValue)]`. The derived
|
||||
/// implementation just calls `ToComputedValue::to_computed_value` on each field
|
||||
/// of the passed value, or `Clone::clone` if the field is annotated with
|
||||
/// `#[compute(clone)]`. The deriving code assumes that if the type isn't
|
||||
/// of the passed value. The deriving code assumes that if the type isn't
|
||||
/// generic, then the trait can be implemented as simple `Clone::clone` calls,
|
||||
/// this means that a manual implementation with `ComputedValue = Self` is bogus
|
||||
/// if it returns anything else than a clone.
|
||||
|
|
|
@ -11,7 +11,7 @@ use values::{CSSFloat, serialize_percentage};
|
|||
/// A computed percentage.
|
||||
#[cfg_attr(feature = "servo", derive(Deserialize, Serialize))]
|
||||
#[derive(Animate, Clone, ComputeSquaredDistance, Copy, Debug, Default, MallocSizeOf)]
|
||||
#[derive(PartialEq, PartialOrd, ToAnimatedZero)]
|
||||
#[derive(PartialEq, PartialOrd, ToAnimatedZero, ToComputedValue)]
|
||||
pub struct Percentage(pub CSSFloat);
|
||||
|
||||
impl Percentage {
|
||||
|
|
|
@ -388,7 +388,6 @@ pub struct TrackRepeat<L, I> {
|
|||
/// If there's no `<line-names>`, then it's represented by an empty vector.
|
||||
/// For N `<track-size>` values, there will be N+1 `<line-names>`, and so this vector's
|
||||
/// length is always one value more than that of the `<track-size>`.
|
||||
#[compute(clone)]
|
||||
pub line_names: Box<[Box<[CustomIdent]>]>,
|
||||
/// `<track-size>` values.
|
||||
pub track_sizes: Vec<TrackSize<L>>,
|
||||
|
@ -667,7 +666,7 @@ pub enum GridTemplateComponent<L, I> {
|
|||
/// `none` value.
|
||||
None,
|
||||
/// The grid `<track-list>`
|
||||
TrackList(TrackList<L, I>),
|
||||
TrackList(#[compute(field_bound)] TrackList<L, I>),
|
||||
/// A `subgrid <line-name-list>?`
|
||||
Subgrid(LineNameList),
|
||||
}
|
||||
|
|
|
@ -42,10 +42,8 @@ pub struct Gradient<LineDirection, Length, LengthOrPercentage, Position, Color,
|
|||
/// The color stops and interpolation hints.
|
||||
pub items: Vec<GradientItem<Color, LengthOrPercentage>>,
|
||||
/// True if this is a repeating gradient.
|
||||
#[compute(clone)]
|
||||
pub repeating: bool,
|
||||
/// Compatibility mode.
|
||||
#[compute(clone)]
|
||||
pub compat_mode: CompatMode,
|
||||
}
|
||||
|
||||
|
|
|
@ -247,7 +247,6 @@ pub enum TransformOperation<Angle, Number, Length, Integer, LengthOrPercentage>
|
|||
#[allow(missing_docs)]
|
||||
#[css(comma, function = "interpolatematrix")]
|
||||
InterpolateMatrix {
|
||||
#[compute(ignore_bound)]
|
||||
from_list: Transform<
|
||||
TransformOperation<
|
||||
Angle,
|
||||
|
@ -257,7 +256,6 @@ pub enum TransformOperation<Angle, Number, Length, Integer, LengthOrPercentage>
|
|||
LengthOrPercentage,
|
||||
>,
|
||||
>,
|
||||
#[compute(ignore_bound)]
|
||||
to_list: Transform<
|
||||
TransformOperation<
|
||||
Angle,
|
||||
|
@ -267,14 +265,12 @@ pub enum TransformOperation<Angle, Number, Length, Integer, LengthOrPercentage>
|
|||
LengthOrPercentage,
|
||||
>,
|
||||
>,
|
||||
#[compute(clone)]
|
||||
progress: computed::Percentage,
|
||||
},
|
||||
/// A intermediate type for accumulation of mismatched transform lists.
|
||||
#[allow(missing_docs)]
|
||||
#[css(comma, function = "accumulatematrix")]
|
||||
AccumulateMatrix {
|
||||
#[compute(ignore_bound)]
|
||||
from_list: Transform<
|
||||
TransformOperation<
|
||||
Angle,
|
||||
|
@ -284,7 +280,6 @@ pub enum TransformOperation<Angle, Number, Length, Integer, LengthOrPercentage>
|
|||
LengthOrPercentage,
|
||||
>,
|
||||
>,
|
||||
#[compute(ignore_bound)]
|
||||
to_list: Transform<
|
||||
TransformOperation<
|
||||
Angle,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue