diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-04-12 09:22:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-12 09:22:28 -0400 |
| commit | a74f5222db7f7f39e426cd0b8836f5b806730ef7 (patch) | |
| tree | f59d825f9d4be44882b84ff5d3a0bff6a16216bc /components/style/servo/selector_parser.rs | |
| parent | 4fbbcdddbe20ffd58474d727234bf066bd6e6bec (diff) | |
| parent | 63778555268b8b4904dcfc24a0a0c91dcb395074 (diff) | |
| download | servo-a74f5222db7f7f39e426cd0b8836f5b806730ef7.tar.gz servo-a74f5222db7f7f39e426cd0b8836f5b806730ef7.zip | |
Auto merge of #23194 - emilio:gecko-sync, r=emilio
style: Sync changes from mozilla central.
See individual commits for details.
<!-- 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/23194)
<!-- Reviewable:end -->
Diffstat (limited to 'components/style/servo/selector_parser.rs')
| -rw-r--r-- | components/style/servo/selector_parser.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/components/style/servo/selector_parser.rs b/components/style/servo/selector_parser.rs index 229f7dccdd2..d839654a65a 100644 --- a/components/style/servo/selector_parser.rs +++ b/components/style/servo/selector_parser.rs @@ -29,8 +29,7 @@ use style_traits::{ParseError, StyleParseErrorKind}; /// A pseudo-element, both public and private. /// /// NB: If you add to this list, be sure to update `each_simple_pseudo_element` too. -#[derive(Clone, Debug, Eq, Hash, PartialEq)] -#[cfg_attr(feature = "servo", derive(MallocSizeOf))] +#[derive(Clone, Debug, Eq, Hash, MallocSizeOf, PartialEq, ToShmem)] #[allow(missing_docs)] #[repr(usize)] pub enum PseudoElement { @@ -265,8 +264,7 @@ pub type Lang = Box<str>; /// A non tree-structural pseudo-class. /// See https://drafts.csswg.org/selectors-4/#structural-pseudos -#[derive(Clone, Debug, Eq, Hash, PartialEq)] -#[cfg_attr(feature = "servo", derive(MallocSizeOf))] +#[derive(Clone, Debug, Eq, Hash, MallocSizeOf, PartialEq, ToShmem)] #[allow(missing_docs)] pub enum NonTSPseudoClass { Active, |