From efea71ff9bb2e3b737d4503e7c18b023cde5d991 Mon Sep 17 00:00:00 2001 From: Oriol Brufau Date: Tue, 16 May 2023 08:02:28 +0200 Subject: [PATCH] style: Cherry-pick various servo changes All formatting and not-part-of-the-gecko-build changes. Differential Revision: https://phabricator.services.mozilla.com/D106634 --- components/style/values/specified/counters.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/style/values/specified/counters.rs b/components/style/values/specified/counters.rs index ece5739ba0e..61014f8d3b4 100644 --- a/components/style/values/specified/counters.rs +++ b/components/style/values/specified/counters.rs @@ -17,7 +17,7 @@ use crate::values::specified::Attr; use crate::values::specified::Integer; use crate::values::CustomIdent; use cssparser::{Parser, Token}; -#[cfg(feature = "servo-layout-2013")] +#[cfg(any(feature = "gecko", feature = "servo-layout-2013"))] use selectors::parser::SelectorParseErrorKind; use style_traits::{ParseError, StyleParseErrorKind}; @@ -171,6 +171,7 @@ impl Parse for Content { Ok(generics::ContentItem::Attr(Attr::parse_function(context, input)?)) }), _ => { + use style_traits::StyleParseErrorKind; let name = name.clone(); return Err(input.new_custom_error( StyleParseErrorKind::UnexpectedFunction(name),