---

yaml
---
r: 44439
b: refs/heads/master
c: 6efa354
h: refs/heads/master
i:
  44437: 250a9f3
  44435: 1d9497e
  44431: 3c7bb3e
v: v3

Author: bors

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 5336bf6addc7091ed303a06246b43b99dc0c5cd1
+refs/heads/master: 6efa3543a8b38f0dcbe89e7bf6d14f571bad46ac
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d9689399d091c3265f00434a69c551a61c28dc
 refs/heads/try: ef355f6332f83371e4acf04fc4eb940ab41d78d3

trunk/AUTHORS.txt

@@ -29,6 +29,7 @@ Benjamin Peterson <[email protected]>
 Bilal Husain <[email protected]>
 Bill Fallon <[email protected]>
 Brendan Eich <[email protected]>
+Brendan Zabarauskas <[email protected]>
 Brian Anderson <[email protected]>
 Brian J. Burg <[email protected]>
 Brian Leibig <[email protected]>
@@ -80,6 +81,7 @@ Jeff Muizelaar <[email protected]>
 Jeff Olson <[email protected]>
 Jeffrey Yasskin <[email protected]>
 Jens Nockert <[email protected]>
+Jesse Jones <[email protected]>
 Jesse Ruderman <[email protected]>
 Jim Blandy <[email protected]>
 Jimmy Lu <[email protected]>
@@ -105,6 +107,7 @@ Mahmut Bulut <[email protected]>
 Margaret Meyerhofer <[email protected]>
 Marijn Haverbeke <[email protected]>
 Mark Lacey <[email protected]>
+Mark Vian <[email protected]>
 Martin DeMello <[email protected]>
 Marvin Löbel <[email protected]>
 Matt Brubeck <[email protected]>
@@ -149,6 +152,7 @@ Tim Taubert <[email protected]>
 Tom Lee <[email protected]>
 Tomoki Aonuma <[email protected]>
 Tony Young <[email protected]>
+Trinick <[email protected]>
 Tycho Sci <[email protected]>
 Tyler Bindon <[email protected]>
 Viktor Dahl <[email protected]>

trunk/doc/rust.md

@@ -202,13 +202,7 @@ grammar as double-quoted strings. Other tokens have exact rules given.
 
 ### Keywords
 
-The keywords in [crate files](#crate-files) are the following strings:
-
-~~~~~~~~ {.keyword}
-mod priv pub use
-~~~~~~~~
-
-The keywords in [source files](#source-files) are the following strings:
+The keywords are the following strings:
 
 ~~~~~~~~ {.keyword}
 as assert

trunk/src/compiletest/compiletest.rc

@@ -33,7 +33,7 @@ mod errors;
 use std::getopts;
 use std::test;
 
-use core::result;
+use core::{result, either};
 use result::{Ok, Err};
 
 use common::config;
@@ -70,7 +70,7 @@ pub fn parse_config(args: ~[~str]) -> config {
     let matches =
         &match getopts::getopts(args_, opts) {
           Ok(m) => m,
-          Err(f) => die!(getopts::fail_str(f))
+          Err(f) => fail!(getopts::fail_str(f))
         };
 
     fn opt_path(m: &getopts::Matches, nm: ~str) -> Path {
@@ -133,7 +133,7 @@ pub fn str_mode(s: ~str) -> mode {
       ~"run-pass" => mode_run_pass,
       ~"pretty" => mode_pretty,
       ~"debug-info" => mode_debug_info,
-      _ => die!(~"invalid mode")
+      _ => fail!(~"invalid mode")
     }
 }
 
@@ -151,14 +151,18 @@ pub fn run_tests(config: config) {
     let opts = test_opts(config);
     let tests = make_tests(config);
     let res = test::run_tests_console(&opts, tests);
-    if !res { die!(~"Some tests failed"); }
+    if !res { fail!(~"Some tests failed"); }
 }
 
 pub fn test_opts(config: config) -> test::TestOpts {
     test::TestOpts {
         filter: config.filter,
         run_ignored: config.run_ignored,
-        logfile: config.logfile.map(|s| s.to_str()),
+        logfile: copy config.logfile,
+        run_tests: true,
+        run_benchmarks: false,
+        save_results: option::None,
+        compare_results: option::None
     }
 }
 
@@ -210,13 +214,15 @@ pub fn make_test(config: config, testfile: &Path) -> test::TestDescAndFn {
     }
 }
 
-pub fn make_test_name(config: config, testfile: &Path) -> ~str {
-    fmt!("[%s] %s", mode_str(config.mode), testfile.to_str())
+pub fn make_test_name(config: config, testfile: &Path) -> test::TestName {
+    test::DynTestName(fmt!("[%s] %s",
+                           mode_str(config.mode),
+                           testfile.to_str()))
 }
 
 pub fn make_test_closure(config: config, testfile: &Path) -> test::TestFn {
     let testfile = testfile.to_str();
-    fn~() { runtest::run(config, testfile) }
+    test::DynTestFn(fn~() { runtest::run(config, testfile) })
 }
 
 // Local Variables:

trunk/src/compiletest/header.rs

@@ -145,7 +145,7 @@ fn parse_exec_env(line: ~str) -> Option<(~str, ~str)> {
         match strs.len() {
           1u => (strs[0], ~""),
           2u => (strs[0], strs[1]),
-          n => die!(fmt!("Expected 1 or 2 strings, not %u", n))
+          n => fail!(fmt!("Expected 1 or 2 strings, not %u", n))
         }
     }
 }

trunk/src/compiletest/procsrv.rs

@@ -71,7 +71,7 @@ pub fn run(lib_path: ~str,
         os::close(pipe_in.out);
         os::close(pipe_out.in);
         os::close(pipe_err.in);
-        die!();
+        fail!();
     }
 
 
@@ -99,7 +99,7 @@ pub fn run(lib_path: ~str,
           (2, s) => {
             errs = s;
           }
-          _ => { die!() }
+          _ => { fail!() }
         };
         count -= 1;
     };

trunk/src/compiletest/runtest.rs

@@ -202,7 +202,7 @@ actual:\n\
 \n",
                      expected, actual);
             io::stdout().write_str(msg);
