---

yaml
---
r: 41301
b: refs/heads/snap-stage3
c: 5e77d55
h: refs/heads/master
i:
  41299: 9a906e2
v: v3

Author: catamorphism

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 09bb07bed9166105ea961a42b5fff7739ae0d2e9
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: e0728d41f2fe9c87e086dc5bcc0260dcffcb7517
+refs/heads/snap-stage3: 5e77d5532681f74e57fda63900fe2792ec77457b
 refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/CONTRIBUTING.md

@@ -9,4 +9,10 @@ Pull requests will be treated as "review requests", and we will give feedback we
 
 Normally, all pull requests must include regression tests (see [Note-testsuite](https://github.com/mozilla/rust/wiki/Note-testsuite)) that test your change. Occasionally, a change will be very difficult to test for. In those cases, please include a note in your commit message explaining why.
 
+In the licensing header at the beginning of any files you change, please make sure the listed date range includes the current year. For example, if it's 2013, and you change a Rust file that was created in 2010, it should begin:
+
+```
+// Copyright 2010-2013 The Rust Project Developers.
+```
+
 For more details, please refer to [Note-development-policy](https://github.com/mozilla/rust/wiki/Note-development-policy).

branches/snap-stage3/configure

@@ -516,7 +516,7 @@ then
                       | cut -d ' ' -f 2)
 
     case $CFG_CLANG_VERSION in
-        (3.0svn | 3.0 | 3.1 | 3.2 | 4.0 | 4.1)
+        (3.0svn | 3.0 | 3.1* | 3.2* | 4.0* | 4.1*)
         step_msg "found ok version of CLANG: $CFG_CLANG_VERSION"
         CFG_C_COMPILER="clang"
         ;;

branches/snap-stage3/src/compiletest/compiletest.rc

@@ -12,6 +12,7 @@
 
 #[no_core];
 #[legacy_exports];
+#[legacy_records];
 
 #[allow(vecs_implicitly_copyable)];
 #[allow(non_camel_case_types)];

branches/snap-stage3/src/compiletest/errors.rs

@@ -16,12 +16,12 @@ use io::ReaderUtil;
 use str;
 
 export load_errors;
-export expected_error;
+export ExpectedError;
 
-type expected_error = { line: uint, kind: ~str, msg: ~str };
+struct ExpectedError { line: uint, kind: ~str, msg: ~str }
 
 // Load any test directives embedded in the file
-fn load_errors(testfile: &Path) -> ~[expected_error] {
+fn load_errors(testfile: &Path) -> ~[ExpectedError] {
     let mut error_patterns = ~[];
     let rdr = io::file_reader(testfile).get();
     let mut line_num = 1u;
@@ -33,7 +33,7 @@ fn load_errors(testfile: &Path) -> ~[expected_error] {
     return error_patterns;
 }
 
-fn parse_expected(line_num: uint, line: ~str) -> ~[expected_error] {
+fn parse_expected(line_num: uint, line: ~str) -> ~[ExpectedError] {
     unsafe {
         let error_tag = ~"//~";
         let mut idx;
@@ -63,6 +63,7 @@ fn parse_expected(line_num: uint, line: ~str) -> ~[expected_error] {
 
         debug!("line=%u kind=%s msg=%s", line_num - adjust_line, kind, msg);
 
-        return ~[{line: line_num - adjust_line, kind: kind, msg: msg}];
+        return ~[ExpectedError{line: line_num - adjust_line, kind: kind,
+                               msg: msg}];
     }
 }

branches/snap-stage3/src/compiletest/header.rs

@@ -17,11 +17,11 @@ use io::ReaderUtil;
 use os;
 use str;
 
-export test_props;
+export TestProps;
 export load_props;
 export is_test_ignored;
 
-type test_props = {
+struct TestProps {
     // Lines that should be expected, in order, on standard out
     error_patterns: ~[~str],
     // Extra flags to pass to the compiler
@@ -33,10 +33,10 @@ type test_props = {
     aux_builds: ~[~str],
     // Environment settings to use during execution
     exec_env: ~[(~str,~str)]
-};
+}
 
 // Load any test directives embedded in the file
-fn load_props(testfile: &Path) -> test_props {
+fn load_props(testfile: &Path) -> TestProps {
     let mut error_patterns = ~[];
     let mut aux_builds = ~[];
     let mut exec_env = ~[];
@@ -64,7 +64,7 @@ fn load_props(testfile: &Path) -> test_props {
             exec_env.push(*ee);
         }
     };
-    return {
+    return TestProps {
         error_patterns: error_patterns,
         compile_flags: compile_flags,
         pp_exact: pp_exact,

branches/snap-stage3/src/compiletest/procsrv.rs

@@ -51,13 +51,14 @@ fn target_env(_lib_path: ~str, _prog: ~str) -> ~[(~str,~str)] {
     ~[]
 }
 
+struct Result {status: int, out: ~str, err: ~str}
 
 // FIXME (#2659): This code is duplicated in core::run::program_output
 fn run(lib_path: ~str,
        prog: ~str,
        args: ~[~str],
        env: ~[(~str, ~str)],
-       input: Option<~str>) -> {status: int, out: ~str, err: ~str} {
+       input: Option<~str>) -> Result {
 
     let pipe_in = os::pipe();
     let pipe_out = os::pipe();
@@ -105,7 +106,7 @@ fn run(lib_path: ~str,
         };
         count -= 1;
     };
-    return {status: status, out: outs, err: errs};
+    return Result {status: status, out: outs, err: errs};
 }
 
 fn writeclose(fd: c_int, s: Option<~str>) {