Update syn, quote, proc-macro2 and bump versions

Eijebong · Eijebong · commit 6089dcfa2b86 · 2018-06-05T15:54:37.000+02:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cssparser"
-version = "0.23.9"
+version = "0.23.10"
 authors = [ "Simon Sapin <simon.sapin@exyr.org>" ]
 
 description = "Rust implementation of CSS Syntax Level 3"
@@ -30,9 +30,9 @@ serde = {version = "1.0", optional = true}
 smallvec = "0.6"
 
 [build-dependencies]
-syn = { version = "0.13", features = ["extra-traits", "fold"] }
-quote = "0.5"
-proc-macro2 = "0.3"
+syn = { version = "0.14", features = ["extra-traits", "fold"] }
+quote = "0.6"
+proc-macro2 = "0.4"
 
 [features]
 bench = []
diff --git a/build/match_byte.rs b/build/match_byte.rs
@@ -9,7 +9,7 @@ use std::path::Path;
 use syn;
 use syn::fold::Fold;
 
-use proc_macro2::TokenStream;
+use proc_macro2::{Span, TokenStream};
 
 struct MatchByteParser {
 }
@@ -21,7 +21,7 @@ pub fn expand(from: &Path, to: &Path) {
     let mut m = MatchByteParser {};
     let ast = m.fold_file(ast);
 
-    let code = ast.into_tokens().to_string().replace("{ ", "{\n").replace(" }", "\n}");
+    let code = ast.into_token_stream().to_string().replace("{ ", "{\n").replace(" }", "\n}");
     File::create(to).unwrap().write_all(code.as_bytes()).unwrap();
 }
 
@@ -82,7 +82,7 @@ fn expand_match_byte(body: &TokenStream) -> syn::Expr {
     for (i, ref arm) in match_byte.arms.iter().enumerate() {
         let case_id = i + 1;
         let index = case_id as isize;
-        let name = syn::Ident::from(format!("Case{}", case_id));
+        let name = syn::Ident::new(&format!("Case{}", case_id), Span::call_site());
 
         for pat in &arm.pats {
             match pat {
@@ -111,7 +111,7 @@ fn expand_match_byte(body: &TokenStream) -> syn::Expr {
                         }
                     }
                 },
-                &syn::Pat::Ident(syn::PatIdent { ident, .. }) => {
+                &syn::Pat::Ident(syn::PatIdent { ref ident, .. }) => {
                     assert_eq!(wildcard, None);
                     wildcard = Some(ident);
                     for byte in table.iter_mut() {
diff --git a/macros/Cargo.toml b/macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cssparser-macros"
-version = "0.3.3"
+version = "0.3.4"
 authors = ["Simon Sapin <simon.sapin@exyr.org>"]
 description = "Procedural macros for cssparser"
 documentation = "https://docs.rs/cssparser-macros/"
@@ -14,6 +14,6 @@ proc-macro = true
 [dependencies]
 procedural-masquerade = {path = "../procedural-masquerade", version = "0.1"}
 phf_codegen = "0.7"
-quote = "0.5"
-syn = {version = "0.13", features = ["full", "extra-traits"]}
-proc-macro2 = "0.3"
+quote = "0.6"
+syn = {version = "0.14", features = ["full", "extra-traits"]}
+proc-macro2 = "0.4"
diff --git a/macros/lib.rs b/macros/lib.rs
@@ -10,6 +10,7 @@ extern crate proc_macro2;
 extern crate syn;
 
 #[allow(unused_imports)] use std::ascii::AsciiExt;
+use quote::TokenStreamExt;
 use std::iter;
 use proc_macro2::{TokenStream, TokenTree};
 
