rustup

Author: nrc

html5ever-2015-05-15/Cargo.toml

@@ -15,11 +15,8 @@ time = "0"
 log = "0"
 phf = "0.7"
 phf_macros = "0.7"
-
-[dependencies.string_cache]
-git = "https://github.com/servo/string-cache"
-[dependencies.string_cache_plugin]
-git = "https://github.com/servo/string-cache"
+string_cache = "0.1.12"
+string_cache_plugin = { version = "0.1.7", optional = true }
 
 [dependencies.mac]
 git = "https://github.com/reem/rust-mac"

html5ever-2015-05-15/macros/src/match_token.rs

@@ -216,7 +216,7 @@ fn parse(cx: &mut ExtCtxt, toks: &[ast::TokenTree]) -> Result<Match, FatalError>
 
         let lhs_lo = parser.span.lo;
         let lhs = match parser.token {
-            token::Underscore | token::Ident(..) => Pat(parser.parse_pat()),
+            token::Underscore | token::Ident(..) => Pat(parser.parse_pat_panic()),
             token::Lt => {
                 let mut tags = Vec::new();
                 while parser.token != token::FatArrow {
@@ -428,7 +428,7 @@ pub fn expand(cx: &mut ExtCtxt, span: Span, toks: &[ast::TokenTree]) -> Box<MacR
         (None, Tags(_), _) => ext_bail!(cx, lhs.span, "the last arm cannot have tag patterns"),
         (None, _, Else) => ext_bail!(cx, rhs.span, "the last arm cannot use 'else'"),
         (None, Pat(p), Expr(e)) => match p.node {
-            ast::PatWild(ast::PatWildSingle) | ast::PatIdent(..) => (p, e),
+            ast::PatWild | ast::PatIdent(..) => (p, e),
             _ => ext_bail!(cx, lhs.span, "the last arm must have a wildcard or ident pattern"),
         },
     };

html5ever-2015-05-15/macros/src/named_entities.rs

@@ -19,7 +19,7 @@ use rustc_serialize::json;
 use rustc_serialize::json::Json;
 use rustc_serialize::Decodable;
 use syntax::codemap::Span;
-use syntax::ast::{Path, ExprLit, Lit_, TokenTree, TtToken};
+use syntax::ast::{Path, ExprLit, Lit_, TokenTree};
 use syntax::parse::token;
 use syntax::ext::base::{ExtCtxt, MacResult, MacEager};
 use syntax::ext::source_util::expand_file;
@@ -79,7 +79,7 @@ pub fn expand(cx: &mut ExtCtxt, sp: Span, tt: &[TokenTree]) -> Box<MacResult+'st
     // Argument to the macro should be a single literal string: a path to
     // entities.json, relative to the file containing the macro invocation.
     let json_filename = match tt {
-        [TtToken(_, token::Literal(token::Lit::Str_(s), _))] => s.as_str().to_string(),
+        [TokenTree::Token(_, token::Literal(token::Lit::Str_(s), _))] => s.as_str().to_string(),
         _ => ext_bail!(cx, sp, usage),
     };