Auto merge of servo#217 - hcpl:update-syn-quote-proc-macro2, r=SimonSapin

Update `syn`, `quote` and `proc-macro2`

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/rust-cssparser/217)
<!-- Reviewable:end -->

Author: bors-servo

Cargo.toml

@@ -30,9 +30,9 @@ serde = {version = "1.0", optional = true}
 smallvec = "0.6"
 
 [build-dependencies]
-syn = { version = "0.12", features = ["extra-traits", "fold"] }
-quote = "0.4.1"
-proc-macro2 = "0.2"
+syn = { version = "0.13", features = ["extra-traits", "fold"] }
+quote = "0.5"
+proc-macro2 = "0.3"
 
 [features]
 bench = []

macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cssparser-macros"
-version = "0.3.2"
+version = "0.3.3"
 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.4"
-syn = {version = "0.12", features = ["full", "extra-traits"]}
-proc-macro2 = "0.2"
+quote = "0.5"
+syn = {version = "0.13", features = ["full", "extra-traits"]}
+proc-macro2 = "0.3"

macros/lib.rs

@@ -10,8 +10,8 @@ extern crate proc_macro2;
 extern crate syn;
 
 #[allow(unused_imports)] use std::ascii::AsciiExt;
-use quote::ToTokens;
-use proc_macro2::{TokenNode, TokenStream, TokenTree};
+use std::iter;
+use proc_macro2::{TokenStream, TokenTree};
 
 define_proc_macros! {
     /// Input: the arms of a `match` expression.
@@ -24,12 +24,12 @@ define_proc_macros! {
     pub fn cssparser_internal__assert_ascii_lowercase__max_len(input: &str) -> String {
         let expr = syn::parse_str(&format!("match x {{ {} }}", input)).unwrap();
         let arms = match expr {
-            syn::Expr::Match(syn::ExprMatch { ref arms, .. }) => arms,
+            syn::Expr::Match(syn::ExprMatch { arms, .. }) => arms,
             _ => panic!("expected a match expression, got {:?}", expr)
         };
-        max_len(arms.iter().flat_map(|arm| &arm.pats).filter_map(|pattern| {
-            let expr = match *pattern {
-                syn::Pat::Lit(ref expr) => expr,
+        max_len(arms.into_iter().flat_map(|arm| arm.pats).filter_map(|pattern| {
+            let expr = match pattern {
+                syn::Pat::Lit(expr) => expr,
                 syn::Pat::Wild(_) => return None,
                 _ => panic!("expected string or wildcard pattern, got {:?}", pattern)
             };
@@ -93,6 +93,6 @@ fn max_len<I: Iterator<Item=usize>>(lengths: I) -> String {
 }
 
 fn string_literal(token: &TokenTree) -> String {
-    let lit: syn::LitStr = syn::parse2(token.clone().into()).expect(&format!("expected string literal, got {:?}", token));
+    let lit: syn::LitStr = syn::parse2(iter::once(token.clone()).collect()).expect(&format!("expected string literal, got {:?}", token));
     lit.value()
 }