Auto merge of #207 - Eijebong:bump, r=jdm

Update quote, proc-macro2 and bump version in codegen

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

Author: bors-servo

string-cache-codegen/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "string_cache_codegen"
-version = "0.4.1"  # Also update ../README.md when making a semver-breaking change
+version = "0.4.2"  # Also update ../README.md when making a semver-breaking change
 authors = [ "The Servo Project Developers" ]
 description = "A codegen library for string-cache, developed as part of the Servo project."
 license = "MIT / Apache-2.0"
@@ -16,5 +16,5 @@ path = "lib.rs"
 string_cache_shared = {path = "../shared", version = "0.3"}
 phf_generator = "0.7.15"
 phf_shared = "0.7.4"
-proc-macro2 = "0.3.1"
-quote = "0.5.1"
+proc-macro2 = "0.4"
+quote = "0.6"

string-cache-codegen/lib.rs

@@ -179,7 +179,7 @@ impl AtomType {
             .as_bytes())
     }
 
-    fn to_tokens(&mut self) -> quote::Tokens {
+    fn to_tokens(&mut self) -> proc_macro2::TokenStream {
         // `impl Default for Atom` requires the empty string to be in the static set.
         // This also makes sure the set in non-empty,
         // which would cause divisions by zero in rust-phf.
@@ -224,7 +224,7 @@ impl AtomType {
             Some(ref doc) => quote!(#[doc = #doc]),
             None => quote!()
         };
-        let new_term = |string: &str| proc_macro2::Term::new(string, proc_macro2::Span::call_site());
+        let new_term = |string: &str| proc_macro2::Ident::new(string, proc_macro2::Span::call_site());
         let static_set_name = new_term(&format!("{}StaticSet", type_name));
         let type_name = new_term(type_name);
         let macro_name = new_term(&*self.macro_name);