From 67d8bfb7202e3857f1c168b12b3ceb292ed4f24c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Date: Thu, 14 Jun 2018 13:38:47 -0700 Subject: [PATCH] style: Introduce Qualifier::parse. Bug: 1468846 Reviewed-by: xidorn MozReview-Commit-ID: 4IOJpaS9ijI --- components/style/media_queries/mod.rs | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/components/style/media_queries/mod.rs b/components/style/media_queries/mod.rs index e1db6ca40cd..eeb6b95000b 100644 --- a/components/style/media_queries/mod.rs +++ b/components/style/media_queries/mod.rs @@ -24,7 +24,7 @@ pub use servo::media_queries::{Device, Expression}; pub use gecko::media_queries::{Device, Expression}; /// -#[derive(Clone, Copy, Debug, Eq, MallocSizeOf, PartialEq, ToCss)] +#[derive(Clone, Copy, Debug, Eq, MallocSizeOf, PartialEq, Parse, ToCss)] pub enum Qualifier { /// Hide a media query from legacy UAs: /// @@ -168,20 +168,7 @@ impl MediaQuery { ) -> Result> { let mut expressions = vec![]; - let qualifier = if input - .try(|input| input.expect_ident_matching("only")) - .is_ok() - { - Some(Qualifier::Only) - } else if input - .try(|input| input.expect_ident_matching("not")) - .is_ok() - { - Some(Qualifier::Not) - } else { - None - }; - + let qualifier = input.try(Qualifier::parse).ok(); let media_type = match input.try(|i| i.expect_ident_cloned()) { Ok(ident) => MediaQueryType::parse(&*ident).map_err(|()| { input.new_custom_error(SelectorParseErrorKind::UnexpectedIdent(ident.clone()))