---

yaml
---
r: 179147
b: refs/heads/auto
c: e250fe3
h: refs/heads/master
i:
  179145: c29a54b
  179143: a773903
v: v3

Author: Gankra

[refs]

@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 60cb151be061f859feaf6cf0246f0189b3ad35a9
+refs/heads/auto: e250fe388b3455c067ad87dd3e3b5f6585850fcb
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/Makefile.in

@@ -59,9 +59,6 @@
 #   * check-stage$(stage)-$(crate) - Test a crate in a specific stage
 #   * check-stage$(stage)-{rpass,rfail,cfail,rmake,...} - Run tests in src/test/
 #   * check-stage1-T-$(target)-H-$(host) - Run cross-compiled-tests
-#   * tidy-basic - show file / line stats
-#   * tidy-errors - show the highest rustc error code
-#   * tidy-features - show the status of language and lib features
 #
 # Then mix in some of these environment variables to harness the
 # ultimate power of The Rust Build System.

branches/auto/mk/main.mk

@@ -72,7 +72,6 @@ endif
 # numbers and dots here
 CFG_VERSION_WIN = $(CFG_RELEASE_NUM)
 
-CFG_INFO := $(info cfg: version $(CFG_VERSION))
 
 ######################################################################
 # More configuration
@@ -180,7 +179,6 @@ endif
 
 ifndef CFG_DISABLE_VALGRIND_RPASS
   $(info cfg: enabling valgrind run-pass tests (CFG_ENABLE_VALGRIND_RPASS))
-  $(info cfg: valgrind-rpass command set to $(CFG_VALGRIND))
   CFG_VALGRIND_RPASS :=$(CFG_VALGRIND)
 else
   CFG_VALGRIND_RPASS :=

branches/auto/mk/tests.mk

