From 0b1e51de5335961234c8f54a7299b61937dfc479 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Wed, 17 May 2017 15:03:26 +0200 Subject: [PATCH] Rename CaseSensitivity::CaseInsensitive to AsciiCaseInsensitive --- components/selectors/matching.rs | 2 +- components/selectors/parser.rs | 6 +++--- tests/unit/style/stylesheets.rs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/components/selectors/matching.rs b/components/selectors/matching.rs index 9c60e6b78d7..beaf0d06ed2 100644 --- a/components/selectors/matching.rs +++ b/components/selectors/matching.rs @@ -415,7 +415,7 @@ fn matches_simple_selector( Component::AttrEqual(ref attr, ref value, case_sensitivity) => { match case_sensitivity { CaseSensitivity::CaseSensitive => element.match_attr_equals(attr, value), - CaseSensitivity::CaseInsensitive => element.match_attr_equals_ignore_ascii_case(attr, value), + CaseSensitivity::AsciiCaseInsensitive => element.match_attr_equals_ignore_ascii_case(attr, value), } } Component::AttrIncludes(ref attr, ref value) => { diff --git a/components/selectors/parser.rs b/components/selectors/parser.rs index 01f1eafc07c..0c9a54defdf 100644 --- a/components/selectors/parser.rs +++ b/components/selectors/parser.rs @@ -608,7 +608,7 @@ impl Component { #[derive(Eq, PartialEq, Clone, Copy, Debug)] pub enum CaseSensitivity { CaseSensitive, // Selectors spec says language-defined, but HTML says sensitive. - CaseInsensitive, + AsciiCaseInsensitive, } @@ -754,7 +754,7 @@ impl ToCss for Component { AttrEqual(ref a, ref v, case) => { attr_selector_to_css(a, " = ", v, match case { CaseSensitivity::CaseSensitive => None, - CaseSensitivity::CaseInsensitive => Some(" i"), + CaseSensitivity::AsciiCaseInsensitive => Some(" i"), }, dest) } AttrDashMatch(ref a, ref v) => attr_selector_to_css(a, " |= ", v, None, dest), @@ -1322,7 +1322,7 @@ fn parse_attribute_flags(input: &mut CssParser) -> Result { match input.next() { Err(()) => Ok(CaseSensitivity::CaseSensitive), Ok(Token::Ident(ref value)) if value.eq_ignore_ascii_case("i") => { - Ok(CaseSensitivity::CaseInsensitive) + Ok(CaseSensitivity::AsciiCaseInsensitive) } _ => Err(()) } diff --git a/tests/unit/style/stylesheets.rs b/tests/unit/style/stylesheets.rs index 6d2a2d72bee..fde49c6acb9 100644 --- a/tests/unit/style/stylesheets.rs +++ b/tests/unit/style/stylesheets.rs @@ -104,7 +104,7 @@ fn test_parse_stylesheet() { prefix: None, url: ns!() }), - }, "hidden".to_owned(), CaseSensitivity::CaseInsensitive) + }, "hidden".to_owned(), CaseSensitivity::AsciiCaseInsensitive) ]), (0 << 20) + (1 << 10) + (1 << 0) ),