-            die!();
+            fail!();
         }
     }
 
@@ -322,8 +322,8 @@ fn check_expected_errors(expected_errors: ~[errors::ExpectedError],
                          ProcRes: ProcRes) {
 
     // true if we found the error in question
-    let found_flags = vec::cast_to_mut(vec::from_elem(
-        vec::len(expected_errors), false));
+    let mut found_flags = vec::from_elem(
+        vec::len(expected_errors), false);
 
     if ProcRes.status == 0 {
         fatal(~"process did not return an error status");
@@ -518,7 +518,7 @@ fn compose_and_run_compiler(
 fn ensure_dir(path: &Path) {
     if os::path_is_dir(path) { return; }
     if !os::make_dir(path, 0x1c0i32) {
-        die!(fmt!("can't make dir %s", path.to_str()));
+        fail!(fmt!("can't make dir %s", path.to_str()));
     }
 }
 
@@ -668,7 +668,7 @@ fn maybe_dump_to_stdout(config: config, out: ~str, err: ~str) {
 
 fn error(err: ~str) { io::stdout().write_line(fmt!("\nerror: %s", err)); }
 
-fn fatal(err: ~str) -> ! { error(err); die!(); }
+fn fatal(err: ~str) -> ! { error(err); fail!(); }
 
 fn fatal_ProcRes(err: ~str, ProcRes: ProcRes) -> ! {
     let msg =
@@ -686,5 +686,5 @@ stderr:\n\
 \n",
              err, ProcRes.cmdline, ProcRes.stdout, ProcRes.stderr);
     io::stdout().write_str(msg);
-    die!();
+    fail!();
 }

trunk/src/etc/licenseck.py

@@ -8,8 +8,7 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
-license0 = """\
-// Copyright 2012-2013 The Rust Project Developers. See the
+license0 = """// Copyright 2012-2013 The Rust Project Developers. See the
 // COPYRIGHT file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -20,8 +19,7 @@
 // except according to those terms.
 """
 
-license1 = """\
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+license1 = """// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -32,8 +30,7 @@
 // except according to those terms.
 """
 
-license2 = """\
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+license2 = """// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -44,8 +41,7 @@
 // except according to those terms.
 """
 
-license3 = """\
-# Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+license3 = """# Copyright 2013 The Rust Project Developers. See the COPYRIGHT
 # file at the top-level directory of this distribution and at
 # http://rust-lang.org/COPYRIGHT.
 #
@@ -56,19 +52,7 @@
 # except according to those terms.
 """
 
-license4 = """\
-// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-"""
-
-licenses = [license0, license1, license2, license3, license4]
+licenses = [license0, license1, license2, license3]
 
 exceptions = [
     "rt/rust_android_dummy.cpp", # BSD, chromium

trunk/src/libcargo/cargo.rc

@@ -295,7 +295,7 @@ pub fn load_link(mis: ~[@ast::meta_item]) -> (Option<~str>,
                     _ => { }
                 }
             }
-            _ => die!(~"load_link: meta items must be name-values")
+            _ => fail!(~"load_link: meta items must be name-values")
         }
     }
     (name, vers, uuid)
@@ -332,7 +332,7 @@ pub fn load_crate(filename: &Path) -> Option<Crate> {
                 }
             }
             _ => {
-                die!(~"crate attributes may not contain " +
+                fail!(~"crate attributes may not contain " +
                      ~"meta_words");
             }
         }