@@ -162,8 +162,7 @@ $(foreach file,$(wildcard $(S)src/doc/trpl/*.md), \
 ######################################################################
 
 # The main testing target. Tests lots of stuff.
-check: cleantmptestlogs cleantestlibs all check-stage2 tidy
-	$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
+check: cleantmptestlogs cleantestlibs check-notidy tidy
 
 # As above but don't bother running tidy.
 check-notidy: cleantmptestlogs cleantestlibs all check-stage2
@@ -236,24 +235,57 @@ cleantestlibs:
 ######################################################################
 
 ifdef CFG_NOTIDY
-.PHONY: tidy
 tidy:
 else
 
-# Run the tidy script in multiple parts to avoid huge 'echo' commands
-.PHONY: tidy
-tidy: tidy-basic tidy-binaries tidy-errors tidy-features
-
-endif
+ALL_CS := $(wildcard $(S)src/rt/*.cpp \
+                     $(S)src/rt/*/*.cpp \
+                     $(S)src/rt/*/*/*.cpp \
+                     $(S)src/rustllvm/*.cpp)
+ALL_CS := $(filter-out $(S)src/rt/miniz.cpp \
+		       $(wildcard $(S)src/rt/hoedown/src/*.c) \
+		       $(wildcard $(S)src/rt/hoedown/bin/*.c) \
+	,$(ALL_CS))
+ALL_HS := $(wildcard $(S)src/rt/*.h \
+                     $(S)src/rt/*/*.h \
+                     $(S)src/rt/*/*/*.h \
+                     $(S)src/rustllvm/*.h)
+ALL_HS := $(filter-out $(S)src/rt/valgrind/valgrind.h \
+                       $(S)src/rt/valgrind/memcheck.h \
+                       $(S)src/rt/msvc/typeof.h \
+                       $(S)src/rt/msvc/stdint.h \
+                       $(S)src/rt/msvc/inttypes.h \
+		       $(wildcard $(S)src/rt/hoedown/src/*.h) \
+		       $(wildcard $(S)src/rt/hoedown/bin/*.h) \
+	,$(ALL_HS))
 
-.PHONY: tidy-basic
-tidy-basic:
+# Run the tidy script in multiple parts to avoid huge 'echo' commands
+tidy:
 		@$(call E, check: formatting)
-		$(Q) $(CFG_PYTHON) $(S)src/etc/tidy.py $(S)src/
-
-.PHONY: tidy-binaries
-tidy-binaries:
-		@$(call E, check: binaries)
+		$(Q)find $(S)src -name '*.r[sc]' \
+		    -and -not -regex '^$(S)src/jemalloc.*' \
+		    -and -not -regex '^$(S)src/libuv.*' \
+		    -and -not -regex '^$(S)src/llvm.*' \
+		    -and -not -regex '^$(S)src/gyp.*' \
+		    -and -not -regex '^$(S)src/libbacktrace.*' \
+		    -print0 \
+		| xargs -0 -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
+		$(Q)find $(S)src/etc -name '*.py' \
+		| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
+		$(Q)find $(S)src/doc -name '*.js' \
+		| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
+		$(Q)find $(S)src/etc -name '*.sh' \
+		| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
+		$(Q)find $(S)src/etc -name '*.pl' \
+		| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
+		$(Q)find $(S)src/etc -name '*.c' \
+		| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
+		$(Q)find $(S)src/etc -name '*.h' \
+		| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
+		$(Q)echo $(ALL_CS) \
+		| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
+		$(Q)echo $(ALL_HS) \
+		| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
 		$(Q)find $(S)src -type f -perm +a+x \
 		    -not -name '*.rs' -and -not -name '*.py' \
 		    -and -not -name '*.sh' \
@@ -268,18 +300,13 @@ tidy-binaries:
 		| grep '^$(S)src/libbacktrace' -v \
 		| grep '^$(S)src/rust-installer' -v \
 		| xargs $(CFG_PYTHON) $(S)src/etc/check-binaries.py
-
-.PHONY: tidy-errors
-tidy-errors:
-		@$(call E, check: extended errors)
 		$(Q) $(CFG_PYTHON) $(S)src/etc/errorck.py $(S)src/
-
-.PHONY: tidy-features
-tidy-features:
-		@$(call E, check: feature sanity)
 		$(Q) $(CFG_PYTHON) $(S)src/etc/featureck.py $(S)src/
 
 
+endif
+
+
 ######################################################################
 # Sets of tests
 ######################################################################
@@ -612,6 +639,7 @@ CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \
 
 ifdef CFG_VALGRIND_RPASS
 ifdef GOOD_VALGRIND_$(2)
+$(info cfg: valgrind-path set to $(CFG_VALGRIND_RPASS))
 CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) += --valgrind-path "$(CFG_VALGRIND_RPASS)"
 endif
 endif

branches/auto/src/compiletest/compiletest.rs

@@ -118,10 +118,7 @@ pub fn parse_config(args: Vec<String> ) -> Config {
     }
 
     fn opt_path(m: &getopts::Matches, nm: &str) -> Path {
-        match m.opt_str(nm) {
-            Some(s) => Path::new(s),
-            None => panic!("no option (=path) found for {}", nm),
-        }
+        Path::new(m.opt_str(nm).unwrap())
     }
 
     let filter = if !matches.free.is_empty() {

branches/auto/src/doc/reference.md

@@ -1813,6 +1813,7 @@ default visibility with the `priv` keyword. When an item is declared as `pub`,
 it can be thought of as being accessible to the outside world. For example:
 
 ```
+# #![allow(missing_copy_implementations)]
 # fn main() {}
 // Declare a private struct
 struct Foo;

branches/auto/src/doc/trpl/crates-and-modules.md

@@ -551,10 +551,6 @@ module, we now have a `phrases::japanese::hello()` function and a
 `phrases::japanese::farewells::goodbye()`. Our internal organization doesn't
 define our external interface.
 
-Here we have a `pub use` for each function we want to bring into the 
-`japanese` scope. We could alternatively use the wildcard syntax to include
-everything from `greetings` into the current scope: `pub use self::greetings::*`. 
-
 Also, note that we `pub use`d before we declared our `mod`s. Rust requires that
 `use` declarations go first.
 

branches/auto/src/doc/trpl/ownership.md

@@ -523,7 +523,7 @@ fn print<'a>(s: &'a str); // expanded
 fn debug(lvl: u32, s: &str); // elided
 fn debug<'a>(lvl: u32, s: &'a str); // expanded
 
-// In the preceding example, `lvl` doesn't need a lifetime because it's not a
+// In the preceeding example, `lvl` doesn't need a lifetime because it's not a
 // reference (`&`). Only things relating to references (such as a `struct`
 // which contains a reference) need lifetimes.
 

branches/auto/src/etc/errorck.py

@@ -15,10 +15,6 @@
 import os
 import re
 
-if len(sys.argv) < 2:
-    print "usage: errorck.py <src-dir>"
-    sys.exit(1)
-
 src_dir = sys.argv[1]
 errcode_map = {}
 error_re = re.compile("(E\d\d\d\d)")
@@ -58,10 +54,8 @@
             print("{1}: {2}\n{3}".format(*entry))
         errors = True
 
-print
-print("* {0} error codes".format(len(errcode_map)))
-print("* highest error code: " + max(all_errors))
-print
+print("{0} error codes".format(len(errcode_map)))
+print("highest error code: " + max(all_errors))
 
 if errors:
     sys.exit(1)

branches/auto/src/etc/featureck.py

@@ -20,10 +20,6 @@
 
 import sys, os, re
 
-if len(sys.argv) < 2:
-    print "usage: featurkck.py <src-dir>"
-    sys.exit(1)
-
 src_dir = sys.argv[1]
 
 # Features that are allowed to exist in both the language and the library
@@ -238,8 +234,10 @@
 
 lines.sort()
 
+print
+print "Rust feature summary:"
 print
 for line in lines:
-    print "* " + line
+    print line
 print
 

branches/auto/src/etc/licenseck.py

@@ -22,6 +22,11 @@
 \\1 except according to those terms.""")
 
 exceptions = [
+    "rt/rust_android_dummy.cpp", # BSD, chromium
+    "rt/rust_android_dummy.h", # BSD, chromium
+    "rt/isaac/randport.cpp", # public domain
+    "rt/isaac/rand.h", # public domain
+    "rt/isaac/standard.h", # public domain
     "libstd/sync/mpsc/mpsc_queue.rs", # BSD
     "libstd/sync/mpsc/spsc_queue.rs", # BSD
     "test/bench/shootout-binarytrees.rs", # BSD