---

yaml
---
r: 81116
b: refs/heads/snap-stage3
c: 324418f
h: refs/heads/master
v: v3

Author: alexcrichton

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 4c6bf4872012c010f84dc7fa2cdfe87522533f89
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: a05de31ae9868a6d58c86f955541cfe1bf89c21f
+refs/heads/snap-stage3: 324418f32bd0d82f20dd79327dff1e3c78b719d2
 refs/heads/try: 70152ff55722878cde684ee6462c14c65f2c4729
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/AUTHORS.txt

@@ -1,23 +1,23 @@
-Aaron Laursen <[email protected]>
-Aaron Todd <[email protected]>
+Initial author, project lead, target of blame:
+
+Graydon Hoare <[email protected]>
+
+Other authors:
+
+
 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,12 +33,7 @@ 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]>
@@ -47,9 +42,7 @@ 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]>
@@ -59,58 +52,39 @@ 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]>
@@ -122,11 +96,9 @@ 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]>
@@ -141,48 +113,35 @@ 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]>
@@ -192,27 +151,18 @@ 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]>
@@ -227,32 +177,25 @@ 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]>
@@ -262,7 +205,6 @@ 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]>
@@ -271,7 +213,6 @@ 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]>
@@ -284,5 +225,4 @@ 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/snap-stage3/RELEASES.txt

@@ -1,7 +1,7 @@
-Version 0.8 (September 2013)
+Version 0.8 (October 2013)
 --------------------------
 
-   * ~2200 changes, numerous bugfixes
+   * ~2100 changes, numerous bugfixes
 
    * Language
       * The `for` loop syntax has changed to work with the `Iterator` trait.

branches/snap-stage3/configure

@@ -848,8 +848,6 @@ do
         # Disable term-info, linkage of which comes in multiple forms,
         # making our snapshots incompatible (#9334)
         LLVM_OPTS="$LLVM_OPTS --disable-terminfo"
-        # Try to have LLVM pull in as few dependencies as possible (#9397)
-        LLVM_OPTS="$LLVM_OPTS --disable-zlib --disable-libffi"
 
         case "$CFG_C_COMPILER" in
             ("ccache clang")

branches/snap-stage3/src/etc/combine-tests.py

@@ -29,8 +29,6 @@ def scrub(b):
         if not ("xfail-test" in s or
                 "xfail-fast" in s or
                 "xfail-win32" in s):
-            if not "pub fn main" in s and "fn main" in s:
-                print("Warning: no public entry point in " + t)
             stage2_tests.append(t)
         f.close()
 

branches/snap-stage3/src/libextra/arc.rs

@@ -162,7 +162,7 @@ struct MutexArcInner<T> { priv lock: Mutex, priv failed: bool, priv data: T }
 
 /// An Arc with mutable data protected by a blocking mutex.
 #[no_freeze]
-pub struct MutexArc<T> { priv x: UnsafeArc<MutexArcInner<T>> }
+struct MutexArc<T> { priv x: UnsafeArc<MutexArcInner<T>> }
 
 
 impl<T:Send> Clone for MutexArc<T> {
@@ -343,7 +343,7 @@ struct RWArcInner<T> { priv lock: RWLock, priv failed: bool, priv data: T }
  * Unlike mutex_arcs, rw_arcs are safe, because they cannot be nested.
  */
 #[no_freeze]
-pub struct RWArc<T> {
+struct RWArc<T> {
     priv x: UnsafeArc<RWArcInner<T>>,
 }
 

branches/snap-stage3/src/libextra/test.rs

@@ -30,6 +30,7 @@ use treemap::TreeMap;
 
 use std::clone::Clone;
 use std::comm::{stream, SharedChan, GenericPort, GenericChan};
+use std::libc;
 use std::io;
 use std::result;
 use std::task;
@@ -124,9 +125,8 @@ pub type MetricDiff = TreeMap<~str,MetricChange>;
 pub fn test_main(args: &[~str], tests: ~[TestDescAndFn]) {
     let opts =
         match parse_opts(args) {
-            Some(Ok(o)) => o,
-            Some(Err(msg)) => fail!(msg),
-            None => return
+            Ok(o) => o,
+            Err(msg) => fail!(msg)
         };
     if !run_tests_console(&opts, tests) { fail!("Some tests failed"); }
 }
@@ -189,7 +189,7 @@ fn optgroups() -> ~[getopts::groups::OptGroup] {
                      "A.B")]
 }
 
-fn usage(binary: &str, helpstr: &str) {
+fn usage(binary: &str, helpstr: &str) -> ! {
     #[fixed_stack_segment]; #[inline(never)];
 
     let message = fmt!("Usage: %s [OPTIONS] [FILTER]", binary);
@@ -217,19 +217,20 @@ Test Attributes:
                      tests. This may also be written as #[ignore(cfg(...))] to
                      ignore the test on certain configurations.");
     }
+    unsafe { libc::exit(0) }
 }
 
 // Parses command line arguments into test options
-pub fn parse_opts(args: &[~str]) -> Option<OptRes> {
+pub fn parse_opts(args: &[~str]) -> OptRes {
     let args_ = args.tail();
     let matches =
         match groups::getopts(args_, optgroups()) {
           Ok(m) => m,
-          Err(f) => return Some(Err(f.to_err_msg()))
+          Err(f) => return Err(f.to_err_msg())
         };
 
-    if matches.opt_present("h") { usage(args[0], "h"); return None; }
-    if matches.opt_present("help") { usage(args[0], "help"); return None; }
+    if matches.opt_present("h") { usage(args[0], "h"); }
+    if matches.opt_present("help") { usage(args[0], "help"); }
 
     let filter =
         if matches.free.len() > 0 {
@@ -271,7 +272,7 @@ pub fn parse_opts(args: &[~str]) -> Option<OptRes> {
         logfile: logfile
     };
 
-    Some(Ok(test_opts))
+    Ok(test_opts)
 }
 
 pub fn opt_shard(maybestr: Option<~str>) -> Option<(uint,uint)> {
@@ -1227,7 +1228,7 @@ mod tests {
     fn first_free_arg_should_be_a_filter() {
         let args = ~[~"progname", ~"filter"];
         let opts = match parse_opts(args) {
-            Some(Ok(o)) => o,
+            Ok(o) => o,
             _ => fail!("Malformed arg in first_free_arg_should_be_a_filter")
         };
         assert!("filter" == opts.filter.clone().unwrap());
@@ -1237,7 +1238,7 @@ mod tests {
     fn parse_ignored_flag() {
         let args = ~[~"progname", ~"filter", ~"--ignored"];
         let opts = match parse_opts(args) {
-            Some(Ok(o)) => o,
+            Ok(o) => o,
             _ => fail!("Malformed arg in parse_ignored_flag")
         };
         assert!((opts.run_ignored));