commit 91972b049d47813a35d3f1fc362da67d7ca6234e parent 0104b893df42667eef1b44ea3f16eb6a67e684a6 Author: Nico Burns <nico@nicoburns.com> Date: Mon, 15 Dec 2025 19:03:56 +0000 Bug 2005254: Use modern macro imports for cssparser (r=firefox-style-system-reviewers,dshin) Differential Revision: https://phabricator.services.mozilla.com/D275840 Diffstat:
40 files changed, 58 insertions(+), 51 deletions(-)
diff --git a/servo/components/style/counter_style/mod.rs b/servo/components/style/counter_style/mod.rs @@ -14,9 +14,12 @@ use crate::values::specified::Integer; use crate::values::{AtomString, CustomIdent}; use crate::Atom; use cssparser::{ + ascii_case_insensitive_phf_map, match_ignore_ascii_case, CowRcStr, Parser, ParserState, + SourceLocation, Token, +}; +use cssparser::{ AtRuleParser, DeclarationParser, QualifiedRuleParser, RuleBodyItemParser, RuleBodyParser, }; -use cssparser::{CowRcStr, Parser, ParserState, SourceLocation, Token}; use selectors::parser::SelectorParseErrorKind; use std::fmt::{self, Write}; use std::mem; diff --git a/servo/components/style/font_face.rs b/servo/components/style/font_face.rs @@ -19,10 +19,9 @@ use crate::values::specified::font::{ }; use crate::values::specified::url::SpecifiedUrl; use crate::values::specified::{Angle, NonNegativePercentage}; -use cssparser::UnicodeRange; use cssparser::{ - AtRuleParser, CowRcStr, DeclarationParser, Parser, ParserState, QualifiedRuleParser, - RuleBodyItemParser, RuleBodyParser, SourceLocation, + match_ignore_ascii_case, AtRuleParser, CowRcStr, DeclarationParser, Parser, ParserState, + QualifiedRuleParser, RuleBodyItemParser, RuleBodyParser, SourceLocation, UnicodeRange, }; use selectors::parser::SelectorParseErrorKind; use std::fmt::{self, Write}; diff --git a/servo/components/style/gecko/pseudo_element_definition.mako.rs b/servo/components/style/gecko/pseudo_element_definition.mako.rs @@ -218,7 +218,7 @@ impl PseudoElement { // We don't need to support tree pseudos because functional // pseudo-elements needs arguments, and thus should be created // via other methods. - ascii_case_insensitive_phf_map! { + cssparser::ascii_case_insensitive_phf_map! { pseudo -> PseudoElement = { % for pseudo in SIMPLE_PSEUDOS: "${pseudo.value[1:]}" => ${pseudo_element_variant(pseudo)}, diff --git a/servo/components/style/gecko/selector_parser.rs b/servo/components/style/gecko/selector_parser.rs @@ -12,8 +12,8 @@ use crate::selector_parser::{Direction, HorizontalDirection, SelectorParser}; use crate::str::starts_with_ignore_ascii_case; use crate::string_cache::{Atom, Namespace, WeakAtom, WeakNamespace}; use crate::values::{AtomIdent, AtomString, CSSInteger, CustomIdent}; +use cssparser::{match_ignore_ascii_case, CowRcStr, SourceLocation, ToCss, Token}; use cssparser::{BasicParseError, BasicParseErrorKind, Parser}; -use cssparser::{CowRcStr, SourceLocation, ToCss, Token}; use dom::{DocumentState, ElementState, HEADING_LEVEL_OFFSET}; use selectors::parser::SelectorParseErrorKind; use std::fmt; diff --git a/servo/components/style/lib.rs b/servo/components/style/lib.rs @@ -25,11 +25,11 @@ #![deny(missing_docs)] +pub(crate) use cssparser; + #[macro_use] extern crate bitflags; #[macro_use] -extern crate cssparser; -#[macro_use] extern crate debug_unreachable; #[macro_use] #[cfg(feature = "gecko")] diff --git a/servo/components/style/macros.rs b/servo/components/style/macros.rs @@ -29,7 +29,7 @@ macro_rules! try_match_ident_ignore_ascii_case { ($input:expr, $( $match_body:tt )*) => {{ let location = $input.current_source_location(); let ident = $input.expect_ident()?; - match_ignore_ascii_case! { &ident, + ::cssparser::match_ignore_ascii_case! { &ident, $( $match_body )* _ => return Err(location.new_custom_error( ::selectors::parser::SelectorParseErrorKind::UnexpectedIdent(ident.clone()) diff --git a/servo/components/style/media_queries/media_query.rs b/servo/components/style/media_queries/media_query.rs @@ -12,7 +12,7 @@ use crate::queries::{FeatureFlags, FeatureType, QueryCondition}; use crate::str::string_as_ascii_lowercase; use crate::values::CustomIdent; use crate::Atom; -use cssparser::Parser; +use cssparser::{match_ignore_ascii_case, Parser}; use std::fmt::{self, Write}; use style_traits::{CssWriter, ParseError, ToCss}; diff --git a/servo/components/style/properties/mod.rs b/servo/components/style/properties/mod.rs @@ -31,7 +31,7 @@ use crate::stylesheets::Origin; use crate::stylist::Stylist; use crate::values::{computed, serialize_atom_name}; use arrayvec::{ArrayVec, Drain as ArrayVecDrain}; -use cssparser::{Parser, ParserInput}; +use cssparser::{match_ignore_ascii_case, Parser, ParserInput}; use rustc_hash::FxHashMap; use servo_arc::Arc; use std::{ diff --git a/servo/components/style/properties/properties.mako.rs b/servo/components/style/properties/properties.mako.rs @@ -1237,7 +1237,7 @@ pub enum CountedUnknownProperty { impl CountedUnknownProperty { /// Parse the counted unknown property, for testing purposes only. pub fn parse_for_testing(property_name: &str) -> Option<Self> { - ascii_case_insensitive_phf_map! { + ::cssparser::ascii_case_insensitive_phf_map! { unknown_ids -> CountedUnknownProperty = { % for property in data.counted_unknown_properties: "${property.name}" => CountedUnknownProperty::${property.camel_case}, @@ -1267,7 +1267,7 @@ impl PropertyId { NonCustom(NonCustomPropertyId), CountedUnknown(CountedUnknownProperty), } - ascii_case_insensitive_phf_map! { + ::cssparser::ascii_case_insensitive_phf_map! { static_ids -> StaticId = { % for i, property in enumerate(data.longhands + data.shorthands + data.all_aliases()): "${property.name}" => StaticId::NonCustom(NonCustomPropertyId(${i})), diff --git a/servo/components/style/properties_and_values/rule.rs b/servo/components/style/properties_and_values/rule.rs @@ -21,9 +21,9 @@ use crate::parser::{Parse, ParserContext}; use crate::shared_lock::{SharedRwLockReadGuard, ToCssWithGuard}; use crate::values::{computed, serialize_atom_name}; use cssparser::{ - AtRuleParser, BasicParseErrorKind, CowRcStr, DeclarationParser, ParseErrorKind, Parser, - ParserInput, ParserState, QualifiedRuleParser, RuleBodyItemParser, RuleBodyParser, - SourceLocation, + match_ignore_ascii_case, AtRuleParser, BasicParseErrorKind, CowRcStr, DeclarationParser, + ParseErrorKind, Parser, ParserInput, ParserState, QualifiedRuleParser, RuleBodyItemParser, + RuleBodyParser, SourceLocation, }; #[cfg(feature = "gecko")] use malloc_size_of::{MallocSizeOf, MallocSizeOfOps}; diff --git a/servo/components/style/queries/condition.rs b/servo/components/style/queries/condition.rs @@ -12,8 +12,8 @@ use crate::custom_properties; use crate::derives::*; use crate::stylesheets::CustomMediaEvaluator; use crate::values::{computed, AtomString, DashedIdent}; -use crate::{error_reporting::ContextualParseError, parser::ParserContext, parser::Parse}; -use cssparser::{Parser, SourcePosition, Token}; +use crate::{error_reporting::ContextualParseError, parser::Parse, parser::ParserContext}; +use cssparser::{match_ignore_ascii_case, Parser, SourcePosition, Token}; use selectors::kleene_value::KleeneValue; use servo_arc::Arc; use std::fmt::{self, Write}; diff --git a/servo/components/style/selector_parser.rs b/servo/components/style/selector_parser.rs @@ -10,7 +10,7 @@ use crate::derives::*; use crate::stylesheets::{Namespaces, Origin, UrlExtraData}; use crate::values::serialize_atom_identifier; use crate::Atom; -use cssparser::{Parser as CssParser, ParserInput}; +use cssparser::{match_ignore_ascii_case, Parser as CssParser, ParserInput}; use dom::ElementState; use selectors::parser::{ParseRelative, SelectorList}; use std::fmt::{self, Debug, Write}; diff --git a/servo/components/style/servo/selector_parser.rs b/servo/components/style/servo/selector_parser.rs @@ -18,7 +18,10 @@ use crate::selector_parser::AttrValue as SelectorAttrValue; use crate::selector_parser::{PseudoElementCascadeType, SelectorParser}; use crate::values::{AtomIdent, AtomString}; use crate::{Atom, CaseSensitivityExt, LocalName, Namespace, Prefix}; -use cssparser::{serialize_identifier, CowRcStr, Parser as CssParser, SourceLocation, ToCss}; +use cssparser::{ + match_ignore_ascii_case, serialize_identifier, CowRcStr, Parser as CssParser, SourceLocation, + ToCss, +}; use dom::{DocumentState, ElementState}; use rustc_hash::FxHashMap; use selectors::attr::{AttrSelectorOperation, CaseSensitivity, NamespaceConstraint}; diff --git a/servo/components/style/stylesheets/document_rule.rs b/servo/components/style/stylesheets/document_rule.rs @@ -13,7 +13,7 @@ use crate::shared_lock::{DeepCloneWithLock, Locked}; use crate::shared_lock::{SharedRwLock, SharedRwLockReadGuard, ToCssWithGuard}; use crate::stylesheets::CssRules; use crate::values::CssUrl; -use cssparser::{BasicParseErrorKind, Parser, SourceLocation}; +use cssparser::{match_ignore_ascii_case, BasicParseErrorKind, Parser, SourceLocation}; #[cfg(feature = "gecko")] use malloc_size_of::{MallocSizeOfOps, MallocUnconditionalShallowSizeOf}; use servo_arc::Arc; diff --git a/servo/components/style/stylesheets/font_feature_values_rule.rs b/servo/components/style/stylesheets/font_feature_values_rule.rs @@ -19,8 +19,9 @@ use crate::values::computed::font::FamilyName; use crate::values::serialize_atom_identifier; use crate::Atom; use cssparser::{ - AtRuleParser, BasicParseErrorKind, CowRcStr, DeclarationParser, Parser, ParserState, - QualifiedRuleParser, RuleBodyItemParser, RuleBodyParser, SourceLocation, Token, + match_ignore_ascii_case, AtRuleParser, BasicParseErrorKind, CowRcStr, DeclarationParser, + Parser, ParserState, QualifiedRuleParser, RuleBodyItemParser, RuleBodyParser, SourceLocation, + Token, }; use std::fmt::{self, Write}; use style_traits::{CssStringWriter, CssWriter, ParseError, StyleParseErrorKind, ToCss}; diff --git a/servo/components/style/stylesheets/font_palette_values_rule.rs b/servo/components/style/stylesheets/font_palette_values_rule.rs @@ -24,8 +24,8 @@ use crate::values::specified::Color as SpecifiedColor; use crate::values::specified::NonNegativeInteger; use crate::values::DashedIdent; use cssparser::{ - AtRuleParser, CowRcStr, DeclarationParser, Parser, ParserState, QualifiedRuleParser, - RuleBodyItemParser, RuleBodyParser, SourceLocation, + match_ignore_ascii_case, AtRuleParser, CowRcStr, DeclarationParser, Parser, ParserState, + QualifiedRuleParser, RuleBodyItemParser, RuleBodyParser, SourceLocation, }; use selectors::parser::SelectorParseErrorKind; use std::fmt::{self, Write}; diff --git a/servo/components/style/stylesheets/margin_rule.rs b/servo/components/style/stylesheets/margin_rule.rs @@ -10,7 +10,7 @@ use crate::derives::*; use crate::properties::PropertyDeclarationBlock; use crate::shared_lock::{DeepCloneWithLock, Locked}; use crate::shared_lock::{SharedRwLock, SharedRwLockReadGuard, ToCssWithGuard}; -use cssparser::SourceLocation; +use cssparser::{match_ignore_ascii_case, SourceLocation}; #[cfg(feature = "gecko")] use malloc_size_of::{MallocSizeOf, MallocSizeOfOps, MallocUnconditionalShallowSizeOf}; use servo_arc::Arc; diff --git a/servo/components/style/stylesheets/page_rule.rs b/servo/components/style/stylesheets/page_rule.rs @@ -14,7 +14,7 @@ use crate::shared_lock::{ }; use crate::stylesheets::{style_or_page_rule_to_css, CssRules}; use crate::values::{AtomIdent, CustomIdent}; -use cssparser::{Parser, SourceLocation, Token}; +use cssparser::{match_ignore_ascii_case, Parser, SourceLocation, Token}; #[cfg(feature = "gecko")] use malloc_size_of::{MallocSizeOf, MallocSizeOfOps, MallocUnconditionalShallowSizeOf}; use servo_arc::Arc; diff --git a/servo/components/style/stylesheets/rule_parser.rs b/servo/components/style/stylesheets/rule_parser.rs @@ -37,8 +37,9 @@ use crate::values::computed::font::FamilyName; use crate::values::{CssUrl, CustomIdent, DashedIdent, KeyframesName}; use crate::{Atom, Namespace, Prefix}; use cssparser::{ - AtRuleParser, BasicParseError, BasicParseErrorKind, CowRcStr, DeclarationParser, Parser, - ParserState, QualifiedRuleParser, RuleBodyItemParser, RuleBodyParser, SourcePosition, + match_ignore_ascii_case, AtRuleParser, BasicParseError, BasicParseErrorKind, CowRcStr, + DeclarationParser, Parser, ParserState, QualifiedRuleParser, RuleBodyItemParser, + RuleBodyParser, SourcePosition, }; use selectors::parser::{ParseRelative, SelectorList}; use servo_arc::Arc; diff --git a/servo/components/style/stylesheets/supports_rule.rs b/servo/components/style/stylesheets/supports_rule.rs @@ -13,8 +13,8 @@ use crate::shared_lock::{DeepCloneWithLock, Locked}; use crate::shared_lock::{SharedRwLock, SharedRwLockReadGuard, ToCssWithGuard}; use crate::stylesheets::{CssRuleType, CssRules}; use cssparser::parse_important; +use cssparser::{match_ignore_ascii_case, ParseError as CssParseError, ParserInput}; use cssparser::{Delimiter, Parser, SourceLocation, Token}; -use cssparser::{ParseError as CssParseError, ParserInput}; #[cfg(feature = "gecko")] use malloc_size_of::{MallocSizeOfOps, MallocUnconditionalShallowSizeOf}; use selectors::parser::{Selector, SelectorParseErrorKind}; diff --git a/servo/components/style/values/computed/font.rs b/servo/components/style/values/computed/font.rs @@ -22,7 +22,7 @@ use crate::values::specified::font::{ use crate::values::specified::length::{FontBaseSize, LineHeightBase, NoCalcLength}; use crate::values::CSSInteger; use crate::Atom; -use cssparser::{serialize_identifier, CssStringWriter, Parser}; +use cssparser::{match_ignore_ascii_case, serialize_identifier, CssStringWriter, Parser}; use malloc_size_of::{MallocSizeOf, MallocSizeOfOps}; use num_traits::abs; use num_traits::cast::AsPrimitive; diff --git a/servo/components/style/values/specified/angle.rs b/servo/components/style/values/specified/angle.rs @@ -11,7 +11,7 @@ use crate::values::computed::{Context, ToComputedValue}; use crate::values::specified::calc::CalcNode; use crate::values::CSSFloat; use crate::Zero; -use cssparser::{Parser, Token}; +use cssparser::{match_ignore_ascii_case, Parser, Token}; use std::f32::consts::PI; use std::fmt::{self, Write}; use std::ops::Neg; diff --git a/servo/components/style/values/specified/animation.rs b/servo/components/style/values/specified/animation.rs @@ -11,7 +11,7 @@ use crate::values::generics::animation as generics; use crate::values::specified::{LengthPercentage, NonNegativeNumber, Time}; use crate::values::{CustomIdent, DashedIdent, KeyframesName}; use crate::Atom; -use cssparser::Parser; +use cssparser::{match_ignore_ascii_case, Parser}; use std::fmt::{self, Write}; use style_traits::{ CssWriter, KeywordsCollectFn, ParseError, SpecifiedValueInfo, StyleParseErrorKind, ToCss, diff --git a/servo/components/style/values/specified/background.rs b/servo/components/style/values/specified/background.rs @@ -10,7 +10,7 @@ use crate::values::generics::background::BackgroundSize as GenericBackgroundSize use crate::values::specified::length::{ NonNegativeLengthPercentage, NonNegativeLengthPercentageOrAuto, }; -use cssparser::Parser; +use cssparser::{match_ignore_ascii_case, Parser}; use selectors::parser::SelectorParseErrorKind; use std::fmt::{self, Write}; use style_traits::{CssWriter, ParseError, ToCss}; diff --git a/servo/components/style/values/specified/basic_shape.rs b/servo/components/style/values/specified/basic_shape.rs @@ -27,7 +27,7 @@ use crate::values::specified::PositionComponent; use crate::values::specified::{LengthPercentage, NonNegativeLengthPercentage, SVGPathData}; use crate::values::CSSFloat; use crate::Zero; -use cssparser::Parser; +use cssparser::{match_ignore_ascii_case, Parser}; use std::fmt::{self, Write}; use style_traits::{CssWriter, ParseError, StyleParseErrorKind, ToCss}; diff --git a/servo/components/style/values/specified/calc.rs b/servo/components/style/values/specified/calc.rs @@ -21,7 +21,7 @@ use crate::values::specified::length::{AbsoluteLength, FontRelativeLength, NoCal use crate::values::specified::length::{ContainerRelativeLength, ViewportPercentageLength}; use crate::values::specified::{self, Angle, Resolution, Time}; use crate::values::{serialize_number, serialize_percentage, CSSFloat, DashedIdent}; -use cssparser::{CowRcStr, Parser, Token}; +use cssparser::{match_ignore_ascii_case, CowRcStr, Parser, Token}; use smallvec::SmallVec; use std::cmp; use std::fmt::{self, Write}; diff --git a/servo/components/style/values/specified/color.rs b/servo/components/style/values/specified/color.rs @@ -16,7 +16,7 @@ use crate::values::generics::color::{ }; use crate::values::specified::Percentage; use crate::values::{normalize, CustomIdent}; -use cssparser::{BasicParseErrorKind, ParseErrorKind, Parser, Token}; +use cssparser::{match_ignore_ascii_case, BasicParseErrorKind, ParseErrorKind, Parser, Token}; use std::fmt::{self, Write}; use std::io::Write as IoWrite; use style_traits::{CssType, CssWriter, KeywordsCollectFn, ParseError, StyleParseErrorKind}; diff --git a/servo/components/style/values/specified/counters.rs b/servo/components/style/values/specified/counters.rs @@ -15,7 +15,7 @@ use crate::values::specified::image::Image; use crate::values::specified::Attr; use crate::values::specified::Integer; use crate::values::CustomIdent; -use cssparser::{Parser, Token}; +use cssparser::{match_ignore_ascii_case, Parser, Token}; use selectors::parser::SelectorParseErrorKind; use style_traits::{ParseError, StyleParseErrorKind}; diff --git a/servo/components/style/values/specified/easing.rs b/servo/components/style/values/specified/easing.rs @@ -10,7 +10,7 @@ use crate::values::computed::{Context, ToComputedValue}; use crate::values::generics::easing::TimingFunction as GenericTimingFunction; use crate::values::generics::easing::{StepPosition, TimingKeyword}; use crate::values::specified::{AnimationName, Integer, Number, Percentage}; -use cssparser::{Delimiter, Parser, Token}; +use cssparser::{match_ignore_ascii_case, Delimiter, Parser, Token}; use selectors::parser::SelectorParseErrorKind; use style_traits::{ParseError, StyleParseErrorKind}; diff --git a/servo/components/style/values/specified/effects.rs b/servo/components/style/values/specified/effects.rs @@ -30,7 +30,7 @@ use crate::values::specified::{Angle, NonNegativeNumberOrPercentage, Number, Num #[cfg(feature = "servo")] use crate::values::Impossible; use crate::Zero; -use cssparser::{BasicParseErrorKind, Parser, Token}; +use cssparser::{match_ignore_ascii_case, BasicParseErrorKind, Parser, Token}; use style_traits::{ParseError, StyleParseErrorKind, ValueParseErrorKind}; /// A specified value for a single shadow of the `box-shadow` property. diff --git a/servo/components/style/values/specified/font.rs b/servo/components/style/values/specified/font.rs @@ -23,7 +23,7 @@ use crate::values::specified::{ }; use crate::values::{serialize_atom_identifier, CustomIdent, SelectorParseErrorKind}; use crate::Atom; -use cssparser::{Parser, Token}; +use cssparser::{match_ignore_ascii_case, Parser, Token}; #[cfg(feature = "gecko")] use malloc_size_of::{MallocSizeOf, MallocSizeOfOps, MallocUnconditionalSizeOf}; use std::fmt::{self, Write}; diff --git a/servo/components/style/values/specified/image.rs b/servo/components/style/values/specified/image.rs @@ -27,7 +27,7 @@ use crate::values::specified::{ }; use crate::values::specified::{Number, NumberOrPercentage, Percentage}; use crate::Atom; -use cssparser::{Delimiter, Parser, Token}; +use cssparser::{match_ignore_ascii_case, Delimiter, Parser, Token}; use selectors::parser::SelectorParseErrorKind; use std::cmp::Ordering; use std::fmt::{self, Write}; diff --git a/servo/components/style/values/specified/intersection_observer.rs b/servo/components/style/values/specified/intersection_observer.rs @@ -9,7 +9,7 @@ use crate::parser::{Parse, ParserContext}; use crate::values::computed::{self, Length, LengthPercentage}; use crate::values::generics::rect::Rect; -use cssparser::{Parser, Token}; +use cssparser::{match_ignore_ascii_case, Parser, Token}; use std::fmt; use style_traits::values::SequenceWriter; use style_traits::{CssWriter, ParseError, StyleParseErrorKind, ToCss}; diff --git a/servo/components/style/values/specified/length.rs b/servo/components/style/values/specified/length.rs @@ -26,7 +26,7 @@ use crate::values::specified::NonNegativeNumber; use crate::values::CSSFloat; use crate::{Zero, ZeroNoPercent}; use app_units::AU_PER_PX; -use cssparser::{Parser, Token}; +use cssparser::{match_ignore_ascii_case, Parser, Token}; use std::cmp; use std::fmt::{self, Write}; use style_traits::values::specified::AllowedNumericType; diff --git a/servo/components/style/values/specified/page.rs b/servo/components/style/values/specified/page.rs @@ -9,7 +9,7 @@ use crate::parser::{Parse, ParserContext}; use crate::values::generics::size::Size2D; use crate::values::specified::length::NonNegativeLength; use crate::values::{generics, CustomIdent}; -use cssparser::Parser; +use cssparser::{match_ignore_ascii_case, Parser}; use style_traits::ParseError; pub use generics::page::PageOrientation; diff --git a/servo/components/style/values/specified/position.rs b/servo/components/style/values/specified/position.rs @@ -26,7 +26,7 @@ use crate::values::specified::align::AlignFlags; use crate::values::specified::{AllowQuirks, Integer, LengthPercentage, NonNegativeNumber}; use crate::values::DashedIdent; use crate::{Atom, Zero}; -use cssparser::Parser; +use cssparser::{match_ignore_ascii_case, Parser}; use num_traits::FromPrimitive; use selectors::parser::SelectorParseErrorKind; use servo_arc::Arc; diff --git a/servo/components/style/values/specified/resolution.rs b/servo/components/style/values/specified/resolution.rs @@ -10,7 +10,7 @@ use crate::derives::*; use crate::parser::{Parse, ParserContext}; use crate::values::specified::CalcNode; use crate::values::CSSFloat; -use cssparser::{Parser, Token}; +use cssparser::{match_ignore_ascii_case, Parser, Token}; use std::fmt::{self, Write}; use style_traits::{CssWriter, ParseError, StyleParseErrorKind, ToCss}; diff --git a/servo/components/style/values/specified/time.rs b/servo/components/style/values/specified/time.rs @@ -11,7 +11,7 @@ use crate::values::computed::{Context, ToComputedValue}; use crate::values::specified::calc::CalcNode; use crate::values::CSSFloat; use crate::Zero; -use cssparser::{Parser, Token}; +use cssparser::{match_ignore_ascii_case, Parser, Token}; use std::fmt::{self, Write}; use style_traits::values::specified::AllowedNumericType; use style_traits::{CssWriter, ParseError, SpecifiedValueInfo, StyleParseErrorKind, ToCss}; diff --git a/servo/components/style/values/specified/transform.rs b/servo/components/style/values/specified/transform.rs @@ -17,7 +17,7 @@ use crate::values::specified::{ self, AllowQuirks, Angle, Integer, Length, LengthPercentage, Number, NumberOrPercentage, }; use crate::Zero; -use cssparser::Parser; +use cssparser::{match_ignore_ascii_case, Parser}; use style_traits::{ParseError, StyleParseErrorKind}; pub use crate::values::generics::transform::TransformStyle; diff --git a/servo/components/style_derive/parse.rs b/servo/components/style_derive/parse.rs @@ -254,7 +254,7 @@ pub fn derive(mut input: DeriveInput) -> TokenStream { quote! { let location = input.current_source_location(); let ident = input.expect_ident()?; - match_ignore_ascii_case! { &ident, + cssparser::match_ignore_ascii_case! { &ident, #match_keywords _ => Err(location.new_unexpected_token_error( cssparser::Token::Ident(ident.clone()) @@ -317,7 +317,7 @@ pub fn derive(mut input: DeriveInput) -> TokenStream { /// Parse this keyword from a string slice. #[inline] pub fn from_ident(ident: &str) -> Result<Self, ()> { - match_ignore_ascii_case! { ident, + cssparser::match_ignore_ascii_case! { ident, #match_keywords _ => Err(()), }