---

yaml
---
r: 189275
b: refs/heads/master
c: 65b4eda
h: refs/heads/master
i:
  189273: 832e4ba
  189271: 79ab73f
v: v3

Author: alexcrichton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 31af63748bbe62adab6bed6008deca67911bd0d2
+refs/heads/master: 65b4eda5a6f270f5c30beec66c59825aba0524b9
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 270a677d4d698916f5ad103f0afc3c070b8dbeb4
 refs/heads/try: 649d35e4d830b27806705dc5352c86ab6d6fd1a1

trunk/configure

@@ -697,17 +697,15 @@ probe CFG_ADB        adb
 
 if [ ! -z "$CFG_PANDOC" ]
 then
-    PV_MAJOR_MINOR=$(pandoc --version | grep '^pandoc' |
-        # Extract "MAJOR MINOR" from Pandoc's version number
-        sed -E 's/pandoc(.exe)? ([0-9]+)\.([0-9]+).*/\2 \3/')
+    PV_MAJOR_MINOR=$(pandoc --version | grep '^pandoc\(.exe\)\? ' |
+        # extract the first 2 version fields, ignore everything else
+        sed 's/pandoc\(.exe\)\? \([0-9]*\)\.\([0-9]*\).*/\2 \3/')
 
     MIN_PV_MAJOR="1"
     MIN_PV_MINOR="9"
-
     # these patterns are shell globs, *not* regexps
     PV_MAJOR=${PV_MAJOR_MINOR% *}
     PV_MINOR=${PV_MAJOR_MINOR#* }
-
     if [ "$PV_MAJOR" -lt "$MIN_PV_MAJOR" ] || [ "$PV_MINOR" -lt "$MIN_PV_MINOR" ]
     then
         step_msg "pandoc $PV_MAJOR.$PV_MINOR is too old. Need at least $MIN_PV_MAJOR.$MIN_PV_MINOR. Disabling"

trunk/mk/main.mk

@@ -18,7 +18,7 @@ CFG_RELEASE_NUM=1.0.0
 # An optional number to put after the label, e.g. '.2' -> '-beta.2'
 # NB Make sure it starts with a dot to conform to semver pre-release
 # versions (section 9)
-CFG_PRERELEASE_VERSION=
+CFG_PRERELEASE_VERSION=.2
 
 CFG_FILENAME_EXTRA=4e7c5e5c
 
@@ -30,8 +30,8 @@ CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)
 CFG_DISABLE_UNSTABLE_FEATURES=1
 endif
 ifeq ($(CFG_RELEASE_CHANNEL),beta)
-CFG_RELEASE=$(CFG_RELEASE_NUM)-beta(CFG_PRERELEASE_VERSION)
-CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)-beta(CFG_PRERELEASE_VERSION)
+CFG_RELEASE=$(CFG_RELEASE_NUM)-alpha$(CFG_PRERELEASE_VERSION)
+CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)-alpha$(CFG_PRERELEASE_VERSION)
 CFG_DISABLE_UNSTABLE_FEATURES=1
 endif
 ifeq ($(CFG_RELEASE_CHANNEL),nightly)

trunk/mk/tests.mk

@@ -590,7 +590,7 @@ TEST_SREQ$(1)_T_$(2)_H_$(3) = \
 
 # The tests select when to use debug configuration on their own;
 # remove directive, if present, from CFG_RUSTC_FLAGS (issue #7898).
-CTEST_RUSTC_FLAGS := $$(subst -C debug-assertions,,$$(CFG_RUSTC_FLAGS))
+CTEST_RUSTC_FLAGS := $$(subst --cfg ndebug,,$$(CFG_RUSTC_FLAGS))
 
 # The tests cannot be optimized while the rest of the compiler is optimized, so
 # filter out the optimization (if any) from rustc and then figure out if we need

trunk/src/compiletest/compiletest.rs

@@ -22,9 +22,10 @@
 #![feature(unicode)]
 #![feature(core)]
 #![feature(path)]
+#![feature(os)]
 #![feature(io)]
+#![feature(fs)]
 #![feature(net)]
-#![feature(path_ext)]
 
 #![deny(warnings)]
 

trunk/src/compiletest/runtest.rs

@@ -20,6 +20,7 @@ use procsrv;
 use util::logv;
 
 use std::env;
+use std::ffi::OsStr;
 use std::fmt;
 use std::fs::{self, File};
 use std::io::BufReader;
