Improve ascii_case_insensitive_phf_map macro syntax

Signed-off-by: Nico Burns <nico@nicoburns.com>

Author: nicoburns

src/color.rs

@@ -174,7 +174,7 @@ pub fn parse_hash_color(value: &[u8]) -> Result<(u8, u8, u8, f32), ()> {
 }
 
 ascii_case_insensitive_phf_map! {
-    named_colors -> (u8, u8, u8) = {
+    static NAMED_COLORS : (u8, u8, u8) = {
         "black" => (0, 0, 0),
         "silver" => (192, 192, 192),
         "gray" => (128, 128, 128),
@@ -332,14 +332,14 @@ ascii_case_insensitive_phf_map! {
 #[allow(clippy::result_unit_err)]
 #[inline]
 pub fn parse_named_color(ident: &str) -> Result<(u8, u8, u8), ()> {
-    named_colors::get(ident).copied().ok_or(())
+    NAMED_COLORS::get(ident).copied().ok_or(())
 }
 
 /// Returns an iterator over all named CSS colors.
 /// <https://drafts.csswg.org/css-color-4/#typedef-named-color>
 #[inline]
 pub fn all_named_colors() -> impl Iterator<Item = (&'static str, (u8, u8, u8))> {
-    named_colors::entries().map(|(k, v)| (*k, *v))
+    NAMED_COLORS::entries().map(|(k, v)| (*k, *v))
 }
 
 #[inline]

src/macros.rs

@@ -87,23 +87,23 @@ macro_rules! match_ignore_ascii_case {
 ///
 /// fn color_rgb(input: &str) -> Option<(u8, u8, u8)> {
 ///     cssparser::ascii_case_insensitive_phf_map! {
-///         keywords -> (u8, u8, u8) = {
+///         static KEYWORDS : (u8, u8, u8) = {
 ///             "red" => (255, 0, 0),
 ///             "green" => (0, 255, 0),
 ///             "blue" => (0, 0, 255),
 ///         }
 ///     }
-///     keywords::get(input).cloned()
+///     KEYWORDS::get(input).cloned()
 /// }
 /// ```
 ///
 /// You can also iterate over the map entries by using `keywords::entries()`.
 #[macro_export]
 macro_rules! ascii_case_insensitive_phf_map {
-    ($name: ident -> $ValueType: ty = { $( $key: tt => $value: expr ),+ }) => {
-        ascii_case_insensitive_phf_map!($name -> $ValueType = { $( $key => $value, )+ })
+    (static $name:ident : $ValueType:ty = { $( $key:tt => $value:expr ),+ }) => {
+        ascii_case_insensitive_phf_map!(static $name : $ValueType = { $( $key => $value, )+ })
     };
-    ($name: ident -> $ValueType: ty = { $( $key: tt => $value: expr, )+ }) => {
+    (static $name:ident : $ValueType:ty = { $( $key:tt => $value:expr, )+ }) => {
         use $crate::_cssparser_internal_phf as phf;
 
         #[inline(always)]
@@ -124,7 +124,7 @@ macro_rules! ascii_case_insensitive_phf_map {
             maxlen
         };
 
-        static MAP: phf::Map<&'static str, $ValueType> = phf::phf_map! {
+        static __MAP: phf::Map<&'static str, $ValueType> = phf::phf_map! {
             $(
                 $key => $value,
             )*
@@ -140,12 +140,12 @@ macro_rules! ascii_case_insensitive_phf_map {
         impl $name {
             #[allow(dead_code)]
             fn entries() -> impl Iterator<Item = (&'static &'static str, &'static $ValueType)> {
-                MAP.entries()
+                __MAP.entries()
             }
 
             fn get(input: &str) -> Option<&'static $ValueType> {
                 $crate::_cssparser_internal_to_lowercase!(input, MAX_LENGTH => lowercase);
-                MAP.get(lowercase?)
+                __MAP.get(lowercase?)
             }
         }
     }

src/tests.rs

@@ -1086,12 +1086,12 @@ fn one_component_value_to_json(token: Token, input: &mut Parser) -> Value {
 #[test]
 fn procedural_masquerade_whitespace() {
     ascii_case_insensitive_phf_map! {
-        map -> () = {
+        static MAP : () = {
             "  \t\n" => ()
         }
     }
-    assert_eq!(map::get("  \t\n"), Some(&()));
-    assert_eq!(map::get(" "), None);
+    assert_eq!(MAP::get("  \t\n"), Some(&()));
+    assert_eq!(MAP::get(" "), None);
 
     match_ignore_ascii_case! { "  \t\n",
         " " => panic!("1"),