From bebab5d8edecc96fb2ace7230000de915f7edbd1 Mon Sep 17 00:00:00 2001
From: Manish Goregaokar <manishsmail@gmail.com>
Date: Tue, 10 Nov 2015 07:15:53 +0530
Subject: [PATCH] Rustup to rustc 1.6.0-nightly (5b4986fa5 2015-11-08)

---
 Cargo.toml               |  6 +++---
 macros/Cargo.toml        |  2 +-
 macros/src/pre_expand.rs | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 249f851e..8dd9be44 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "html5ever"
-version = "0.2.7"
+version = "0.2.8"
 authors = [ "The html5ever Project Developers" ]
 license = "MIT / Apache-2.0"
 repository = "https://github.com/servo/html5ever"
@@ -24,7 +24,7 @@ time = "0"
 log = "0"
 phf = "0.7"
 string_cache = "0.1.12"
-string_cache_plugin = { version = "0.1.7", optional = true }
+string_cache_plugin = { version = "0.1.10", optional = true }
 mac = "0"
 tendril = "0.1.3"
 rc = "0.1.1"
@@ -37,7 +37,7 @@ rustc-serialize = "0.3.15"
 [build-dependencies]
 phf_codegen = "0.7.3"
 rustc-serialize = "0.3.15"
-html5ever_macros = { version = "0.2.5", path = "macros", optional = true }
+html5ever_macros = { version = "0.2.6", path = "macros", optional = true }
 
 [profile.dev]
 debug = false
diff --git a/macros/Cargo.toml b/macros/Cargo.toml
index 776dbc6a..da6a9e25 100644
--- a/macros/Cargo.toml
+++ b/macros/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "html5ever_macros"
-version = "0.2.5"
+version = "0.2.6"
 authors = [ "The html5ever Project Developers" ]
 license = "MIT / Apache-2.0"
 repository = "https://github.com/servo/html5ever"
diff --git a/macros/src/pre_expand.rs b/macros/src/pre_expand.rs
index 5b3c302a..04393320 100644
--- a/macros/src/pre_expand.rs
+++ b/macros/src/pre_expand.rs
@@ -45,16 +45,16 @@ fn find_and_expand_match_token(cx: &mut ext::base::ExtCtxt, tts: Vec<ast::TokenT
     let mut tts = tts.into_iter().peekable();
     while let Some(tt) = tts.next() {
         match tt {
-            ast::TokenTree::TtToken(span, token::Token::Ident(ident, token::IdentStyle::Plain))
+            ast::TokenTree::Token(span, token::Token::Ident(ident, token::IdentStyle::Plain))
             if ident.name.as_str() == "match_token"
             => {
                 // `!`
-                if !matches!(tts.next(), Some(ast::TokenTree::TtToken(_, token::Token::Not))) {
+                if !matches!(tts.next(), Some(ast::TokenTree::Token(_, token::Token::Not))) {
                     expanded.push(tt);
                     continue
                 }
                 match tts.next() {
-                    Some(ast::TokenTree::TtDelimited(_, block)) => {
+                    Some(ast::TokenTree::Delimited(_, block)) => {
                         cx.bt_push(expn_info(span));
                         expanded.extend(
                             match match_token::expand_to_tokens(cx, span, &block.tts) {
@@ -69,10 +69,10 @@ fn find_and_expand_match_token(cx: &mut ext::base::ExtCtxt, tts: Vec<ast::TokenT
                     _ => panic!("expected a block after {:?}", span)
                 }
             }
-            ast::TokenTree::TtDelimited(span, mut block) => {
+            ast::TokenTree::Delimited(span, mut block) => {
                 Rc::make_mut(&mut block);
                 let block = Rc::try_unwrap(block).unwrap();
-                expanded.push(ast::TokenTree::TtDelimited(span, Rc::new(ast::Delimited {
+                expanded.push(ast::TokenTree::Delimited(span, Rc::new(ast::Delimited {
                     delim: block.delim,
                     open_span: block.open_span,
                     tts: find_and_expand_match_token(cx, block.tts),