@@ -435,7 +435,7 @@ pub fn rest(s: ~str, start: uint) -> ~str {
 pub fn need_dir(s: &Path) {
     if os::path_is_dir(s) { return; }
     if !os::make_dir(s, 493_i32 /* oct: 755 */) {
-        die!(fmt!("can't make_dir %s", s.to_str()));
+        fail!(fmt!("can't make_dir %s", s.to_str()));
     }
 }
 
@@ -453,14 +453,14 @@ pub fn valid_pkg_name(s: &str) -> bool {
 
 pub fn parse_source(name: ~str, j: &json::Json) -> @Source {
     if !valid_pkg_name(name) {
-        die!(fmt!("'%s' is an invalid source name", name));
+        fail!(fmt!("'%s' is an invalid source name", name));
     }
 
     match *j {
         json::Object(ref j) => {
             let mut url = match j.find(&~"url") {
                 Some(&json::String(u)) => copy u,
-                _ => die!(~"needed 'url' field in source")
+                _ => fail!(~"needed 'url' field in source")
             };
             let method = match j.find(&~"method") {
                 Some(&json::String(u)) => copy u,
@@ -485,7 +485,7 @@ pub fn parse_source(name: ~str, j: &json::Json) -> @Source {
                 mut keyfp: keyfp,
                 packages: DVec() };
         }
-        _ => die!(~"needed dict value in source")
+        _ => fail!(~"needed dict value in source")
     };
 }
 
@@ -500,8 +500,8 @@ pub fn try_parse_sources(filename: &Path,
                 debug!("source: %s", *k);
             }
         }
-        Ok(_) => die!(~"malformed sources.json"),
-        Err(e) => die!(fmt!("%s:%s", filename.to_str(), e.to_str()))
+        Ok(_) => fail!(~"malformed sources.json"),
+        Err(e) => fail!(fmt!("%s:%s", filename.to_str(), e.to_str()))
     }
 }
 
@@ -662,7 +662,7 @@ pub fn build_cargo_options(argv: ~[~str]) -> Options {
     let matches = &match getopts::getopts(argv, opts()) {
         result::Ok(m) => m,
         result::Err(f) => {
-            die!(fmt!("%s", getopts::fail_str(f)));
+            fail!(fmt!("%s", getopts::fail_str(f)));
         }
     };
 
@@ -675,10 +675,10 @@ pub fn build_cargo_options(argv: ~[~str]) -> Options {
     let is_install = len > 1u && matches.free[1] == ~"install";
     let is_uninstall = len > 1u && matches.free[1] == ~"uninstall";
 
-    if G && g { die!(~"-G and -g both provided"); }
+    if G && g { fail!(~"-G and -g both provided"); }
 
     if !is_install && !is_uninstall && (g || G) {
-        die!(~"-g and -G are only valid for `install` and `uninstall|rm`");
+        fail!(~"-g and -G are only valid for `install` and `uninstall|rm`");
     }
 
     let mode =
@@ -845,7 +845,7 @@ pub fn install_source(c: &mut Cargo, path: &Path) {
     }
 
     if vec::is_empty(cratefiles) {
-        die!(~"this doesn't look like a rust package (no .rc files)");
+        fail!(~"this doesn't look like a rust package (no .rc files)");
     }
 
     for cratefiles.each |cf| {
@@ -889,7 +889,7 @@ pub fn install_curl(c: &mut Cargo, wd: &Path, url: ~str) {
     let p = run::program_output(~"curl", ~[~"-f", ~"-s", ~"-o",
                                          tarpath.to_str(), url]);
     if p.status != 0 {
-        die!(fmt!("fetch of %s failed: %s", url, p.err));
+        fail!(fmt!("fetch of %s failed: %s", url, p.err));
     }
     run::run_program(~"tar", ~[~"-x", ~"--strip-components=1",
                                ~"-C", wd.to_str(),
@@ -1123,7 +1123,7 @@ pub fn install_query(c: &mut Cargo, wd: &Path, target: ~str) {
 pub fn get_temp_workdir(c: &Cargo) -> Path {
     match tempfile::mkdtemp(&c.workdir, "cargo") {
       Some(wd) => wd,
-      None => die!(fmt!("needed temp dir: %s",
+      None => fail!(fmt!("needed temp dir: %s",
                         c.workdir.to_str()))
     }
 }
@@ -1138,7 +1138,7 @@ pub fn cmd_install(c: &mut Cargo) {
                                                    wd.to_str()]);
 
             if status != 0 {
-                die!(fmt!("could not copy directory: %s", cwd.to_str()));
+                fail!(fmt!("could not copy directory: %s", cwd.to_str()));
             }
 
             install_source(c, &wd);

trunk/src/libcargo/pgp.rs

@@ -87,7 +87,7 @@ pub fn init(root: &Path) {
         p.input().write_str(signing_key());
         let s = p.finish();
         if s != 0 {
-            die!(~"pgp init failed");
+            fail!(~"pgp init failed");
         }
     }
 }
@@ -98,7 +98,7 @@ pub fn add(root: &Path, key: &Path) {
         run::program_output(~"gpg", ~[~"--homedir", path.to_str(),
                                       ~"--import", key.to_str()]);
     if p.status != 0 {
-        die!(~"pgp add failed: " + p.out);
+        fail!(~"pgp add failed: " + p.out);
     }
 }