Auto merge of #119 - servo:rustup, r=frewsxcv

Rustup to rustc 1.6.0-nightly (5b4986fa5 2015-11-08)

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/string-cache/119)
<!-- Reviewable:end -->

Author: bors-servo

plugin/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "string_cache_plugin"
-version = "0.1.9"
+version = "0.1.10"
 authors = [ "The Servo Project Developers" ]
 description = "A string interning library for Rust, developed as part of the Servo project − compiler plugin."
 license = "MIT / Apache-2.0"

plugin/src/atom/mod.rs

@@ -9,7 +9,7 @@
 
 use syntax::ptr::P;
 use syntax::codemap::Span;
-use syntax::ast::{TokenTree, TtToken};
+use syntax::ast::TokenTree;
 use syntax::ast;
 use syntax::ext::base::{ExtCtxt, MacResult, MacEager};
 use syntax::parse::token::{InternedString, Ident, Literal, Lit};
@@ -21,8 +21,8 @@ use std::ascii::AsciiExt;
 
 fn atom_tok_to_str(t: &TokenTree) -> Option<InternedString> {
     Some(match *t {
-        TtToken(_, Ident(s, _)) => s.name.as_str(),
-        TtToken(_, Literal(Lit::Str_(s), _)) => s.as_str(),
+        TokenTree::Token(_, Ident(s, _)) => s.name.as_str(),
+        TokenTree::Token(_, Literal(Lit::Str_(s), _)) => s.as_str(),
         _ => return None,
     })
 }