Upgrade to rustc 0.12.0-pre (0bdac78da 2014-09-01 21:31:00 +0000)

Author: kmcallister

macros/src/match_token.rs

@@ -283,7 +283,7 @@ fn make_tag_pattern(cx: &mut ExtCtxt, binding: Tokens, tag: Tag) -> Tokens {
 }
 
 /// Expand the `match_token!` macro.
-pub fn expand(cx: &mut ExtCtxt, span: Span, tts: &[ast::TokenTree]) -> Box<MacResult> {
+pub fn expand(cx: &mut ExtCtxt, span: Span, tts: &[ast::TokenTree]) -> Box<MacResult+'static> {
     let Match { discriminant, mut arms } = parse(cx, tts);
 
     // Handle the last arm specially at the end.

macros/src/named_entities.rs

@@ -71,7 +71,7 @@ fn build_map(js: Json) -> Option<HashMap<String, [u32, ..2]>> {
 }
 
 // Expand named_entities!("path/to/entities.json") into an invocation of phf_map!().
-pub fn expand(cx: &mut ExtCtxt, sp: Span, tt: &[TokenTree]) -> Box<MacResult> {
+pub fn expand(cx: &mut ExtCtxt, sp: Span, tt: &[TokenTree]) -> Box<MacResult+'static> {
     let usage = "Usage: named_entities!(\"path/to/entities.json\")";
 
     // Argument to the macro should be a single literal string: a path to

src/serialize/mod.rs

@@ -52,7 +52,7 @@ struct ElemInfo {
 
 pub type AttrRef<'a> = (&'a AttrName, &'a str);
 
-pub struct Serializer<'wr, Wr> {
+pub struct Serializer<'wr, Wr:'wr> {
     writer: &'wr mut Wr,
     opts: SerializeOpts,
     stack: Vec<ElemInfo>,

src/tokenizer/buffer_queue.rs

@@ -163,7 +163,7 @@ impl Iterator<char> for BufferQueue {
 }
 
 #[cfg(test)]
-#[allow(non_snake_case_functions)]
+#[allow(non_snake_case)]
 mod test {
     use core::prelude::*;
     use collections::string::String;

src/tokenizer/char_ref/mod.rs

@@ -270,7 +270,7 @@ impl<'sink, Sink: TokenSink> CharRefTokenizer {
     }
 
     fn unconsume_name(&mut self, tokenizer: &mut Tokenizer<'sink, Sink>) {
-        tokenizer.unconsume(self.name_buf_opt.take_unwrap());
+        tokenizer.unconsume(self.name_buf_opt.take().unwrap());
     }
 
     fn finish_named(&mut self,

src/tokenizer/mod.rs

@@ -97,7 +97,7 @@ impl Default for TokenizerOpts {
 }
 
 /// The HTML tokenizer.
-pub struct Tokenizer<'sink, Sink> {
+pub struct Tokenizer<'sink, Sink:'sink> {
     /// Options controlling the behavior of the tokenizer.
     opts: TokenizerOpts,
 
@@ -1202,7 +1202,7 @@ impl<'sink, Sink: TokenSink> Tokenizer<'sink, Sink> {
     fn step_char_ref_tokenizer(&mut self) -> bool {
         // FIXME HACK: Take and replace the tokenizer so we don't
         // double-mut-borrow self.  This is why it's boxed.
-        let mut tok = self.char_ref_tokenizer.take_unwrap();
+        let mut tok = self.char_ref_tokenizer.take().unwrap();
         let outcome = tok.step(self);
 
         let progress = match outcome {
@@ -1364,7 +1364,7 @@ impl<'sink, Sink: TokenSink> Tokenizer<'sink, Sink> {
 }
 
 #[cfg(test)]
-#[allow(non_snake_case_functions)]
+#[allow(non_snake_case)]
 mod test {
     use core::prelude::*;
     use collections::vec::Vec;

src/tree_builder/mod.rs

@@ -72,7 +72,7 @@ impl Default for TreeBuilderOpts {
 }
 
 /// The HTML tree builder.
-pub struct TreeBuilder<'sink, Handle, Sink> {
+pub struct TreeBuilder<'sink, Handle, Sink:'sink> {
     /// Options controlling the behavior of the tree builder.
     opts: TreeBuilderOpts,
 

src/util/str.rs

@@ -152,9 +152,10 @@ impl<'a> AsciiExt<String> for &'a str {
 /// If `c` is an ASCII letter, return the corresponding lowercase
 /// letter, otherwise None.
 pub fn lower_ascii_letter(c: char) -> Option<char> {
-    c.to_ascii_opt()
-        .filtered(|a| a.is_alphabetic())
-        .map(|a| a.to_lowercase().to_char())
+    match c.to_ascii_opt() {
+        Some(a) if a.is_alphabetic() => Some(a.to_lowercase().to_char()),
+        _ => None,
+    }
 }
 
 /// Map ASCII uppercase to lowercase; preserve other characters.
@@ -200,7 +201,7 @@ pub fn char_run<Pred: CharEq>(mut pred: Pred, buf: &str) -> Option<(uint, bool)>
 }
 
 #[cfg(test)]
-#[allow(non_snake_case_functions)]
+#[allow(non_snake_case)]
 mod test {
     use core::prelude::*;
     use super::{char_run, is_ascii_whitespace, is_ascii_alnum, lower_ascii, lower_ascii_letter};