---

yaml
---
r: 150682
b: refs/heads/try2
c: 4051bd9
h: refs/heads/master
v: v3

Author: ben0x539

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 8801d891c4674f335fcdc67cb34237902d89a5ec
+refs/heads/try2: 4051bd900abbb47557dd8928532eedbc2bca0563
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/README.md

@@ -59,7 +59,7 @@ documentation.
 
 [repo]: https://github.com/mozilla/rust
 [tarball]: http://static.rust-lang.org/dist/rust-nightly.tar.gz
-[tutorial]: http://static.rust-lang.org/doc/master/tutorial.html
+[tutorial]: http://static.rust-lang.org/doc/nightly/tutorial.html
 
 ## Notes
 

branches/try2/mk/dist.mk

@@ -203,17 +203,19 @@ distcheck-osx: dist-osx
 # Unix binary installer tarballs
 ######################################################################
 
-define DEF_PREPARE_DIST_DIR
-
-dist-install-dir-$(1)$(3): PREPARE_HOST=$(1)
-dist-install-dir-$(1)$(3): PREPARE_TARGETS=$(2)
-dist-install-dir-$(1)$(3): PREPARE_DEST_DIR=tmp/dist/$$(PKG_NAME)-$(1)
-dist-install-dir-$(1)$(3): PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD)
-dist-install-dir-$(1)$(3): PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD)
-dist-install-dir-$(1)$(3): PREPARE_LIB_CMD=$(DEFAULT_PREPARE_LIB_CMD)
-dist-install-dir-$(1)$(3): PREPARE_MAN_CMD=$(DEFAULT_PREPARE_MAN_CMD)
-dist-install-dir-$(1)$(3): PREPARE_CLEAN=true
-dist-install-dir-$(1)$(3): prepare-base-dir-$(1) docs compiler-docs
+define DEF_INSTALLER
+
+$$(eval $$(call DEF_PREPARE,dir-$(1)))
+
+dist-install-dir-$(1): PREPARE_HOST=$(1)
+dist-install-dir-$(1): PREPARE_TARGETS=$(1)
+dist-install-dir-$(1): PREPARE_DEST_DIR=tmp/dist/$$(PKG_NAME)-$(1)
+dist-install-dir-$(1): PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD)
+dist-install-dir-$(1): PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD)
+dist-install-dir-$(1): PREPARE_LIB_CMD=$(DEFAULT_PREPARE_LIB_CMD)
+dist-install-dir-$(1): PREPARE_MAN_CMD=$(DEFAULT_PREPARE_MAN_CMD)
+dist-install-dir-$(1): PREPARE_CLEAN=true
+dist-install-dir-$(1): prepare-base-dir-$(1) docs compiler-docs
 	$$(Q)(cd $$(PREPARE_DEST_DIR)/ && find . -type f | sed 's/^\.\///') \
       > tmp/dist/manifest-$(1).in
 	$$(Q)mv tmp/dist/manifest-$(1).in $$(PREPARE_DEST_DIR)/$$(CFG_LIBDIR_RELATIVE)/rustlib/manifest.in
@@ -225,16 +227,6 @@ dist-install-dir-$(1)$(3): prepare-base-dir-$(1) docs compiler-docs
 	$$(Q)cp -r doc $$(PREPARE_DEST_DIR)
 	$$(Q)$$(PREPARE_BIN_CMD) $$(S)src/etc/install.sh $$(PREPARE_DEST_DIR)
 
-endef
-
-define DEF_INSTALLER
-
-$$(eval $$(call DEF_PREPARE,dir-$(1)))
-
-$$(eval $$(call DEF_PREPARE_DIST_DIR,$(1),$(1),))
-
-$$(eval $$(call DEF_PREPARE_DIST_DIR,$(1),$(CFG_TARGET),-with-target-libs))
-
 dist/$$(PKG_NAME)-$(1).tar.gz: dist-install-dir-$(1)
 	@$(call E, build: $$@)
 	$$(Q)tar -czf dist/$$(PKG_NAME)-$(1).tar.gz -C tmp/dist $$(PKG_NAME)-$(1)

branches/try2/mk/install.mk

@@ -14,12 +14,12 @@ else
 MAYBE_DISABLE_VERIFY=
 endif
 
-install: dist-install-dir-$(CFG_BUILD)-with-target-libs
+install: dist-install-dir-$(CFG_BUILD)
 	$(Q)sh tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" "$(MAYBE_DISABLE_VERIFY)"
 # Remove tmp files while we can because they may have been created under sudo
 	$(Q)rm -R tmp/dist
 
