Auto merge of #261 - servo:phf, r=SimonSapin

Update phf to 0.8

Author: bors-servo

Cargo.toml

@@ -19,12 +19,12 @@ difference = "2.0"
 encoding_rs = "0.8"
 
 [dependencies]
-cssparser-macros = {path = "./macros", version = "0.3.3"}
+cssparser-macros = {path = "./macros", version = "0.4"}
 dtoa-short = "0.3"
 heapsize = {version = ">= 0.3, < 0.5", optional = true}
 itoa = "0.4"
 matches = "0.1"
-phf = "0.7"
+phf = "0.8"
 procedural-masquerade = {path = "./procedural-masquerade", version = "0.1"}
 serde = {version = "1.0", optional = true}
 smallvec = "0.6"

macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cssparser-macros"
-version = "0.3.6"
+version = "0.4.0"
 authors = ["Simon Sapin <[email protected]>"]
 description = "Procedural macros for cssparser"
 documentation = "https://docs.rs/cssparser-macros/"
@@ -13,7 +13,7 @@ proc-macro = true
 
 [dependencies]
 procedural-masquerade = {path = "../procedural-masquerade", version = "0.1"}
-phf_codegen = "0.7"
+phf_codegen = "0.8"
 quote = "1"
 syn = {version = "1", features = ["full", "extra-traits"]}
 proc-macro2 = "1"

macros/lib.rs

@@ -86,9 +86,7 @@ define_proc_macros! {
         let mut tokens = quote! {
             static MAP: ::cssparser::_internal__phf::Map<&'static str, #value_type> =
         };
-        let mut initializer_bytes = Vec::new();
-        map.build(&mut initializer_bytes).unwrap();
-        tokens.append_all(syn::parse_str::<syn::Expr>(::std::str::from_utf8(&initializer_bytes).unwrap()));
+        tokens.append_all(syn::parse_str::<proc_macro2::TokenStream>(&map.build().to_string()));
         tokens.append_all(quote!(;));
         tokens.to_string()
     }