@@ -1322,7 +1323,7 @@ fn make_exe_name(config: &Config, testfile: &Path) -> PathBuf {
     let mut f = output_base_name(config, testfile);
     if !env::consts::EXE_SUFFIX.is_empty() {
         let mut fname = f.file_name().unwrap().to_os_string();
-        fname.push(env::consts::EXE_SUFFIX);
+        fname.push_os_str(OsStr::from_str(env::consts::EXE_SUFFIX));
         f.set_file_name(&fname);
     }
     f
@@ -1432,7 +1433,7 @@ fn make_out_name(config: &Config, testfile: &Path, extension: &str) -> PathBuf {
 fn aux_output_dir_name(config: &Config, testfile: &Path) -> PathBuf {
     let f = output_base_name(config, testfile);
     let mut fname = f.file_name().unwrap().to_os_string();
-    fname.push("libaux");
+    fname.push_os_str(OsStr::from_str("libaux"));
     f.with_file_name(&fname)
 }
 
@@ -1646,8 +1647,8 @@ fn append_suffix_to_stem(p: &Path, suffix: &str) -> PathBuf {
         p.to_path_buf()
     } else {
         let mut stem = p.file_stem().unwrap().to_os_string();
-        stem.push("-");
-        stem.push(suffix);
+        stem.push_os_str(OsStr::from_str("-"));
+        stem.push_os_str(OsStr::from_str(suffix));
         p.with_file_name(&stem)
     }
 }

trunk/src/doc/guide-tasks.md

@@ -1,4 +1,4 @@
 % The (old) Rust Threads and Communication Guide
 
 This content has moved into
-[the Rust Programming Language book](book/concurrency.html).
+[the Rust Programming Language book](book/tasks.html).

trunk/src/doc/intro.md

@@ -428,8 +428,7 @@ fn main() {
 
     let guards: Vec<_> = (0..3).map(|i| {
         Thread::scoped(move || {
-            numbers[i] += 1;
-            println!("numbers[{}] is {}", i, numbers[i]);
+            for j in 0..3 { numbers[j] += 1 }
         });
     }).collect();
 }
@@ -438,12 +437,10 @@ fn main() {
 It gives us this error:
 
 ```text
-7:25: 10:6 error: cannot move out of captured outer variable in an `FnMut` closure
-7     Thread::scoped(move || {
-8       numbers[i] += 1;
-9       println!("numbers[{}] is {}", i, numbers[i]);
-10     });
-error: aborting due to previous error
+7:29: 9:10 error: cannot move out of captured outer variable in an `FnMut` closure
+7         Thread::scoped(move || {
+8             for j in 0..3 { numbers[j] += 1 }
+9         });
 ```
 
 It mentions that "captured outer variable in an `FnMut` closure".

trunk/src/doc/reference.md

@@ -2555,14 +2555,6 @@ The currently implemented features of the reference compiler are:
                             types, e.g. as the return type of a public function.
                             This capability may be removed in the future.
 
-* `allow_internal_unstable` - Allows `macro_rules!` macros to be tagged with the
-                              `#[allow_internal_unstable]` attribute, designed
-                              to allow `std` macros to call
-                              `#[unstable]`/feature-gated functionality
-                              internally without imposing on callers
-                              (i.e. making them behave like function calls in
-                              terms of encapsulation).
-
 If a feature is promoted to a language feature, then all existing programs will
 start to receive compilation warnings about #[feature] directives which enabled
 the new feature (because the directive is no longer necessary). However, if a

trunk/src/doc/trpl/arrays-vectors-and-slices.md

@@ -60,12 +60,6 @@ let v = vec![1, 2, 3]; // v: Vec<i32>
 brackets `[]` with `vec!`. Rust allows you to use either in either situation,
 this is just convention.)
 
-There's an alternate form of `vec!` for repeating an initial value:
-
-```
-let v = vec![0; 10]; // ten zeroes
-```
-
 You can get the length of, iterate over, and subscript vectors just like
 arrays. In addition, (mutable) vectors can grow automatically:
 

trunk/src/doc/trpl/compound-data-types.md

@@ -6,8 +6,8 @@ strings, but next, let's talk about some more complicated ways of storing data.
 
 ## Tuples
 
-The first compound data type we're going to talk about is called the *tuple*.
-A tuple is an ordered list of fixed size. Like this:
+The first compound data type we're going to talk about are called *tuples*.
+Tuples are an ordered list of a fixed size. Like this:
 
 ```rust
 let x = (1, "hello");
@@ -229,7 +229,7 @@ enum Character {
 ```
 
 An `enum` variant can be defined as most normal types. Below are some example
-types which also would be allowed in an `enum`.
+types have been listed which also would be allowed in an `enum`.
 
 ```rust
 struct Empty;

trunk/src/etc/tidy.py

@@ -13,7 +13,7 @@
 import subprocess
 import re
 import os
-from licenseck import check_license
+from licenseck import *
 import snapshot
 
 err = 0
@@ -22,8 +22,13 @@
 tab_flag = "ignore-tidy-tab"
 linelength_flag = "ignore-tidy-linelength"
 
-interesting_files = ['.rs', '.py', '.js', '.sh', '.c', '.h']
-uninteresting_files = ['miniz.c', 'jquery', 'rust_android_dummy']
+# Be careful to support Python 2.4, 2.6, and 3.x here!
+config_proc = subprocess.Popen(["git", "config", "core.autocrlf"],
+                               stdout=subprocess.PIPE)
+result = config_proc.communicate()[0]
+
+true = "true".encode('utf8')
+autocrlf = result.strip() == true if result is not None else False
 
 
 def report_error_name_no(name, no, s):
@@ -46,34 +51,6 @@ def do_license_check(name, contents):
     if not check_license(name, contents):
         report_error_name_no(name, 1, "incorrect license")
 
-
-def update_counts(current_name):
-    global file_counts
-    global count_other_linted_files
-
-    _, ext = os.path.splitext(current_name)
-
-    if ext in interesting_files:
-        file_counts[ext] += 1
-    else:
-        count_other_linted_files += 1
-
-
-def interesting_file(f):
-    if any(x in f for x in uninteresting_files):
-        return False
-
-    return any(os.path.splitext(f)[1] == ext for ext in interesting_files)
-
-
-# Be careful to support Python 2.4, 2.6, and 3.x here!
-config_proc = subprocess.Popen(["git", "config", "core.autocrlf"],
-                               stdout=subprocess.PIPE)
-result = config_proc.communicate()[0]
-
-true = "true".encode('utf8')
-autocrlf = result.strip() == true if result is not None else False
-
 current_name = ""
 current_contents = ""
 check_tab = True
@@ -86,16 +63,28 @@ def interesting_file(f):
 
 src_dir = sys.argv[1]
 
-count_lines = 0
-count_non_blank_lines = 0
-count_other_linted_files = 0
+try:
+    count_lines = 0
+    count_non_blank_lines = 0
 
-file_counts = {ext: 0 for ext in interesting_files}
+    interesting_files = ['.rs', '.py', '.js', '.sh', '.c', '.h']
 
-all_paths = set()
+    file_counts = {ext: 0 for ext in interesting_files}
+    file_counts['other'] = 0
+
+    def update_counts(current_name):
+        global file_counts
+        _, ext = os.path.splitext(current_name)
+
+        if ext in file_counts:
+            file_counts[ext] += 1
+        else:
+            file_counts['other'] += 1
+
+    all_paths = set()
 
-try:
     for (dirpath, dirnames, filenames) in os.walk(src_dir):
+
         # Skip some third-party directories
         skippable_dirs = {
             'src/jemalloc',
@@ -114,6 +103,14 @@ def interesting_file(f):
         if any(d in dirpath for d in skippable_dirs):
             continue
 
+        def interesting_file(f):
+            if "miniz.c" in f \
+            or "jquery" in f \
+            or "rust_android_dummy" in f:
+                return False
+
+            return any(os.path.splitext(f)[1] == ext for ext in interesting_files)
+
         file_names = [os.path.join(dirpath, f) for f in filenames
                       if interesting_file(f)
                       and not f.endswith("_gen.rs")
@@ -199,11 +196,10 @@ def interesting_file(f):
     report_err("UTF-8 decoding error " + str(e))
 
 print
-for ext in sorted(file_counts, key=file_counts.get, reverse=True):
-    print "* linted {} {} files".format(file_counts[ext], ext)
-print "* linted {} other files".format(count_other_linted_files)
-print "* total lines of code: {}".format(count_lines)
-print "* total non-blank lines of code: {}".format(count_non_blank_lines)
+for ext in file_counts:
+    print "* linted " + str(file_counts[ext]) + " " + ext + " files"
+print "* total lines of code: " + str(count_lines)
+print "* total non-blank lines of code: " + str(count_non_blank_lines)
 print
 
 sys.exit(err)

trunk/src/etc/unicode.py

@@ -84,8 +84,8 @@ def fetch(f):
         sys.stderr.write("cannot load %s" % f)
         exit(1)
 
-def is_surrogate(n):
-    return 0xD800 <= n <= 0xDFFF
+def is_valid_unicode(n):
+    return 0 <= n <= 0xD7FF or 0xE000 <= n <= 0x10FFFF
 
 def load_unicode_data(f):
     fetch(f)
@@ -96,28 +96,19 @@ def load_unicode_data(f):
     canon_decomp = {}
     compat_decomp = {}
 
-    udict = {};
-    range_start = -1;
     for line in fileinput.input(f):
-        data = line.split(';');
-        if len(data) != 15:
+        fields = line.split(";")
+        if len(fields) != 15:
             continue
-        cp = int(data[0], 16);
-        if is_surrogate(cp):
-            continue
-        if range_start >= 0:
-            for i in xrange(range_start, cp):
-                udict[i] = data;
-            range_start = -1;
-        if data[1].endswith(", First>"):
-            range_start = cp;
-            continue;
-        udict[cp] = data;
-
-    for code in udict:
-        [code_org, name, gencat, combine, bidi,
+        [code, name, gencat, combine, bidi,
          decomp, deci, digit, num, mirror,
-         old, iso, upcase, lowcase, titlecase ] = udict[code];
+         old, iso, upcase, lowcase, titlecase ] = fields
+
+        code_org = code
+        code     = int(code, 16)
+
+        if not is_valid_unicode(code):
+            continue
 
         # generate char to char direct common and simple conversions
         # uppercase to lowercase