---

yaml
---
r: 42095
b: refs/heads/master
c: e0728d4
h: refs/heads/master
i:
  42093: 2673086
  42091: b2ce5b8
  42087: 60c922d
  42079: df6601b
v: v3

Author: thestinger

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: f1ddb2a32c2de840211607c9b9e32a2aed4fa7e8
+refs/heads/master: e0728d41f2fe9c87e086dc5bcc0260dcffcb7517
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
 refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650

trunk/CONTRIBUTING.md

@@ -9,10 +9,4 @@ 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).

trunk/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"
         ;;

trunk/src/compiletest/compiletest.rc

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

trunk/src/compiletest/errors.rs

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

trunk/src/compiletest/header.rs

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

trunk/src/compiletest/procsrv.rs

@@ -51,14 +51,13 @@ 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>) -> Result {
+       input: Option<~str>) -> {status: int, out: ~str, err: ~str} {
 
     let pipe_in = os::pipe();
     let pipe_out = os::pipe();
@@ -106,7 +105,7 @@ fn run(lib_path: ~str,
         };
         count -= 1;
     };
-    return Result {status: status, out: outs, err: errs};
+    return {status: status, out: outs, err: errs};
 }
 
 fn writeclose(fd: c_int, s: Option<~str>) {