From 4d8fc4b8f74808a8b8383238bb4085bb4279a228 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Date: Thu, 15 Aug 2019 15:41:34 +0200 Subject: [PATCH] style: Fix formatting of recent changes. --- components/style/gecko/pseudo_element.rs | 5 +- components/style/style_adjuster.rs | 10 +- components/style/values/computed/mod.rs | 2 +- components/style/values/computed/text.rs | 2 +- components/style/values/generics/grid.rs | 13 +- components/style/values/specified/box.rs | 265 +++++++++++----------- components/style/values/specified/grid.rs | 15 +- components/style/values/specified/text.rs | 4 +- servo-tidy.toml | 1 + 9 files changed, 157 insertions(+), 160 deletions(-) diff --git a/components/style/gecko/pseudo_element.rs b/components/style/gecko/pseudo_element.rs index 9bea09b45ee..aa849ceee02 100644 --- a/components/style/gecko/pseudo_element.rs +++ b/components/style/gecko/pseudo_element.rs @@ -187,8 +187,9 @@ impl PseudoElement { PseudoElement::FirstLine => PropertyFlags::APPLIES_TO_FIRST_LINE, PseudoElement::Placeholder => PropertyFlags::APPLIES_TO_PLACEHOLDER, PseudoElement::Cue => PropertyFlags::APPLIES_TO_CUE, - PseudoElement::Marker if static_prefs::pref!("layout.css.marker.restricted") => - PropertyFlags::APPLIES_TO_MARKER, + PseudoElement::Marker if static_prefs::pref!("layout.css.marker.restricted") => { + PropertyFlags::APPLIES_TO_MARKER + }, _ => return None, }) } diff --git a/components/style/style_adjuster.rs b/components/style/style_adjuster.rs index 747b945e777..de8f7aa63d4 100644 --- a/components/style/style_adjuster.rs +++ b/components/style/style_adjuster.rs @@ -8,12 +8,12 @@ use crate::dom::TElement; use crate::properties::computed_value_flags::ComputedValueFlags; use crate::properties::longhands::display::computed_value::T as Display; -#[cfg(feature = "gecko")] -use crate::values::specified::box_::DisplayInside; use crate::properties::longhands::float::computed_value::T as Float; use crate::properties::longhands::overflow_x::computed_value::T as Overflow; use crate::properties::longhands::position::computed_value::T as Position; use crate::properties::{self, ComputedValues, StyleBuilder}; +#[cfg(feature = "gecko")] +use crate::values::specified::box_::DisplayInside; use app_units::Au; /// A struct that implements all the adjustment methods. @@ -209,8 +209,10 @@ impl<'a, 'b: 'a> StyleAdjuster<'a, 'b> { #[cfg(feature = "gecko")] blockify_if!( self.style.pseudo.map_or(false, |p| p.is_marker()) && - self.style.get_parent_list().clone_list_style_position() == ListStylePosition::Outside && - layout_parent_style.get_box().clone_display().inside() != DisplayInside::Inline); + self.style.get_parent_list().clone_list_style_position() == + ListStylePosition::Outside && + layout_parent_style.get_box().clone_display().inside() != DisplayInside::Inline + ); if !blockify { return; diff --git a/components/style/values/computed/mod.rs b/components/style/values/computed/mod.rs index a7a449a10ff..bd78d376b35 100644 --- a/components/style/values/computed/mod.rs +++ b/components/style/values/computed/mod.rs @@ -76,10 +76,10 @@ pub use self::svg::MozContextProperties; pub use self::svg::{SVGLength, SVGOpacity, SVGPaint, SVGPaintKind}; pub use self::svg::{SVGPaintOrder, SVGStrokeDashArray, SVGWidth}; pub use self::table::XSpan; -pub use self::text::{TextDecorationLength, TextDecorationSkipInk}; pub use self::text::{InitialLetter, LetterSpacing, LineBreak, LineHeight}; pub use self::text::{OverflowWrap, TextOverflow, WordBreak, WordSpacing}; pub use self::text::{TextAlign, TextEmphasisPosition, TextEmphasisStyle}; +pub use self::text::{TextDecorationLength, TextDecorationSkipInk}; pub use self::time::Time; pub use self::transform::{Rotate, Scale, Transform, TransformOperation}; pub use self::transform::{TransformOrigin, TransformStyle, Translate}; diff --git a/components/style/values/computed/text.rs b/components/style/values/computed/text.rs index 53c236e4761..bdb2ac507bc 100644 --- a/components/style/values/computed/text.rs +++ b/components/style/values/computed/text.rs @@ -10,7 +10,7 @@ use crate::values::computed::length::{Length, LengthPercentage}; use crate::values::computed::{Context, NonNegativeLength, NonNegativeNumber, ToComputedValue}; use crate::values::generics::text::InitialLetter as GenericInitialLetter; use crate::values::generics::text::LineHeight as GenericLineHeight; -use crate::values::generics::text::{Spacing, GenericTextDecorationLength}; +use crate::values::generics::text::{GenericTextDecorationLength, Spacing}; use crate::values::specified::text::{self as specified, TextOverflowSide}; use crate::values::specified::text::{TextEmphasisFillMode, TextEmphasisShapeKeyword}; use crate::values::{CSSFloat, CSSInteger}; diff --git a/components/style/values/generics/grid.rs b/components/style/values/generics/grid.rs index 876186696a2..b9e173ea50f 100644 --- a/components/style/values/generics/grid.rs +++ b/components/style/values/generics/grid.rs @@ -419,7 +419,7 @@ impl Parse for RepeatCount { if i.value() > MAX_GRID_LINE { i = specified::Integer::new(MAX_GRID_LINE); } - return Ok(RepeatCount::Number(i)) + return Ok(RepeatCount::Number(i)); } try_match_ident_ignore_ascii_case! { input, "auto-fill" => Ok(RepeatCount::AutoFill), @@ -527,7 +527,16 @@ impl TrackListValue { /// A grid `` type. /// /// -#[derive(Clone, Debug, MallocSizeOf, PartialEq, SpecifiedValueInfo, ToComputedValue, ToResolvedValue, ToShmem)] +#[derive( + Clone, + Debug, + MallocSizeOf, + PartialEq, + SpecifiedValueInfo, + ToComputedValue, + ToResolvedValue, + ToShmem, +)] #[repr(C)] pub struct GenericTrackList { /// The index in `values` where our `` value is, if in bounds. diff --git a/components/style/values/specified/box.rs b/components/style/values/specified/box.rs index 015153c76bc..3ed9bccb1d1 100644 --- a/components/style/values/specified/box.rs +++ b/components/style/values/specified/box.rs @@ -51,18 +51,7 @@ fn parse_unimplemented_in_servo_2020(_context: &ParserContext) -> bool { /// the two basic qualities of how an element generates boxes /// #[allow(missing_docs)] -#[derive( - MallocSizeOf, - ToShmem, - Clone, - Copy, - Debug, - Eq, - FromPrimitive, - Hash, - PartialEq, - ToCss, -)] +#[derive(Clone, Copy, Debug, Eq, FromPrimitive, Hash, MallocSizeOf, PartialEq, ToCss, ToShmem)] #[cfg(feature = "gecko")] #[repr(u8)] pub enum DisplayOutside { @@ -76,18 +65,7 @@ pub enum DisplayOutside { } #[allow(missing_docs)] -#[derive( - MallocSizeOf, - ToShmem, - Clone, - Copy, - Debug, - Eq, - FromPrimitive, - Hash, - PartialEq, - ToCss, -)] +#[derive(Clone, Copy, Debug, Eq, FromPrimitive, Hash, MallocSizeOf, PartialEq, ToCss, ToShmem)] #[cfg(feature = "gecko")] #[repr(u8)] pub enum DisplayInside { @@ -150,68 +128,85 @@ pub struct Display(u16); #[cfg(feature = "gecko")] impl Display { // Our u16 bits are used as follows: LOOOOOOOIIIIIIII - const LIST_ITEM_BIT : u16 = 0x8000; //^ - const DISPLAY_OUTSIDE_BITS : u16 = 7; // ^^^^^^^ - const DISPLAY_INSIDE_BITS : u16 = 8; // ^^^^^^^^ + const LIST_ITEM_BIT: u16 = 0x8000; //^ + const DISPLAY_OUTSIDE_BITS: u16 = 7; // ^^^^^^^ + const DISPLAY_INSIDE_BITS: u16 = 8; // ^^^^^^^^ /// https://drafts.csswg.org/css-display/#the-display-properties - pub const None : Self = Self::new(DisplayOutside::None, DisplayInside::None); - pub const Contents : Self = Self::new(DisplayOutside::None, DisplayInside::Contents); - pub const Inline : Self = Self::new(DisplayOutside::Inline, DisplayInside::Inline); - pub const InlineBlock : Self = Self::new(DisplayOutside::Inline, DisplayInside::FlowRoot); - pub const Block : Self = Self::new(DisplayOutside::Block, DisplayInside::Block); - pub const FlowRoot : Self = Self::new(DisplayOutside::Block, DisplayInside::FlowRoot); - pub const Flex : Self = Self::new(DisplayOutside::Block, DisplayInside::Flex); - pub const InlineFlex : Self = Self::new(DisplayOutside::Inline, DisplayInside::Flex); - pub const Grid : Self = Self::new(DisplayOutside::Block, DisplayInside::Grid); - pub const InlineGrid : Self = Self::new(DisplayOutside::Inline, DisplayInside::Grid); - pub const Table : Self = Self::new(DisplayOutside::Block, DisplayInside::Table); - pub const InlineTable : Self = Self::new(DisplayOutside::Inline, DisplayInside::Table); - pub const TableCaption : Self = Self::new(DisplayOutside::TableCaption, DisplayInside::Block); - pub const Ruby : Self = Self::new(DisplayOutside::Inline, DisplayInside::Ruby); - pub const WebkitBox : Self = Self::new(DisplayOutside::Block, DisplayInside::WebkitBox); - pub const WebkitInlineBox : Self = Self::new(DisplayOutside::Inline, DisplayInside::WebkitBox); - pub const ListItem : Self = Self::new_list_item(DisplayOutside::Block, DisplayInside::Block); + pub const None: Self = Self::new(DisplayOutside::None, DisplayInside::None); + pub const Contents: Self = Self::new(DisplayOutside::None, DisplayInside::Contents); + pub const Inline: Self = Self::new(DisplayOutside::Inline, DisplayInside::Inline); + pub const InlineBlock: Self = Self::new(DisplayOutside::Inline, DisplayInside::FlowRoot); + pub const Block: Self = Self::new(DisplayOutside::Block, DisplayInside::Block); + pub const FlowRoot: Self = Self::new(DisplayOutside::Block, DisplayInside::FlowRoot); + pub const Flex: Self = Self::new(DisplayOutside::Block, DisplayInside::Flex); + pub const InlineFlex: Self = Self::new(DisplayOutside::Inline, DisplayInside::Flex); + pub const Grid: Self = Self::new(DisplayOutside::Block, DisplayInside::Grid); + pub const InlineGrid: Self = Self::new(DisplayOutside::Inline, DisplayInside::Grid); + pub const Table: Self = Self::new(DisplayOutside::Block, DisplayInside::Table); + pub const InlineTable: Self = Self::new(DisplayOutside::Inline, DisplayInside::Table); + pub const TableCaption: Self = Self::new(DisplayOutside::TableCaption, DisplayInside::Block); + pub const Ruby: Self = Self::new(DisplayOutside::Inline, DisplayInside::Ruby); + pub const WebkitBox: Self = Self::new(DisplayOutside::Block, DisplayInside::WebkitBox); + pub const WebkitInlineBox: Self = Self::new(DisplayOutside::Inline, DisplayInside::WebkitBox); + pub const ListItem: Self = Self::new_list_item(DisplayOutside::Block, DisplayInside::Block); /// Internal table boxes. - pub const TableRowGroup : Self = Self::new(DisplayOutside::InternalTable, DisplayInside::TableRowGroup); - pub const TableHeaderGroup : Self = Self::new(DisplayOutside::InternalTable, DisplayInside::TableHeaderGroup); - pub const TableFooterGroup : Self = Self::new(DisplayOutside::InternalTable, DisplayInside::TableFooterGroup); - pub const TableColumn : Self = Self::new(DisplayOutside::InternalTable, DisplayInside::TableColumn); - pub const TableColumnGroup : Self = Self::new(DisplayOutside::InternalTable, DisplayInside::TableColumnGroup); - pub const TableRow : Self = Self::new(DisplayOutside::InternalTable, DisplayInside::TableRow); - pub const TableCell : Self = Self::new(DisplayOutside::InternalTable, DisplayInside::TableCell); + pub const TableRowGroup: Self = + Self::new(DisplayOutside::InternalTable, DisplayInside::TableRowGroup); + pub const TableHeaderGroup: Self = Self::new( + DisplayOutside::InternalTable, + DisplayInside::TableHeaderGroup, + ); + pub const TableFooterGroup: Self = Self::new( + DisplayOutside::InternalTable, + DisplayInside::TableFooterGroup, + ); + pub const TableColumn: Self = + Self::new(DisplayOutside::InternalTable, DisplayInside::TableColumn); + pub const TableColumnGroup: Self = Self::new( + DisplayOutside::InternalTable, + DisplayInside::TableColumnGroup, + ); + pub const TableRow: Self = Self::new(DisplayOutside::InternalTable, DisplayInside::TableRow); + pub const TableCell: Self = Self::new(DisplayOutside::InternalTable, DisplayInside::TableCell); /// Internal ruby boxes. - pub const RubyBase : Self = Self::new(DisplayOutside::InternalRuby, DisplayInside::RubyBase); - pub const RubyBaseContainer : Self = Self::new(DisplayOutside::InternalRuby, DisplayInside::RubyBaseContainer); - pub const RubyText : Self = Self::new(DisplayOutside::InternalRuby, DisplayInside::RubyText); - pub const RubyTextContainer : Self = Self::new(DisplayOutside::InternalRuby, DisplayInside::RubyTextContainer); + pub const RubyBase: Self = Self::new(DisplayOutside::InternalRuby, DisplayInside::RubyBase); + pub const RubyBaseContainer: Self = Self::new( + DisplayOutside::InternalRuby, + DisplayInside::RubyBaseContainer, + ); + pub const RubyText: Self = Self::new(DisplayOutside::InternalRuby, DisplayInside::RubyText); + pub const RubyTextContainer: Self = Self::new( + DisplayOutside::InternalRuby, + DisplayInside::RubyTextContainer, + ); /// XUL boxes. - pub const MozBox : Self = Self::new(DisplayOutside::XUL, DisplayInside::MozBox); - pub const MozInlineBox : Self = Self::new(DisplayOutside::XUL, DisplayInside::MozInlineBox); - pub const MozGrid : Self = Self::new(DisplayOutside::XUL, DisplayInside::MozGrid); - pub const MozInlineGrid : Self = Self::new(DisplayOutside::XUL, DisplayInside::MozInlineGrid); - pub const MozGridGroup : Self = Self::new(DisplayOutside::XUL, DisplayInside::MozGridGroup); - pub const MozGridLine : Self = Self::new(DisplayOutside::XUL, DisplayInside::MozGridLine); - pub const MozStack : Self = Self::new(DisplayOutside::XUL, DisplayInside::MozStack); - pub const MozInlineStack : Self = Self::new(DisplayOutside::XUL, DisplayInside::MozInlineStack); - pub const MozDeck : Self = Self::new(DisplayOutside::XUL, DisplayInside::MozDeck); - pub const MozGroupbox : Self = Self::new(DisplayOutside::XUL, DisplayInside::MozGroupbox); - pub const MozPopup : Self = Self::new(DisplayOutside::XUL, DisplayInside::MozPopup); + pub const MozBox: Self = Self::new(DisplayOutside::XUL, DisplayInside::MozBox); + pub const MozInlineBox: Self = Self::new(DisplayOutside::XUL, DisplayInside::MozInlineBox); + pub const MozGrid: Self = Self::new(DisplayOutside::XUL, DisplayInside::MozGrid); + pub const MozInlineGrid: Self = Self::new(DisplayOutside::XUL, DisplayInside::MozInlineGrid); + pub const MozGridGroup: Self = Self::new(DisplayOutside::XUL, DisplayInside::MozGridGroup); + pub const MozGridLine: Self = Self::new(DisplayOutside::XUL, DisplayInside::MozGridLine); + pub const MozStack: Self = Self::new(DisplayOutside::XUL, DisplayInside::MozStack); + pub const MozInlineStack: Self = Self::new(DisplayOutside::XUL, DisplayInside::MozInlineStack); + pub const MozDeck: Self = Self::new(DisplayOutside::XUL, DisplayInside::MozDeck); + pub const MozGroupbox: Self = Self::new(DisplayOutside::XUL, DisplayInside::MozGroupbox); + pub const MozPopup: Self = Self::new(DisplayOutside::XUL, DisplayInside::MozPopup); /// Make a raw display value from and values. #[inline] - const fn new(outside:DisplayOutside, inside:DisplayInside) -> Self { - let o : u16 = ((outside as u8) as u16) << Self::DISPLAY_INSIDE_BITS; - let i : u16 = (inside as u8) as u16; + const fn new(outside: DisplayOutside, inside: DisplayInside) -> Self { + let o: u16 = ((outside as u8) as u16) << Self::DISPLAY_INSIDE_BITS; + let i: u16 = (inside as u8) as u16; Self(o | i) } /// Make a list-item display value from and . #[inline] - const fn new_list_item(outside:DisplayOutside, inside:DisplayInside) -> Self { + const fn new_list_item(outside: DisplayOutside, inside: DisplayInside) -> Self { let v = Self::new(outside, inside); Self(v.0 | Self::LIST_ITEM_BIT) } @@ -220,7 +215,7 @@ impl Display { /// We store `flow` as a synthetic `block` or `inline` inside-value to simplify /// our layout code. #[inline] - fn from3(outside:DisplayOutside, inside:DisplayInside, list_item:bool) -> Self { + fn from3(outside: DisplayOutside, inside: DisplayInside, list_item: bool) -> Self { let inside = match inside { DisplayInside::Flow => match outside { DisplayOutside::Inline => DisplayInside::Inline, @@ -245,8 +240,9 @@ impl Display { #[inline] pub fn outside(&self) -> DisplayOutside { DisplayOutside::from_u16( - (self.0 >> Self::DISPLAY_INSIDE_BITS) & ((1 << Self::DISPLAY_OUTSIDE_BITS) - 1) - ).unwrap() + (self.0 >> Self::DISPLAY_INSIDE_BITS) & ((1 << Self::DISPLAY_OUTSIDE_BITS) - 1), + ) + .unwrap() } /// Returns whether this `display` value is some kind of list-item. @@ -403,7 +399,7 @@ impl Display { } match self.outside() { DisplayOutside::Inline => { - let inside = match self.inside() { + let inside = match self.inside() { DisplayInside::Inline | DisplayInside::FlowRoot => DisplayInside::Block, inside => inside, }; @@ -443,12 +439,10 @@ impl Display { }; Display::from3(DisplayOutside::Inline, inside, self.is_list_item()) }, - DisplayOutside::XUL => { - match self.inside() { - DisplayInside::MozBox => Display::MozInlineBox, - DisplayInside::MozStack => Display::MozInlineStack, - _ => *self, - } + DisplayOutside::XUL => match self.inside() { + DisplayInside::MozBox => Display::MozInlineBox, + DisplayInside::MozStack => Display::MozInlineStack, + _ => *self, }, _ => *self, } @@ -477,8 +471,11 @@ impl ToCss for Display { where W: fmt::Write, { - debug_assert_ne!(self.inside(), DisplayInside::Flow, - "`flow` never appears in `display` computed value"); + debug_assert_ne!( + self.inside(), + DisplayInside::Flow, + "`flow` never appears in `display` computed value" + ); let outside = self.outside(); let inside = match self.inside() { DisplayInside::Block | DisplayInside::Inline => DisplayInside::Flow, @@ -499,10 +496,8 @@ impl ToCss for Display { (DisplayOutside::Inline, DisplayInside::Table) => { dest.write_str("inline-")?; inside.to_css(dest) - } - (DisplayOutside::Block, DisplayInside::Ruby) => { - dest.write_str("block ruby") - } + }, + (DisplayOutside::Block, DisplayInside::Ruby) => dest.write_str("block ruby"), (_, inside) => { if self.is_list_item() { if outside != DisplayOutside::Block { @@ -517,8 +512,8 @@ impl ToCss for Display { } else { inside.to_css(dest) } - } - } + }, + }, } } } @@ -565,17 +560,16 @@ fn parse_display_inside_for_list_item<'i, 't>( } /// Test a Result for same values as above. #[cfg(feature = "gecko")] -fn is_valid_inside_for_list_item<'i>( - inside: &Result>, -) -> bool { - matches!(inside, Ok(DisplayInside::Flow) | Ok(DisplayInside::FlowRoot)) +fn is_valid_inside_for_list_item<'i>(inside: &Result>) -> bool { + matches!( + inside, + Ok(DisplayInside::Flow) | Ok(DisplayInside::FlowRoot) + ) } /// Parse `list-item`. #[cfg(feature = "gecko")] -fn parse_list_item<'i, 't>( - input: &mut Parser<'i, 't>, -) -> Result<(), ParseError<'i>> { +fn parse_list_item<'i, 't>(input: &mut Parser<'i, 't>) -> Result<(), ParseError<'i>> { Ok(try_match_ident_ignore_ascii_case! { input, "list-item" => (), }) @@ -617,15 +611,13 @@ impl Parse for Display { } if got_list_item || inside.is_ok() || outside.is_ok() { let inside = inside.unwrap_or(DisplayInside::Flow); - let outside = outside.unwrap_or( - match inside { - // "If is omitted, the element’s outside display type - // defaults to block — except for ruby, which defaults to inline." - // https://drafts.csswg.org/css-display/#inside-model - DisplayInside::Ruby => DisplayOutside::Inline, - _ => DisplayOutside::Block, - } - ); + let outside = outside.unwrap_or(match inside { + // "If is omitted, the element’s outside display type + // defaults to block — except for ruby, which defaults to inline." + // https://drafts.csswg.org/css-display/#inside-model + DisplayInside::Ruby => DisplayOutside::Inline, + _ => DisplayOutside::Block, + }); return Ok(Display::from3(outside, inside, got_list_item)); } @@ -671,38 +663,39 @@ impl Parse for Display { #[cfg(feature = "gecko")] impl SpecifiedValueInfo for Display { fn collect_completion_keywords(f: KeywordsCollectFn) { - f(&["block", - "contents", - "flex", - "flow-root", - "grid", - "inline", - "inline-block", - "inline-flex", - "inline-grid", - "inline-table", - "inline list-item", - "inline flow-root list-item", - "list-item", - "none", - "block ruby", - "ruby", - "ruby-base", - "ruby-base-container", - "ruby-text", - "ruby-text-container", - "table", - "table-caption", - "table-cell", - "table-column", - "table-column-group", - "table-footer-group", - "table-header-group", - "table-row", - "table-row-group", - "-webkit-box", - "-webkit-inline-box", - ]); + f(&[ + "block", + "contents", + "flex", + "flow-root", + "grid", + "inline", + "inline-block", + "inline-flex", + "inline-grid", + "inline-table", + "inline list-item", + "inline flow-root list-item", + "list-item", + "none", + "block ruby", + "ruby", + "ruby-base", + "ruby-base-container", + "ruby-text", + "ruby-text-container", + "table", + "table-caption", + "table-cell", + "table-column", + "table-column-group", + "table-footer-group", + "table-header-group", + "table-row", + "table-row-group", + "-webkit-box", + "-webkit-inline-box", + ]); } } diff --git a/components/style/values/specified/grid.rs b/components/style/values/specified/grid.rs index a504f0cdda5..b75e97aca99 100644 --- a/components/style/values/specified/grid.rs +++ b/components/style/values/specified/grid.rs @@ -169,8 +169,7 @@ impl TrackRepeat { let mut current_names; loop { - current_names = - input.try(parse_line_names).unwrap_or_default(); + current_names = input.try(parse_line_names).unwrap_or_default(); if let Ok(track_size) = input.try(|i| TrackSize::parse(context, i)) { if !track_size.is_fixed() { if is_auto { @@ -193,11 +192,7 @@ impl TrackRepeat { // one `TrackSize`. But in current version of the spec, this is deprecated // but we are adding this for gecko parity. We should remove this when // gecko implements new spec. - names.push( - input - .try(parse_line_names) - .unwrap_or_default() - ); + names.push(input.try(parse_line_names).unwrap_or_default()); break; } } else { @@ -239,11 +234,7 @@ impl Parse for TrackList { // assume that everything is . This flag is useful when we encounter let mut at_least_one_not_fixed = false; loop { - current_names.extend_from_slice( - &mut input - .try(parse_line_names) - .unwrap_or_default() - ); + current_names.extend_from_slice(&mut input.try(parse_line_names).unwrap_or_default()); if let Ok(track_size) = input.try(|i| TrackSize::parse(context, i)) { if !track_size.is_fixed() { at_least_one_not_fixed = true; diff --git a/components/style/values/specified/text.rs b/components/style/values/specified/text.rs index b4fbc42c848..1686b9f424d 100644 --- a/components/style/values/specified/text.rs +++ b/components/style/values/specified/text.rs @@ -12,7 +12,7 @@ use crate::values::computed::text::TextOverflow as ComputedTextOverflow; use crate::values::computed::{Context, ToComputedValue}; use crate::values::generics::text::InitialLetter as GenericInitialLetter; use crate::values::generics::text::LineHeight as GenericLineHeight; -use crate::values::generics::text::{Spacing, GenericTextDecorationLength}; +use crate::values::generics::text::{GenericTextDecorationLength, Spacing}; use crate::values::specified::length::NonNegativeLengthPercentage; use crate::values::specified::length::{FontRelativeLength, Length}; use crate::values::specified::length::{LengthPercentage, NoCalcLength}; @@ -1053,6 +1053,6 @@ impl TextDecorationLength { /// Whether this is the `Auto` value. #[inline] pub fn is_auto(&self) -> bool { - matches!(*self, GenericTextDecorationLength::Auto) + matches!(*self, GenericTextDecorationLength::Auto) } } diff --git a/servo-tidy.toml b/servo-tidy.toml index 42a253b1aa7..cedd07f2711 100644 --- a/servo-tidy.toml +++ b/servo-tidy.toml @@ -56,6 +56,7 @@ files = [ "./components/net/tests/parsable_mime/text", # Mako does not lend itself easily to splitting long lines "./components/style/properties/helpers/animated_properties.mako.rs", + "./components/style/properties/shorthands/text.mako.rs", # Long regexes are long. "./components/style/gecko/regen_atoms.py", # Helper macro where actually a pseudo-element per line makes sense.