diff options
| author | Emilio Cobos Álvarez <emilio@crisal.io> | 2019-05-25 03:19:12 +0200 |
|---|---|---|
| committer | Emilio Cobos Álvarez <emilio@crisal.io> | 2019-05-29 16:14:31 +0200 |
| commit | e3e826d4fbfff49e43076d636af5de6cfbf3dffd (patch) | |
| tree | 90273e38cfc40416d7f4aa9a627541e5d94ece2c | |
| parent | 81f40a57e45900f6c23c8539f9e7356ffc54e12d (diff) | |
| download | servo-e3e826d4fbfff49e43076d636af5de6cfbf3dffd.tar.gz servo-e3e826d4fbfff49e43076d636af5de6cfbf3dffd.zip | |
style: Appease tidy.
| -rw-r--r-- | components/style/counter_style/mod.rs | 8 | ||||
| -rw-r--r-- | components/style/properties/helpers.mako.rs | 5 | ||||
| -rw-r--r-- | components/style_traits/owned_str.rs | 2 |
3 files changed, 9 insertions, 6 deletions
diff --git a/components/style/counter_style/mod.rs b/components/style/counter_style/mod.rs index 72ccbd94634..289281011c3 100644 --- a/components/style/counter_style/mod.rs +++ b/components/style/counter_style/mod.rs @@ -408,7 +408,7 @@ impl ToCss for System { } /// <https://drafts.csswg.org/css-counter-styles/#typedef-symbol> -#[derive(Clone, Debug, Eq, PartialEq, ToComputedValue, ToCss, ToShmem, MallocSizeOf)] +#[derive(Clone, Debug, Eq, MallocSizeOf, PartialEq, ToComputedValue, ToCss, ToShmem)] pub enum Symbol { /// <string> String(crate::OwnedStr), @@ -461,7 +461,7 @@ impl Parse for Negative { } /// <https://drafts.csswg.org/css-counter-styles/#counter-style-range> -#[derive(Clone, Debug, ToShmem, ToCss)] +#[derive(Clone, Debug, ToCss, ToShmem)] pub struct CounterRange { /// The start of the range. pub start: CounterBound, @@ -472,7 +472,7 @@ pub struct CounterRange { /// <https://drafts.csswg.org/css-counter-styles/#counter-style-range> /// /// Empty represents 'auto' -#[derive(Clone, Debug, ToShmem, ToCss)] +#[derive(Clone, Debug, ToCss, ToShmem)] #[css(comma)] pub struct CounterRanges(#[css(iterable, if_empty = "auto")] pub crate::OwnedSlice<CounterRange>); @@ -553,7 +553,7 @@ impl Parse for Fallback { } /// <https://drafts.csswg.org/css-counter-styles/#descdef-counter-style-symbols> -#[derive(Clone, Debug, Eq, PartialEq, MallocSizeOf, ToComputedValue, ToCss, ToShmem)] +#[derive(Clone, Debug, Eq, MallocSizeOf, PartialEq, ToComputedValue, ToCss, ToShmem)] pub struct Symbols(#[css(iterable)] pub crate::OwnedSlice<Symbol>); impl Parse for Symbols { diff --git a/components/style/properties/helpers.mako.rs b/components/style/properties/helpers.mako.rs index 56637af9463..ca9700737fe 100644 --- a/components/style/properties/helpers.mako.rs +++ b/components/style/properties/helpers.mako.rs @@ -136,7 +136,10 @@ % endif use crate::values::computed::ComputedVecIter; - <% is_shared_list = allow_empty and allow_empty != "NotInitial" and data.longhands_by_name[name].style_struct.inherited %> + <% + is_shared_list = allow_empty and allow_empty != "NotInitial" and \ + data.longhands_by_name[name].style_struct.inherited + %> // FIXME(emilio): Add an OwnedNonEmptySlice type, and figure out // something for transition-name, which is the only remaining user diff --git a/components/style_traits/owned_str.rs b/components/style_traits/owned_str.rs index e5fe1065712..42a83a07713 100644 --- a/components/style_traits/owned_str.rs +++ b/components/style_traits/owned_str.rs @@ -13,7 +13,7 @@ use std::ops::{Deref, DerefMut}; /// A struct that basically replaces a Box<str>, but with a defined layout, /// suitable for FFI. #[repr(C)] -#[derive(Default, Clone, PartialEq, Eq, MallocSizeOf, ToShmem)] +#[derive(Clone, Default, Eq, MallocSizeOf, PartialEq, ToShmem)] pub struct OwnedStr(OwnedSlice<u8>); impl fmt::Debug for OwnedStr { |