---

yaml
---
r: 106227
b: refs/heads/auto
c: 57ac379
h: refs/heads/master
i:
  106225: 7056307
  106223: 403f774
v: v3

Author: pnkfelix

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: f8f60d80bf573cd8b4b5680b44c9cabe2b862f78
+refs/heads/auto: 57ac379a630d9756c71f2747debe1756ccf62c5f
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/doc/rust.md

@@ -3446,8 +3446,9 @@ The kinds are:
     This kind includes scalars and immutable references,
     as well as structural types containing other `Pod` types.
 `'static`
-  : Types of this kind do not contain any references;
-    this can be a useful guarantee for code
+  : Types of this kind do not contain any references (except for
+    references with the `static` lifetime, which are allowed).
+    This can be a useful guarantee for code
     that breaks borrowing assumptions
     using [`unsafe` operations](#unsafe-functions).
 `Drop`

branches/auto/src/libsyntax/ext/base.rs

@@ -119,31 +119,13 @@ impl MacResult {
     pub fn raw_dummy_expr(sp: codemap::Span) -> @ast::Expr {
         @ast::Expr {
             id: ast::DUMMY_NODE_ID,
-            node: ast::ExprLit(@codemap::respan(sp, ast::LitNil)),
-            span: sp,
+            node: ast::ExprTup(Vec::new()),
+            span: sp
         }
     }
     pub fn dummy_expr(sp: codemap::Span) -> MacResult {
         MRExpr(MacResult::raw_dummy_expr(sp))
     }
-    pub fn dummy_any(sp: codemap::Span) -> MacResult {
-        MRAny(~DummyMacResult { sp: sp })
-    }
-}
-struct DummyMacResult {
-    sp: codemap::Span
-}
-impl AnyMacro for DummyMacResult {
-    fn make_expr(&self) -> @ast::Expr {
-        MacResult::raw_dummy_expr(self.sp)
-    }
-    fn make_items(&self) -> SmallVector<@ast::Item> {
-        SmallVector::zero()
-    }
-    fn make_stmt(&self) -> @ast::Stmt {
-        @codemap::respan(self.sp,
-                         ast::StmtExpr(MacResult::raw_dummy_expr(self.sp), ast::DUMMY_NODE_ID))
-    }
 }
 
 /// An enum representing the different kinds of syntax extensions.

branches/auto/src/libsyntax/ext/log_syntax.rs

@@ -10,10 +10,11 @@
 
 use ast;
 use codemap;
+use ext::base::*;
 use ext::base;
 use print;
 
-pub fn expand_syntax_ext(cx: &mut base::ExtCtxt,
+pub fn expand_syntax_ext(cx: &mut ExtCtxt,
                          sp: codemap::Span,
                          tt: &[ast::TokenTree])
                       -> base::MacResult {
@@ -22,6 +23,13 @@ pub fn expand_syntax_ext(cx: &mut base::ExtCtxt,
     println!("{}", print::pprust::tt_to_str(&ast::TTDelim(
                 @tt.iter().map(|x| (*x).clone()).collect())));
 
-    // any so that `log_syntax` can be invoked as an expression and item.
-    base::MacResult::dummy_any(sp)
+    //trivial expression
+    MRExpr(@ast::Expr {
+        id: ast::DUMMY_NODE_ID,
+        node: ast::ExprLit(@codemap::Spanned {
+            node: ast::LitNil,
+            span: sp
+        }),
+        span: sp,
+    })
 }

branches/auto/src/libsyntax/ext/trace_macros.rs

@@ -12,21 +12,33 @@ use ast;
 use codemap::Span;
 use ext::base::ExtCtxt;
 use ext::base;
-use parse::token::{keywords, is_keyword};
+use parse::lexer::{new_tt_reader, Reader};
+use parse::parser::Parser;
+use parse::token::keywords;
 
 pub fn expand_trace_macros(cx: &mut ExtCtxt,
                            sp: Span,
                            tt: &[ast::TokenTree])
                         -> base::MacResult {
-    match tt {
-        [ast::TTTok(_, ref tok)] if is_keyword(keywords::True, tok) => {
-            cx.set_trace_macros(true);
-        }
-        [ast::TTTok(_, ref tok)] if is_keyword(keywords::False, tok) => {
-            cx.set_trace_macros(false);
-        }
-        _ => cx.span_err(sp, "trace_macros! accepts only `true` or `false`"),
+    let sess = cx.parse_sess();
+    let cfg = cx.cfg();
+    let tt_rdr = new_tt_reader(&cx.parse_sess().span_diagnostic,
+                               None,
+                               tt.iter().map(|x| (*x).clone()).collect());
+    let mut rust_parser = Parser(sess, cfg.clone(), tt_rdr.dup());
+
+    if rust_parser.is_keyword(keywords::True) {
+        cx.set_trace_macros(true);
+    } else if rust_parser.is_keyword(keywords::False) {
+        cx.set_trace_macros(false);
+    } else {
+        cx.span_err(sp, "trace_macros! only accepts `true` or `false`");
+        return base::MacResult::dummy_expr(sp);
     }
 
-    base::MacResult::dummy_any(sp)
+    rust_parser.bump();
+
+    let mut rust_parser = Parser(sess, cfg, tt_rdr.dup());
+    let result = rust_parser.parse_expr();
+    base::MRExpr(result)
 }

branches/auto/src/libterm/lib.rs

@@ -20,7 +20,6 @@
       html_root_url = "http://static.rust-lang.org/doc/master")];
 
 #[feature(macro_rules)];
-#[deny(missing_doc)];
 
 extern crate collections;
 
@@ -35,9 +34,7 @@ pub mod terminfo;
 
 // FIXME (#2807): Windows support.
 
-/// Terminal color definitions
 pub mod color {
-    /// Number for a terminal color
     pub type Color = u16;
 
     pub static BLACK:   Color = 0u16;
@@ -59,10 +56,8 @@ pub mod color {
     pub static BRIGHT_WHITE:   Color = 15u16;
 }
 
-/// Terminal attributes
 pub mod attr {
     /// Terminal attributes for use with term.attr().
-    ///
     /// Most attributes can only be turned on and must be turned off with term.reset().
     /// The ones that can be turned off explicitly take a boolean value.
     /// Color is also represented as an attribute for convenience.
@@ -108,23 +103,13 @@ fn cap_for_attr(attr: attr::Attr) -> &'static str {
     }
 }
 
-/// A Terminal that knows how many colors it supports, with a reference to its
-/// parsed TermInfo database record.
 pub struct Terminal<T> {
     priv num_colors: u16,
     priv out: T,
     priv ti: ~TermInfo
 }
 
 impl<T: Writer> Terminal<T> {
-    /// Returns a wrapped output stream (`Terminal<T>`) as a `Result`.
-    ///
-    /// Returns `Err()` if the TERM environment variable is undefined.
-    /// TERM should be set to something like `xterm-color` or `screen-256color`.
-    ///
-    /// Returns `Err()` on failure to open the terminfo database correctly.
-    /// Also, in the event that the individual terminfo database entry can not
-    /// be parsed.
     pub fn new(out: T) -> Result<Terminal<T>, ~str> {
         let term = match os::getenv("TERM") {
             Some(t) => t,
@@ -158,8 +143,8 @@ impl<T: Writer> Terminal<T> {
     /// If the color is a bright color, but the terminal only supports 8 colors,
     /// the corresponding normal color will be used instead.
     ///
-    /// Returns `Ok(true)` if the color was set, `Ok(false)` otherwise, and `Err(e)`
-    /// if there was an I/O error.
+    /// Returns Ok(true) if the color was set, Ok(false) otherwise, and Err(e)
+    /// if there was an I/O error
     pub fn fg(&mut self, color: color::Color) -> io::IoResult<bool> {
         let color = self.dim_if_necessary(color);
         if self.num_colors > color {
@@ -181,8 +166,8 @@ impl<T: Writer> Terminal<T> {
     /// If the color is a bright color, but the terminal only supports 8 colors,
     /// the corresponding normal color will be used instead.
     ///
-    /// Returns `Ok(true)` if the color was set, `Ok(false)` otherwise, and `Err(e)`
-    /// if there was an I/O error.
+    /// Returns Ok(true) if the color was set, Ok(false) otherwise, and Err(e)
+    /// if there was an I/O error
     pub fn bg(&mut self, color: color::Color) -> io::IoResult<bool> {
         let color = self.dim_if_necessary(color);
         if self.num_colors > color {
@@ -201,8 +186,8 @@ impl<T: Writer> Terminal<T> {
     }
 
     /// Sets the given terminal attribute, if supported.
-    /// Returns `Ok(true)` if the attribute was supported, `Ok(false)` otherwise,
-    /// and `Err(e)` if there was an I/O error.
+    /// Returns Ok(true) if the attribute was supported, Ok(false) otherwise,
+    /// and Err(e) if there was an I/O error.
     pub fn attr(&mut self, attr: attr::Attr) -> io::IoResult<bool> {
         match attr {
             attr::ForegroundColor(c) => self.fg(c),
@@ -238,7 +223,6 @@ impl<T: Writer> Terminal<T> {
     }
 
     /// Resets all terminal attributes and color to the default.
-    /// Returns `Ok()`.
     pub fn reset(&mut self) -> io::IoResult<()> {
         let mut cap = self.ti.strings.find_equiv(&("sgr0"));
         if cap.is_none() {
@@ -264,13 +248,10 @@ impl<T: Writer> Terminal<T> {
         } else { color }
     }
 
-    /// Returns the contained stream
     pub fn unwrap(self) -> T { self.out }
 
-    /// Gets an immutable reference to the stream inside
     pub fn get_ref<'a>(&'a self) -> &'a T { &self.out }
 
-    /// Gets a mutable reference to the stream inside
     pub fn get_mut<'a>(&'a mut self) -> &'a mut T { &mut self.out }
 }
 

branches/auto/src/libterm/terminfo/mod.rs

@@ -8,11 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//! Terminfo database interface.
+#[allow(missing_doc)];
 
 use collections::HashMap;
 
-/// A parsed terminfo database entry.
+/// A parsed terminfo entry.
 pub struct TermInfo {
     /// Names for the terminal
     priv names: Vec<~str> ,
@@ -25,10 +25,7 @@ pub struct TermInfo {
 }
 
 pub mod searcher;
-
-/// TermInfo format parsing.
 pub mod parser {
-    //! ncurses-compatible compiled terminfo format parsing (term(5))
     pub mod compiled;
 }
 pub mod parm;

branches/auto/src/libterm/terminfo/parm.rs

@@ -38,8 +38,8 @@ enum FormatState {
 }
 
 /// Types of parameters a capability can use
-#[allow(missing_doc)]
 #[deriving(Clone)]
+#[allow(missing_doc)]
 pub enum Param {
     String(~str),
     Number(int)

branches/auto/src/libterm/terminfo/parser/compiled.rs

@@ -10,7 +10,7 @@
 
 #[allow(non_uppercase_statics)];
 
-//! ncurses-compatible compiled terminfo format parsing (term(5))
+/// ncurses-compatible compiled terminfo format parsing (term(5))
 
 use collections::HashMap;
 use std::io;

branches/auto/src/libterm/terminfo/searcher.rs

@@ -8,9 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//! ncurses-compatible database discovery
-//!
-//! Does not support hashed database, only filesystem!
+/// Implement ncurses-compatible database discovery
+/// Does not support hashed database, only filesystem!
 
 use std::io::File;
 use std::os::getenv;

branches/auto/src/test/compile-fail/issue-11692.rs

@@ -15,4 +15,5 @@ fn main() {
 
     concat!(test!());
     //~^ ERROR: macro undefined: 'test'
+    //~^^ ERROR: expected a literal
 }