---

yaml
---
r: 12747
b: refs/heads/master
c: bbf73bd
h: refs/heads/master
i:
  12745: 7e8ae55
  12743: ef2fab9
v: v3

Author: tychosci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 95a2b5d42f1acb96b035f21f192b0fab6cb2af6a
+refs/heads/master: bbf73bdfc682dd778cd0827540026477dd073c3f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/LICENSE.txt

@@ -186,7 +186,6 @@ 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,
@@ -199,9 +198,8 @@ 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/libuv directory, within this
+  is found in the src/rt/libuv directory, within this
   distribution. This package is redistributed under the
   following terms, as noted in its source:
 
@@ -232,102 +230,10 @@ included:
 
 
 * Additional libraries included in libuv carry separate
-  BSD-compatible licenses. See src/libuv/LICENSE for
+  BSD-compatible licenses. See src/rt/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
@@ -336,19 +242,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

trunk/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;
-    for iter_header(testfile) {|ln|
+    iter_header(testfile) {|ln|
         alt parse_error_pattern(ln) {
           option::some(ep) { error_patterns += [ep]; }
           option::none { }
@@ -62,11 +62,14 @@ fn load_props(testfile: str) -> test_props {
 
 fn is_test_ignored(config: config, testfile: str) -> bool {
     let mut found = false;
-    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; }
+    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");
+        }
     };
     ret found;
 
@@ -75,7 +78,7 @@ fn is_test_ignored(config: config, testfile: str) -> bool {
     }
 }
 
-fn iter_header(testfile: str, it: fn(str) -> bool) -> bool {
+fn iter_header(testfile: str, it: fn(str)) {
     let rdr = result::get(io::file_reader(testfile));
     while !rdr.eof() {
         let ln = rdr.read_line();
@@ -85,10 +88,9 @@ fn iter_header(testfile: str, it: fn(str) -> bool) -> bool {
         // with a warm page cache. Maybe with a cold one.
         if str::starts_with(ln, "fn")
             || str::starts_with(ln, "mod") {
-            ret false;
-        } else { if !(it(ln)) { ret false; } }
+            break;
+        } else { it(ln); }
     }
-    ret true;
 }
 
 fn parse_error_pattern(line: str) -> option<str> {

trunk/src/etc/vim/syntax/rust.vim

@@ -15,11 +15,17 @@ if !exists("main_syntax")
 endif
 
 syn keyword   rustKeyword     alt as assert be bind break
-syn keyword   rustKeyword     check claim cont const copy do else enum export fail
-syn keyword   rustKeyword     fn for if iface impl import in inline lambda let log
+syn keyword   rustKeyword     check claim cont const copy do else export fail
+syn keyword   rustKeyword     for if impl import in inline lambda let log
 syn keyword   rustKeyword     loop mod mut mutable native note of prove pure
-syn keyword   rustKeyword     resource ret self syntax to type unchecked
+syn keyword   rustKeyword     ret self syntax to unchecked
 syn keyword   rustKeyword     unsafe use while with
+" FIXME: Scoped impl's name is also fallen in this category
+syn keyword   rustKeyword     mod iface resource class enum type nextgroup=rustIdentifier skipwhite
+syn keyword   rustKeyword     fn nextgroup=rustFuncName skipwhite
+
+syn match     rustIdentifier  "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained
+syn match     rustFuncName    "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained
 
 " Reserved words
 syn keyword   rustKeyword     m32 m64 m128 f80 f16 f128 class trait
@@ -33,35 +39,49 @@ syn match     rustItemPath    "\(\w\|::\)\+"
 
 syn region	  rustString      start=+L\="+ skip=+\\\\\|\\"+ end=+"+
 
-"integer number, or floating point number without a dot and with "f".
-syn case ignore
-syn match	  rustNumber		display contained "\d\+\(u\=l\{0,2}\|ll\=u\)\>"
-"hex number
-syn match	  rustNumber		display contained "0x\x\+\(u\=l\{0,2}\|ll\=u\)\>"
-syn match	rustFloat		display contained "\d\+f"
-"floating point number, with dot, optional exponent
-syn match	rustFloat		display contained "\d\+\.\d*\(e[-+]\=\d\+\)\=[fl]\="
-"floating point number, starting with a dot, optional exponent
-syn match	rustFloat		display contained "\.\d\+\(e[-+]\=\d\+\)\=[fl]\=\>"
-"floating point number, without dot, with exponent
-syn match	rustFloat		display contained "\d\+e[-+]\=\d\+[fl]\=\>"
-
-syn case match
+" Number/Float literals
+syn match     rustNumber      display "\<\d\>"
+syn match     rustNumber      display "\<[1-9]\d\+\>"
+syn match     rustNumber      display "\<\d\+\(u\|u8\|u16\|u32\|u64\)\>"
+syn match     rustNumber      display "\<\d\+\(i8\|i16\|i32\|i64\)\>"
+
+syn match     rustHexNumber   display "\<0[xX]\x\+\>"
+syn match     rustHexNumber   display "\<0[xX]\x\+_\(u\|u8\|u16\|u32\|u64\)\>"
+syn match     rustHexNumber   display "\<0[xX]\x\+_\(i8\|i16\|i32\|i64\)\>"
+syn match     rustOctNumber   display "\<0\o\+\>"
+syn match     rustOctNumber   display "\<0\o\+_\(u\|u8\|u16\|u32\|u64\)\>"
+syn match     rustOctNumber   display "\<0\o\+_\(i8\|i16\|i32\|i64\)\>"
+syn match     rustBinNumber   display "\<0[bB][01]\+\>"
+syn match     rustBinNumber   display "\<0[bB][01]\+_\(u\|u8\|u16\|u32\|u64\)\>"
+syn match     rustBinNumber   display "\<0[bB][01]\+_\(i8\|i16\|i32\|i64\)\>"
+
+syn match     rustFloat       display "\.\d\+\%([eE][+-]\=\d\+\)\=\>"
+syn match     rustFloat       display "\<\d\+[eE][+-]\=\d\+\>"
+syn match     rustFloat       display "\<\d\+\.\d*\%([eE][+-]\=\d\+\)\="
 
 syn match   rustCharacter   "'\([^'\\]\|\\\(['nrt\\\"]\|x\x\{2}\|u\x\{4}\|U\x\{8}\)\)'"
 
-syn region    rustComment     start="/\*" end="\*/" contains=rustComment
-syn region    rustComment     start="//" skip="\\$" end="$" keepend
+syn region    rustComment     start="/\*" end="\*/" contains=rustComment,rustTodo
+syn region    rustComment     start="//" skip="\\$" end="$" contains=rustTodo keepend
+
+syn keyword   rustTodo        TODO FIXME XXX NB
+
+hi def link rustHexNumber     rustNumber
+hi def link rustOctNumber     rustNumber
+hi def link rustBinNumber     rustNumber
 
 hi def link rustString        String
 hi def link rustCharacter     Character
 hi def link rustNumber        Number
 hi def link rustBoolean       Boolean
 hi def link rustFloat         Float
 hi def link rustKeyword       Keyword
+hi def link rustIdentifier    Identifier
+hi def link rustFuncName      Function
 hi def link rustComment       Comment
 hi def link rustMacro         Macro
 hi def link rustType          Type
+hi def link rustTodo          Todo
 
 syn sync minlines=200
 syn sync maxlines=500

trunk/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 }
     }