---

yaml
---
r: 82600
b: refs/heads/auto
c: f285506
h: refs/heads/master
v: v3

Author: brson

[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: 0269850cc22a9b09f08584d312001afd8887e89b
+refs/heads/auto: f285506b320f12d31dd75e759192e0252572471e
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/AUTHORS.txt

@@ -1,23 +1,23 @@
-Initial author, project lead, target of blame:
-
-Graydon Hoare <[email protected]>
-
-Other authors:
-
-
+Aaron Laursen <[email protected]>
+Aaron Todd <[email protected]>
 Adam Bozanich <[email protected]>
+Adrien Tétar <[email protected]>
 Aleksander Balicki <[email protected]>
 Alex Crichton <[email protected]>
 Alex Rønne Petersen <[email protected]>
 Alexander Stavonin <[email protected]>
 Alexei Sholik <[email protected]>
+Aljaž "g5pw" Srebrnič <[email protected]>
+Anders Kaseorg <[email protected]>
 Andreas Gal <[email protected]>
+Andreas Martens <[email protected]>
 Andrew Dunham <[email protected]>
 Andrew Paseltiner <[email protected]>
 Anthony Juckel <[email protected]>
 Arkaitz Jimenez <[email protected]>
 Armin Ronacher <[email protected]>
 Ashok Gautham <[email protected]>
+Austin King <[email protected]>
 Austin Seipp <[email protected]>
 Aydin Kim <[email protected]>
 auREAX <[email protected]>
@@ -33,7 +33,12 @@ Bilal Husain <[email protected]>
 Bill Fallon <[email protected]>
 Bill Myers <[email protected]>
 Bill Wendling <[email protected]>
+Birunthan Mohanathas <[email protected]>
 Björn Steinbrink <[email protected]>
+blake2-ppc <[email protected]>
+Bouke van der Bijl <[email protected]>
+Brandon Sanderson <[email protected]>
+Brendan Cully <[email protected]>
 Brendan Eich <[email protected]>
 Brendan Zabarauskas <[email protected]>
 Brett Cannon <[email protected]>
@@ -42,7 +47,9 @@ Brian J. Burg <[email protected]>
 Brian Leibig <[email protected]>
 Bryan Dunsmore <[email protected]>
 Caitlin Potter <[email protected]>
+Carlos <[email protected]>
 Chris Double <[email protected]>
+Chris Morgan <[email protected]>
 Chris Peterson <[email protected]>
 Chris Pressey <[email protected]>
 Cody Schroeder <[email protected]>
@@ -52,39 +59,58 @@ Damien Grassart <[email protected]>
 Damien Schoof <[email protected]>
 Daniel Brooks <[email protected]>
 Daniel Farina <[email protected]>
+Dan Connolly <[email protected]>
 Dan Luu <[email protected]>
 Daniel Luz <[email protected]>
 Daniel Micay <[email protected]>
 Daniel Patterson <[email protected]>
 Daniel Ralston <[email protected]>
+Daniel Rosenwasser <[email protected]>
 Daniel Ursache Dogariu <[email protected]>
+darkf <[email protected]>
 Dave Herman <[email protected]>
+David Creswick <[email protected]>
 David Forsythe <[email protected]>
+David Halperin <[email protected]>
 David Klein <[email protected]>
+David Manescu <[email protected]>
 David Rajchenbach-Teller <[email protected]>
 Diggory Hardy <[email protected]>
 Dimitri Krassovski <[email protected]>
+Dmitry Ermolov <[email protected]>
+Do Nhat Minh <[email protected]>
 Donovan Preston <[email protected]>
 Drew Willcoxon <[email protected]>
 Elliott Slaughter <[email protected]>
 Elly Fong-Jones <[email protected]>
 Eric Holk <[email protected]>
 Eric Holmes <[email protected]>
+Eric Martin <[email protected]>
+Eric Reed <[email protected]>
 Erick Tryzelaar <[email protected]>
 Erik Rose <[email protected]>
+Etienne Millon <[email protected]>
 Evan McClanahan <[email protected]>
 Fedor Indutny <[email protected]>
 Felix S. Klock II <[email protected]>
+Flaper Fesp <[email protected]>
+Flavio Percoco <[email protected]>
+Florian Hahn <[email protected]>
+Florian Zeitz <[email protected]>
 Francisco Souza <[email protected]>
 Franklin Chen <[email protected]>
 Gábor Horváth <[email protected]>
 Gabriel <[email protected]>
 Gareth Daniel Smith <[email protected]>
+Gary Linscott <[email protected]>
+Georges Dubus <[email protected]>
 gifnksm <[email protected]>
 Glenn Willen <[email protected]>
 Gonçalo Cabrita <[email protected]>
 Graham Fawcett <[email protected]>
 Grahame Bowland <[email protected]>
+Graydon Hoare <[email protected]>
+Grigoriy <[email protected]>
 Haitao Li <[email protected]>
 hansjorg <[email protected]>
 Herman J. Radtke III <[email protected]>
@@ -96,9 +122,11 @@ Ivano Coppola <[email protected]>
 Jack Moffitt <[email protected]>
 Jacob Harris Cryer Kragh <[email protected]>
 Jacob Parker <[email protected]>
+Jakub <[email protected]>
 Jakub Wieczorek <[email protected]>
 James Miller <[email protected]>
 James Tranovich <[email protected]>
+Jan Kobler <[email protected]>
 Jason Orendorff <[email protected]>
 Jed Davis <[email protected]>
 Jeff Balogh <[email protected]>
@@ -113,35 +141,48 @@ Jesse Ruderman <[email protected]>
 Jihyun Yu <[email protected]>
 Jim Blandy <[email protected]>
 Jimmy Lu <[email protected]>
+Jimmy Zelinskie <[email protected]>
 J. J. Weber <[email protected]>
+jmgrosen <[email protected]>
 Joe Pletcher <[email protected]>
+John Barker <[email protected]>
 John Clements <[email protected]>
 Jon Morton <[email protected]>
 Jonathan Sternberg <[email protected]>
+Jordi Boggiano <[email protected]>
 Josh Matthews <[email protected]>
 Joshua Clark <[email protected]>
 Joshua Wise <[email protected]>
 Junyoung Cho <[email protected]>
 Jyun-Yan You <[email protected]>
 Kang Seonghoon <[email protected]>
+Keegan McAllister <[email protected]>
 Kelly Wilson <[email protected]>
 Kevin Atkinson <[email protected]>
 Kevin Ballard <[email protected]>
 Kevin Cantu <[email protected]>
+Kevin Mehall <[email protected]>
+Kevin Murphy <[email protected]>
 klutzy <[email protected]>
+korenchkin <[email protected]>
 Kyeongwoon Lee <[email protected]>
+Lars Bergstrom <[email protected]>
 Laurent Bonnans <[email protected]>
 Lawrence Velázquez <[email protected]>
 Leah Hanson <[email protected]>
 Lennart Kudling <[email protected]>
 Lindsey Kuper <[email protected]>
 Luca Bruno <[email protected]>
+Luis de Bethencourt <[email protected]>
 Luqman Aden <[email protected]>
 Magnus Auvinen <[email protected]>
 Mahmut Bulut <[email protected]>
+maikklein <[email protected]>
+Makoto Nakashima <[email protected]>
 Margaret Meyerhofer <[email protected]>
 Marijn Haverbeke <[email protected]>
 Mark Lacey <[email protected]>
+Mark Sinclair <[email protected]>
 Mark Vian <[email protected]>
 Marti Raudsepp <[email protected]>
 Martin DeMello <[email protected]>
@@ -151,18 +192,27 @@ Matthew McPherrin <[email protected]>
 Matthew O'Connor <[email protected]>
 Matthijs Hofstra <[email protected]>
 Max Penet <[email protected]>
+Maxim Kolganov <[email protected]>
+Micah Chalmer <[email protected]>
 Michael Arntzenius <[email protected]>
 Michael Bebenita <[email protected]>
 Michael Neumann <[email protected]>
 Michael Sullivan <[email protected]>
+Michael Woerister <michaelwoerister@gmail>
+Mihnea Dobrescu-Balaur <[email protected]>
 Mikko Perttunen <[email protected]>
+Mukilan Thiagarajan <[email protected]>
 Nick Desaulniers <[email protected]>
 Niko Matsakis <[email protected]>
+novalis <[email protected]>
+Ogino Masanori <[email protected]>
 Olivier Saut <[email protected]>
 Or Brostovski <[email protected]>
 Orphée Lafond-Lummis <[email protected]>
+Palmer Cox <[email protected]>
 Patrick Walton <[email protected]>
 Patrik Kårlin <[email protected]>
+Paul Collins <[email protected]>
 Paul Stansifer <[email protected]>
 Paul Woolcock <[email protected]>
 Pavel Panchekha <[email protected]>
@@ -177,25 +227,32 @@ Reuben Morais <[email protected]>
 Rick Waldron <[email protected]>
 Rob Arnold <[email protected]>
 Rob Hoelz <[email protected]>
+Robert Knight <[email protected]>
+Robert Millar <[email protected]>
 Roland Tanglao <[email protected]>
 Ron Dahlgren <[email protected]>
 Roy Frostig <[email protected]>
 Ryan Scheel <[email protected]>
 Samuel Chase <[email protected]>
 Sander Mathijs van Veen <[email protected]>
 Sangeun Kim <[email protected]>
+Sankha Narayan Guria <[email protected]>
 Saurabh Anand <[email protected]>
+Scott Lawrence <[email protected]>
 Sean Moon <[email protected]>
 Sean Stangl <[email protected]>
 Sebastian N. Fernandez <[email protected]>
+Sébastien Crozet <[email protected]>
 Seth Pink <[email protected]>
 Seo Sanghyeon <[email protected]>
 sevrak <[email protected]>
 SiegeLord <[email protected]>
 Simon Barber-Dueck <[email protected]>
 Simon Sapin <[email protected]>
+sp3d <sp3d@github>
 startling <[email protected]>
 Stefan Plantikow <[email protected]>
+Stepan Koltsov <[email protected]>
 Steve Klabnik <[email protected]>
 Steven De Coeyer <[email protected]>
 Steven Fackler <[email protected]>
@@ -205,6 +262,7 @@ Ted Horst <[email protected]>
 Thad Guidry <[email protected]>
 Thomas Daede <[email protected]>
 Tim Chevalier <[email protected]>
+Tim Kuehn <[email protected]>
 Tim Taubert <[email protected]>
 Tom Lee <[email protected]>
 Tommy M. McGuire <[email protected]>
@@ -213,6 +271,7 @@ Tony Young <[email protected]>
 Trinick <[email protected]>
 Tycho Sci <[email protected]>
 Tyler Bindon <[email protected]>
+U-NOV2010\eugals
 Uwe Dauernheim <[email protected]>
 Vadim Chugunov <[email protected]>
 Viktor Dahl <[email protected]>
@@ -225,4 +284,5 @@ Young-il Choi <[email protected]>
 Youngmin Yoo <[email protected]>
 Youngsoo Son <[email protected]>
 Zack Corr <[email protected]>
+Zack Slayton <[email protected]>
 zofrex <[email protected]>

branches/auto/src/librust/rust.rs

@@ -28,7 +28,6 @@ extern mod rustc;
 use std::io;
 use std::os;
 use std::run;
-use std::libc::exit;
 
 enum ValidUsage {
     Valid(int), Invalid
@@ -235,7 +234,7 @@ pub fn main() {
 
     if (os_args.len() > 1 && (os_args[1] == ~"-v" || os_args[1] == ~"--version")) {
         rustc::version(os_args[0]);
-        unsafe { exit(0); }
+        return;
     }
 
     let args = os_args.tail();
@@ -245,8 +244,11 @@ pub fn main() {
         for command in r.iter() {
             let result = do_command(command, args.tail());
             match result {
-                Valid(exit_code) => unsafe { exit(exit_code.to_i32()) },
-                _                => loop
+                Valid(exit_code) => {
+                    os::set_exit_status(exit_code);
+                    return;
+                }
+                _ => loop
             }
         }
     }

branches/auto/src/libsyntax/ast_util.rs

@@ -740,7 +740,7 @@ pub fn new_mark(m:Mrk, tail:SyntaxContext) -> SyntaxContext {
 }
 
 // Extend a syntax context with a given mark and table
-// FIXME #8215 : currently pub to allow testing
+// FIXME #4536 : currently pub to allow testing
 pub fn new_mark_internal(m:Mrk, tail:SyntaxContext,table:&mut SCTable)
     -> SyntaxContext {
     let key = (tail,m);
@@ -769,7 +769,7 @@ pub fn new_rename(id:Ident, to:Name, tail:SyntaxContext) -> SyntaxContext {
 }
 
 // Extend a syntax context with a given rename and sctable
-// FIXME #8215 : currently pub to allow testing
+// FIXME #4536 : currently pub to allow testing
 pub fn new_rename_internal(id:Ident, to:Name, tail:SyntaxContext, table: &mut SCTable)
     -> SyntaxContext {
     let key = (tail,id,to);
@@ -792,7 +792,7 @@ pub fn new_rename_internal(id:Ident, to:Name, tail:SyntaxContext, table: &mut SC
 
 /// Make a fresh syntax context table with EmptyCtxt in slot zero
 /// and IllegalCtxt in slot one.
-// FIXME #8215 : currently pub to allow testing
+// FIXME #4536 : currently pub to allow testing
 pub fn new_sctable_internal() -> SCTable {
     SCTable {
         table: ~[EmptyCtxt,IllegalCtxt],
@@ -834,7 +834,7 @@ pub fn mtwt_resolve(id : Ident) -> Name {
     resolve_internal(id, get_sctable(), get_resolve_table())
 }
 
-// FIXME #8215: must be pub for testing
+// FIXME #4536: must be pub for testing
 pub type ResolveTable = HashMap<(Name,SyntaxContext),Name>;
 
 // okay, I admit, putting this in TLS is not so nice:
@@ -853,7 +853,7 @@ pub fn get_resolve_table() -> @mut ResolveTable {
 
 // Resolve a syntax object to a name, per MTWT.
 // adding memoization to possibly resolve 500+ seconds in resolve for librustc (!)
-// FIXME #8215 : currently pub to allow testing
+// FIXME #4536 : currently pub to allow testing
 pub fn resolve_internal(id : Ident,
                         table : &mut SCTable,
                         resolve_table : &mut ResolveTable) -> Name {

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

@@ -1640,10 +1640,9 @@ mod test {
                   macro_rules! user(($x:ident) => ({letty!($x); $x}))
                   fn main() -> int {user!(z)}",
                  ~[~[0]], false),
-                // no longer a fixme #8062: this test exposes a *potential* bug; our system does
-                // not behave exactly like MTWT, but a conversation with Matthew Flatt
-                // suggests that this can only occur in the presence of local-expand, which
-                // we have no plans to support.
+                // FIXME #8062: this test exposes a *potential* bug; our system does
+                // not behave exactly like MTWT, but I haven't thought of a way that
+                // this could cause a bug in Rust, yet.
                 // ("fn main() {let hrcoo = 19; macro_rules! getx(()=>(hrcoo)); getx!();}",
                 // ~[~[0]], true)
                 // FIXME #6994: the next string exposes the bug referred to in issue 6994, so I'm
@@ -1656,7 +1655,6 @@ mod test {
                 //   fn a(){g!(z)}"
                 // create a really evil test case where a $x appears inside a binding of $x
                 // but *shouldnt* bind because it was inserted by a different macro....
-                // can't write this test case until we have macro-generating macros.
             ];
         for (idx,s) in tests.iter().enumerate() {
             run_renaming_test(s,idx);

branches/auto/src/libsyntax/parse/lexer.rs

@@ -868,6 +868,7 @@ fn consume_whitespace(rdr: @mut StringReader) {
 mod test {
     use super::*;
 
+    use ast;
     use codemap::{BytePos, CodeMap, Span};
     use diagnostic;
     use parse::token;