---

yaml
---
r: 15755
b: refs/heads/try
c: d709ed2
h: refs/heads/master
i:
  15753: ef951b2
  15751: 651cf2b
v: v3

Author: pcwalton

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 16848becaa8a1f812ba5e131cd6d4d4601f63979
+refs/heads/try: d709ed2542d25a9dfcda40492412bb99155c8dea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/LICENSE.txt

@@ -186,6 +186,7 @@ included:
     USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
     OF SUCH DAMAGE.
 
+
 * The auxiliary file src/etc/pkg/modpath.iss contains a
   library routine compiled, by Inno Setup, into the Windows
   installer binary. This file is licensed under the LGPL,
@@ -198,8 +199,9 @@ included:
   of any of the files installed by such an installer (such
   as the Rust compiler or runtime libraries themselves).
 
+
 * The libuv asynchronous I/O library. Code for this package
-  is found in the src/rt/libuv directory, within this
+  is found in the src/libuv directory, within this
   distribution. This package is redistributed under the
   following terms, as noted in its source:
 
@@ -230,10 +232,102 @@ included:
 
 
 * Additional libraries included in libuv carry separate
-  BSD-compatible licenses. See src/rt/libuv/LICENSE for
+  BSD-compatible licenses. See src/libuv/LICENSE for
   details.
 
 
+* LLVM and Clang. Code for this package is found in
+  src/llvm.
+
+    Copyright (c) 2003-2012 University of Illinois at
+    Urbana-Champaign.  All rights reserved.
+
+    Developed by:
+
+        LLVM Team
+
+        University of Illinois at Urbana-Champaign
+
+        http://llvm.org
+
+    Permission is hereby granted, free of charge, to any
+    person obtaining a copy of this software and associated
+    documentation files (the "Software"), to deal with the
+    Software without restriction, including without
+    limitation the rights to use, copy, modify, merge,
+    publish, distribute, sublicense, and/or sell copies of
+    the Software, and to permit persons to whom the Software
+    is furnished to do so, subject to the following
+    conditions:
+
+        * Redistributions of source code must retain the
+          above copyright notice, this list of conditions
+          and the following disclaimers.
+
+        * Redistributions in binary form must reproduce the
+          above copyright notice, this list of conditions
+          and the following disclaimers in the documentation
+          and/or other materials provided with the
+          distribution.
+
+        * Neither the names of the LLVM Team, University of
+          Illinois at Urbana-Champaign, nor the names of its
+          contributors may be used to endorse or promote
+          products derived from this Software without
+          specific prior written permission.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+    ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+    TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+    PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT
+    SHALL THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE
+    FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+    ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
+    OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+    OTHER DEALINGS WITH THE SOFTWARE.
+
+
+* Additional libraries included in LLVM carry separate
+  BSD-compatible licenses. See src/llvm/LICENSE.txt for
+  details.
+
+
+* Portions of the FFI code for interacting with the native ABI
+  is derived from the Clay programming language, which carries
+  the following license.
+
+    Copyright (C) 2008-2010 Tachyon Technologies.
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with
+    or without modification, are permitted provided that the
+    following conditions are met:
+
+    1. Redistributions of source code must retain the above
+       copyright notice, this list of conditions and the
+       following disclaimer.
+
+    2. Redistributions in binary form must reproduce the
+       above copyright notice, this list of conditions and
+       the following disclaimer in the documentation and/or
+       other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR
+    IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+    PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    DEVELOPERS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+    INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+    USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+    CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+    USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+    OF SUCH DAMAGE.
+
+
 * Additional copyright may be retained by contributors other
   than Mozilla or the parties enumerated in this file. Such
   copyright can be determined on a case-by-case basis by
@@ -242,19 +336,19 @@ included:
   consulting representative comments claiming copyright
   ownership for a file.
 
-   For example, the text:
+  For example, the text:
 
       "Copyright (c) 2011 Google Inc."
 
-   appears in some files, and these files thereby denote
-   that their author and copyright-holder is Google Inc.
+  appears in some files, and these files thereby denote
+  that their author and copyright-holder is Google Inc.
 
-   In all such cases, the absence of explicit licensing text
-   indicates that the contributor chose to license their
-   work for distribution under identical terms to those
-   Mozilla has chosen for the collective work, enumerated
-   below.  The only difference is the retention of copyright
-   itself, held by the contributor.
+  In all such cases, the absence of explicit licensing text
+  indicates that the contributor chose to license their
+  work for distribution under identical terms to those
+  Mozilla has chosen for the collective work, enumerated
+  below.  The only difference is the retention of copyright
+  itself, held by the contributor.
 
 
 The remaining code and documentation in the collective work

branches/try/src/compiletest/header.rs

@@ -29,7 +29,7 @@ fn load_props(testfile: str) -> test_props {
     let mut exec_env = [];
     let mut compile_flags = option::none;
     let mut pp_exact = option::none;
-    iter_header(testfile) {|ln|
+    for iter_header(testfile) {|ln|
         alt parse_error_pattern(ln) {
           option::some(ep) { error_patterns += [ep]; }
           option::none { }
@@ -62,14 +62,11 @@ fn load_props(testfile: str) -> test_props {
 
 fn is_test_ignored(config: config, testfile: str) -> bool {
     let mut found = false;
-    iter_header(testfile) {|ln|
-        // FIXME: Can't return or break from iterator
-        // (Fix when Issue #1619 is resolved)
-        found = found || parse_name_directive(ln, "xfail-test");
-        found = found || parse_name_directive(ln, xfail_target());
-        if (config.mode == common::mode_pretty) {
-            found = found || parse_name_directive(ln, "xfail-pretty");
-        }
+    for iter_header(testfile) {|ln|
+        if parse_name_directive(ln, "xfail-test") { ret true; }
+        if parse_name_directive(ln, xfail_target()) { ret true; }
+        if config.mode == common::mode_pretty &&
+           parse_name_directive(ln, "xfail-pretty") { ret true; }
     };
     ret found;
 
@@ -78,7 +75,7 @@ fn is_test_ignored(config: config, testfile: str) -> bool {
     }
 }
 
-fn iter_header(testfile: str, it: fn(str)) {
+fn iter_header(testfile: str, it: fn(str) -> bool) -> bool {
     let rdr = result::get(io::file_reader(testfile));
     while !rdr.eof() {
         let ln = rdr.read_line();
@@ -88,9 +85,10 @@ fn iter_header(testfile: str, it: fn(str)) {
         // with a warm page cache. Maybe with a cold one.
         if str::starts_with(ln, "fn")
             || str::starts_with(ln, "mod") {
-            break;
-        } else { it(ln); }
+            ret false;
+        } else { if !(it(ln)) { ret false; } }
     }
+    ret true;
 }
 
 fn parse_error_pattern(line: str) -> option<str> {

branches/try/src/fuzzer/fuzzer.rs

@@ -154,11 +154,11 @@ fn steal(crate: ast::crate, tm: test_mode) -> stolen_stuff {
 fn safe_to_replace_expr(e: ast::expr_, _tm: test_mode) -> bool {
     alt e {
       // https://github.com/mozilla/rust/issues/652
-      ast::expr_if(_, _, _) { false }
+      ast::expr_if(*) { false }
       ast::expr_block(_) { false }
 
       // expr_call is also missing a constraint
-      ast::expr_fn_block(_, _) { false }
+      ast::expr_fn_block(*) { false }
 
       _ { true }
     }