-uninstall: dist-install-dir-$(CFG_BUILD)-with-target-libs
+uninstall: dist-install-dir-$(CFG_BUILD)
 	$(Q)sh tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)"
 # Remove tmp files while we can because they may have been created under sudo
 	$(Q)rm -R tmp/dist

branches/try2/mk/tests.mk

@@ -183,9 +183,6 @@ check-ref: cleantestlibs cleantmptestlogs check-stage2-rpass \
 check-docs: cleantestlibs cleantmptestlogs check-stage2-docs
 	$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
 
-# NOTE: Remove after reprogramming windows bots
-check-fast: check-lite
-
 .PHONY: cleantmptestlogs cleantestlibs
 
 cleantmptestlogs:
@@ -878,9 +875,69 @@ $(foreach crate,$(TEST_CRATES), \
  $(eval $(call DEF_CHECK_CRATE,$(crate))))
 
 ######################################################################
-# RMAKE rules
+# check-fast rules
 ######################################################################
 
+FT := run_pass_stage2
+FT_LIB := $(call CFG_LIB_NAME_$(CFG_BUILD),$(FT))
+FT_DRIVER := $(FT)_driver
+
+GENERATED += tmp/$(FT).rc tmp/$(FT_DRIVER).rs
+
+tmp/$(FT).rc tmp/$(FT_DRIVER).rs: \
+		$(RPASS_TESTS) \
+		$(S)src/etc/combine-tests.py
+	@$(call E, check: building combined stage2 test runner)
+	$(Q)$(CFG_PYTHON) $(S)src/etc/combine-tests.py
+
+define DEF_CHECK_FAST_FOR_T_H
+# $(1) unused
+# $(2) target triple
+# $(3) host triple
+
+$$(TLIB2_T_$(2)_H_$(3))/$$(FT_LIB): \
+		tmp/$$(FT).rc \
+		$$(SREQ2_T_$(2)_H_$(3))
+	@$$(call E, oxidize: $$@)
+	$$(STAGE2_T_$(2)_H_$(3)) --crate-type=dylib --out-dir $$(@D) $$< \
+	  -L "$$(RT_OUTPUT_DIR_$(2))"
+
+$(3)/test/$$(FT_DRIVER)-$(2)$$(X_$(2)): \
+		tmp/$$(FT_DRIVER).rs \
+		$$(TLIB2_T_$(2)_H_$(3))/$$(FT_LIB) \
+		$$(SREQ2_T_$(2)_H_$(3))
+	@$$(call E, oxidize: $$@ $$<)
+	$$(STAGE2_T_$(2)_H_$(3)) -o $$@ $$< \
+	  -L "$$(RT_OUTPUT_DIR_$(2))"
+
+$(3)/test/$$(FT_DRIVER)-$(2).out: \
+		$(3)/test/$$(FT_DRIVER)-$(2)$$(X_$(2)) \
+		$$(SREQ2_T_$(2)_H_$(3))
+	$$(Q)$$(call CFG_RUN_TEST_$(2),$$<,$(2),$(3)) \
+	--logfile tmp/$$(FT_DRIVER)-$(2).log
+
+check-fast-T-$(2)-H-$(3):     			\
+	$(3)/test/$$(FT_DRIVER)-$(2).out
+
+endef
+
+$(foreach host,$(CFG_HOST), \
+ $(eval $(foreach target,$(CFG_TARGET), \
+   $(eval $(call DEF_CHECK_FAST_FOR_T_H,,$(target),$(host))))))
+
+check-fast: tidy check-fast-H-$(CFG_BUILD) \
+	    $(foreach crate,$(TARGET_CRATES),check-stage2-$(crate))
+	$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
+
+define DEF_CHECK_FAST_FOR_H
+
+check-fast-H-$(1): 		check-fast-T-$(1)-H-$(1)
+
+endef
+
+$(foreach host,$(CFG_HOST),			\
+ $(eval $(call DEF_CHECK_FAST_FOR_H,$(host))))
+
 RMAKE_TESTS := $(shell ls -d $(S)src/test/run-make/*/)
 RMAKE_TESTS := $(RMAKE_TESTS:$(S)src/test/run-make/%/=%)
 
@@ -904,7 +961,6 @@ $(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \
 	@rm -rf $(3)/test/run-make/$$*
 	@mkdir -p $(3)/test/run-make/$$*
 	$$(Q)$$(CFG_PYTHON) $(S)src/etc/maketest.py $$(dir $$<) \
-        $$(MAKE) \
 	    $$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
 	    $(3)/test/run-make/$$* \
 	    "$$(CC_$(3)) $$(CFG_GCCISH_CFLAGS_$(3))" \

branches/try2/src/compiletest/procsrv.rs

@@ -84,8 +84,8 @@ pub fn run(lib_path: &str,
 
             Some(Result {
                 status: status,
-                out: str::from_utf8(output.as_slice()).unwrap().to_owned(),
-                err: str::from_utf8(error.as_slice()).unwrap().to_owned()
+                out: str::from_utf8_owned(output).unwrap(),
+                err: str::from_utf8_owned(error).unwrap()
             })
         },
         Err(..) => None

branches/try2/src/compiletest/runtest.rs

@@ -153,7 +153,7 @@ fn run_pretty_test(config: &config, props: &TestProps, testfile: &Path) {
         match props.pp_exact { Some(_) => 1, None => 2 };
 
     let src = File::open(testfile).read_to_end().unwrap();
-    let src = str::from_utf8(src.as_slice()).unwrap().to_owned();
+    let src = str::from_utf8_owned(src).unwrap();
     let mut srcs = vec!(src);
 
     let mut round = 0;
@@ -177,7 +177,7 @@ fn run_pretty_test(config: &config, props: &TestProps, testfile: &Path) {
         Some(ref file) => {
             let filepath = testfile.dir_path().join(file);
             let s = File::open(&filepath).read_to_end().unwrap();
-            str::from_utf8(s.as_slice()).unwrap().to_owned()
+            str::from_utf8_owned(s).unwrap()
           }
           None => { (*srcs.get(srcs.len() - 2u)).clone() }
         };
@@ -1163,7 +1163,7 @@ fn disassemble_extract(config: &config, _props: &TestProps,
 
 fn count_extracted_lines(p: &Path) -> uint {
     let x = File::open(&p.with_extension("ll")).read_to_end().unwrap();
-    let x = str::from_utf8(x.as_slice()).unwrap();
+    let x = str::from_utf8_owned(x).unwrap();
     x.lines().len()
 }
 

branches/try2/src/doc/complement-cheatsheet.md

@@ -96,7 +96,7 @@ Use the [`lines`](http://static.rust-lang.org/doc/master/std/io/trait.Buffer.htm
 use std::io::BufferedReader;
 # use std::io::MemReader;
 
-# let reader = MemReader::new(vec!());
+# let reader = MemReader::new(~[]);
 
 let mut reader = BufferedReader::new(reader);
 for line in reader.lines() {
@@ -152,7 +152,7 @@ struct Foo {
 }
 
 struct FooClosure<'a> {
-    myfunc: |int, uint|: 'a -> i32
+    myfunc: 'a |int, uint| -> i32
 }
 
 fn a(a: int, b: uint) -> i32 {

branches/try2/src/doc/index.md

@@ -67,10 +67,6 @@ li {list-style-type: none; }
 
 # External resources
 
-* The Rust IRC channels on [irc.mozilla.org](http://irc.mozilla.org/)
-    * [`#rust`](http://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust) - general discussion
-    * [`#rust-gamedev`](http://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-gamedev) - game development
-    * [`#rust-internals`](http://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-internals) - compiler and libraries
-    * [`#rust-osdev`](http://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-osdev) - operating system development
+* The Rust [IRC channel](http://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust) - `#rust` on irc.mozilla.org
 * The Rust community on [Reddit](http://reddit.com/r/rust)
 * The Rust [wiki](http://github.com/mozilla/rust/wiki)

branches/try2/src/doc/rust.md

@@ -432,7 +432,7 @@ operators](#binary-operator-expressions), or [keywords](#keywords).
 ## Paths
 
 ~~~~ {.notrust .ebnf .gram}
-expr_path : [ "::" ] ident [ "::" expr_path_tail ] + ;
+expr_path : ident [ "::" expr_path_tail ] + ;
 expr_path_tail : '<' type_expr [ ',' type_expr ] + '>'
                | expr_path ;
 
@@ -475,51 +475,6 @@ let x = id::<int>(10);         // Type arguments used in a call expression
 # }
 ~~~~
 
-Paths can be denoted with various leading qualifiers to change the meaning of
-how it is resolved:
-
-* Paths starting with `::` are considered to be global paths where the
-  components of the path start being resolved from the crate root. Each
-  identifier in the path must resolve to an item.
-
-  ```rust
-  mod a {
-      pub fn foo() {}
-  }
-  mod b {
-      pub fn foo() {
-          ::a::foo(); // call a's foo function
-      }
-  }
-  # fn main() {}
-  ```
-
-* Paths starting with the keyword `super` begin resolution relative to the
-  parent module. Each further identifier must resolve to an item
-
-  ```rust
-  mod a {
-      pub fn foo() {}
-  }
-  mod b {
-      pub fn foo() {
-          super::a::foo(); // call a's foo function
-      }
-  }
-  # fn main() {}
-  ```
-
-* Paths starting with the keyword `self` begin resolution relative to the
-  current module. Each further identifier must resolve to an item.
-
-  ```rust
-  fn foo() {}
-  fn bar() {
-      self::foo();
-  }
-  # fn main() {}
-  ```
-
 # Syntax extensions
 
 A number of minor features of Rust are not central enough to have their own
@@ -3460,7 +3415,7 @@ fn add(x: int, y: int) -> int {
 
 let mut x = add(5,7);
 
-type Binop<'a> = |int,int|: 'a -> int;
+type Binop<'a> = 'a |int,int| -> int;
 let bo: Binop = add;
 x = bo(5,7);
 ~~~~

branches/try2/src/etc/combine-tests.py

@@ -0,0 +1,91 @@
+# Copyright 2011-2014 The Rust Project Developers. See the COPYRIGHT
+# file at the top-level directory of this distribution and at
+# http://rust-lang.org/COPYRIGHT.
+#
+# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+# option. This file may not be copied, modified, or distributed
+# except according to those terms.
+
+# This combines all the working run-pass tests into a single large crate so we
+# can run it "fast": spawning zillions of windows processes is our major build
+# bottleneck (and it doesn't hurt to run faster on other platforms as well).
+
+import sys
+import os
+import codecs
+
+
+def scrub(b):
+    if sys.version_info >= (3,) and type(b) == bytes:
+        return b.decode('ascii')
+    else:
+        return b
+
+src_dir = scrub(os.getenv("CFG_SRC_DIR"))
+if not src_dir:
+    raise Exception("missing env var CFG_SRC_DIR")
+
+run_pass = os.path.join(src_dir, "src", "test", "run-pass")
+run_pass = os.path.abspath(run_pass)
+stage2_tests = []
+
+for t in os.listdir(run_pass):
+    if t.endswith(".rs") and not (
+            t.startswith(".") or t.startswith("#") or t.startswith("~")):
+        f = codecs.open(os.path.join(run_pass, t), "r", "utf8")
+        s = f.read()
+        if not ("ignore-test" in s or
+                "ignore-fast" in s or
+                "ignore-win32" in s):
+            if not "pub fn main" in s and "fn main" in s:
+                print("Warning: no public entry point in " + t)
+            stage2_tests.append(t)
+        f.close()
+
+stage2_tests.sort()
+
+c = open("tmp/run_pass_stage2.rc", "w")
+i = 0
+c.write(
+"""
+// AUTO-GENERATED FILE: DO NOT EDIT
+#[crate_id=\"run_pass_stage2#0.1\"];
+#[crate_id=\"run_pass_stage2#0.1\"];
+#[feature(globs, macro_rules, struct_variant, managed_boxes)];
+#![allow(warnings)]
+extern crate collections;
+"""
+)
+for t in stage2_tests:
+    p = os.path.join(run_pass, t)
+    p = p.replace("\\", "\\\\")
+    c.write("#[path = \"%s\"]" % p)
+    c.write("pub mod t_%d;\n" % i)
+    i += 1
+c.close()
+
+
+d = open("tmp/run_pass_stage2_driver.rs", "w")
+d.write(
+"""
+// AUTO-GENERATED FILE: DO NOT EDIT
+#[feature(globs, managed_boxes)];
+extern crate run_pass_stage2;
+use run_pass_stage2::*;
+use std::io;
+use std::io::Writer;
+#[allow(warnings)]
+fn main() {
+    let mut out = io::stdout();
+"""
+)
+i = 0
+for t in stage2_tests:
+    p = os.path.join("test", "run-pass", t)
+    p = p.replace("\\", "\\\\")
+    d.write("    out.write(\"run-pass [stage2]: %s\\n\".as_bytes());\n" % p)
+    d.write("    t_%d::main();\n" % i)
+    i += 1
+d.write("}\n")