---

yaml
---
r: 63445
b: refs/heads/snap-stage3
c: 9687437
h: refs/heads/master
i:
  63443: 4a665fd
v: v3

Author: Eric Reed

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 9a5bdd71cec39b31124d67fe912467e906a0d310
+refs/heads/snap-stage3: 9687437d4543c2395b92ebcb910fcaf9d8b2cd44
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/.gitattributes

@@ -7,4 +7,3 @@
 src/rt/msvc/* -whitespace
 src/rt/vg/* -whitespace
 src/rt/linenoise/* -whitespace
-src/rt/jemalloc/**/* -whitespace

branches/snap-stage3/.mailmap

@@ -1,38 +1,27 @@
 ## Pull request procedure
 
-Pull requests should be targeted at Rust's `master` branch.
-Before pushing to your Github repo and issuing the pull request,
-please do two things:
+Pull requests should be targeted at Rust's `incoming` branch (note that by default Github will aim them at the `master` branch) --
+see "Changing The Commit Range and Destination Repository" in Github's documentation on [pull requests](https://help.github.com/articles/using-pull-requests).
+Before pushing to your Github repo and issuing the pull request, please do two things:
 
-1. [Rebase](http://git-scm.com/book/en/Git-Branching-Rebasing) your
-   local changes against the `master` branch. Resolve any conflicts
-   that arise.
+1. [Rebase](http://git-scm.com/book/en/Git-Branching-Rebasing) your local changes against the `incoming` branch. Resolve any conflicts that arise.
+2. Run the full Rust test suite with the `make check` command.
+You're not off the hook even if you just stick to documentation; code examples in the docs are tested as well!
 
-2. Run the full Rust test suite with the `make check` command.  You're
-   not off the hook even if you just stick to documentation; code
-   examples in the docs are tested as well!
+Pull requests will be treated as "review requests",
+and we will give feedback we expect to see corrected on [style](https://github.com/mozilla/rust/wiki/Note-style-guide) and substance before pulling.
+Changes contributed via pull request should focus on a single issue at a time, like any other.
+We will not accept pull-requests that try to "sneak" unrelated changes in.
 
-Pull requests will be treated as "review requests", and we will give
-feedback we expect to see corrected on
-[style](https://github.com/mozilla/rust/wiki/Note-style-guide) and
-substance before pulling.  Changes contributed via pull request should
-focus on a single issue at a time, like any other.  We will not accept
-pull-requests that try to "sneak" unrelated changes in.
+Normally, all pull requests must include regression tests (see [Note-testsuite](https://github.com/mozilla/rust/wiki/Note-testsuite)) that test your change.
+Occasionally, a change will be very difficult to test for.
+In those cases, please include a note in your commit message explaining why.
 
-Normally, all pull requests must include regression tests (see
-[Note-testsuite](https://github.com/mozilla/rust/wiki/Note-testsuite))
-that test your change.  Occasionally, a change will be very difficult
-to test for.  In those cases, please include a note in your commit
-message explaining why.
-
-In the licensing header at the beginning of any files you change,
-please make sure the listed date range includes the current year.  For
-example, if it's 2013, and you change a Rust file that was created in
-2010, it should begin:
+In the licensing header at the beginning of any files you change, please make sure the listed date range includes the current year.
+For example, if it's 2013, and you change a Rust file that was created in 2010, it should begin:
 
 ```
 // Copyright 2010-2013 The Rust Project Developers.
 ```
 
-For more details, please refer to
-[Note-development-policy](https://github.com/mozilla/rust/wiki/Note-development-policy).
+For more details, please refer to [Note-development-policy](https://github.com/mozilla/rust/wiki/Note-development-policy).

branches/snap-stage3/CONTRIBUTING.md

@@ -111,7 +111,7 @@ ifdef SAVE_TEMPS
   CFG_RUSTC_FLAGS += --save-temps
 endif
 ifdef ASM_COMMENTS
-  CFG_RUSTC_FLAGS += -Z asm-comments
+  CFG_RUSTC_FLAGS += -z asm-comments
 endif
 ifdef TIME_PASSES
   CFG_RUSTC_FLAGS += -Z time-passes
@@ -146,7 +146,8 @@ ifneq ($(wildcard $(CFG_GIT)),)
 ifneq ($(wildcard $(CFG_GIT_DIR)),)
     CFG_VERSION += $(shell git --git-dir=$(CFG_GIT_DIR) log -1 \
                      --pretty=format:'(%h %ci)')
-    CFG_VER_HASH = $(shell git --git-dir=$(CFG_GIT_DIR) rev-parse HEAD)
+    CFG_VER_HASH = $(shell git --git-dir=$(CFG_GIT_DIR) log -1 \
+                     --pretty=format:'%H')
 endif
 endif
 
@@ -208,6 +209,7 @@ CFG_STDLIB_$(1) :=$(call CFG_LIB_NAME_$(1),std)
 CFG_EXTRALIB_$(1) :=$(call CFG_LIB_NAME_$(1),extra)
 CFG_LIBRUSTC_$(1) :=$(call CFG_LIB_NAME_$(1),rustc)
 CFG_LIBSYNTAX_$(1) :=$(call CFG_LIB_NAME_$(1),syntax)
+CFG_LIBFUZZER_$(1) :=$(call CFG_LIB_NAME_$(1),fuzzer)
 CFG_LIBRUSTPKG_$(1) :=$(call CFG_LIB_NAME_$(1),rustpkg)
 CFG_LIBRUSTDOC_$(1) :=$(call CFG_LIB_NAME_$(1),rustdoc)
 CFG_LIBRUSTI_$(1) :=$(call CFG_LIB_NAME_$(1),rusti)
@@ -217,6 +219,7 @@ EXTRALIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),extra)
 STDLIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),std)
 LIBRUSTC_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustc)
 LIBSYNTAX_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),syntax)
+LIBFUZZER_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),fuzzer)
 LIBRUSTPKG_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustpkg)
 LIBRUSTDOC_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustdoc)
 LIBRUSTI_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rusti)
@@ -225,6 +228,7 @@ EXTRALIB_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),extra)
 STDLIB_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),std)
 LIBRUSTC_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustc)
 LIBSYNTAX_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),syntax)
+LIBFUZZER_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),fuzzer)
 LIBRUSTPKG_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustpkg)
 LIBRUSTDOC_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustdoc)
 LIBRUSTI_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rusti)
@@ -399,10 +403,12 @@ SREQ$(1)_T_$(2)_H_$(3) = \
 # Prerequisites for a working stageN compiler and libraries, for a specific target
 CSREQ$(1)_T_$(2)_H_$(3) = \
 	$$(TSREQ$(1)_T_$(2)_H_$(3)) \
+	$$(HBIN$(1)_H_$(3))/fuzzer$$(X_$(3)) \
 	$$(HBIN$(1)_H_$(3))/rustpkg$$(X_$(3)) \
 	$$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3)) \
 	$$(HBIN$(1)_H_$(3))/rusti$$(X_$(3)) \
 	$$(HBIN$(1)_H_$(3))/rust$$(X_$(3)) \
+	$$(HLIB$(1)_H_$(3))/$(CFG_LIBFUZZER_$(3)) \
 	$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTPKG_$(3)) \
 	$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTDOC_$(3)) \
 	$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTI_$(3)) \
@@ -411,6 +417,7 @@ CSREQ$(1)_T_$(2)_H_$(3) = \
 	$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_EXTRALIB_$(2))  \
 	$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(2))  \
 	$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(2)) \
+	$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBFUZZER_$(2)) \
 	$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTPKG_$(2)) \
 	$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTDOC_$(2)) \
 	$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTI_$(2)) \

branches/snap-stage3/Makefile.in

@@ -3,91 +3,12 @@ Version 0.7 (July 2013)
 
    * ??? changes, numerous bugfixes
 
-   * Syntax changes
-      * `use mod` is no longer valid.
-      * `fail!` and `assert!` accept `~str`, `&'static str` or `fmt!`-style
-        argument list.
-      * `Encodable`, `Decodable`, `TotalOrd`, `TotalEq`, `DeepClone` can all
-        be automatically derived with `#[deriving(...)]`.
-      * The `Durable` trait is replaced with the `'static` bounds.
-      * At long last, 'argument modes' no longer exist.
-      * The `bytes!` macro returns a vector of bytes for string, u8, char,
-        and unsuffixed integer literals.
-
    * Semantic changes
-      * The borrow checker has been rewritten with flow-sensitivity, fixing
-        many bugs and inconveniences.
-      * The `self` parameter no longer implicitly means `&'self self`,
-        and can be explicitly marked with a lifetime.
-      * Structs with the `#[packed]` attribute have byte alignment and
-        no padding between fields.
-      * The `for` loop protocol now requires `for`-iterators to return `bool`
-        so they compose better.
-      * `Option<~T>` is now represented as a nullable pointer.
-      * `@mut` does dynamic borrow checks correctly.
-      * Macros TODO
-      * The `main` function is only detected at the topmost level of the crate.
-        The `#[main]` attribute is still valid anywhere.
-      * Struct fields may no longer be mutable. Use inherited mutability.
-      * The `#[non_owned]` attribute makes a type that would otherwise be
-        `Owned`, not. TODO this may change to non_send before 0.7
-      * The `#[mutable]` attribute makes a type that would otherwise be
-        `Const`, note. TODO this may change to non_freeze before 0.7
-      * Unbounded recursion will abort the process after reaching the limit
-        specified by the `RUST_MAX_STACK` environment variable.
-      * The `vecs_implicitly_copyable` lint mode has been removed. Vectors
-        are never implicitly copyable.
+      * The `self` parameter no longer implicitly means `&'self self`, and can be explicitly marked
+        with a lifetime.
 
    * Libraries
-      * The `core` crate was renamed to `std`.
-      * The `std` crate was renamed to `extra`.
-      * `std::mut` removed.
-      * std: The prelude no longer reexports any modules, only types and traits.
-      * std: Prelude additions: `print`, `println`, `FromStr`, `ApproxEq`, `Equiv`,
-        `Iterator`, `IteratorUtil`, many numeric traits, many tuple traits.
-      * std: `iterator` module for external iterator objects.
-      * std: new numeric traits: `Fractional`, `Real`, `RealExt`, `Integer`, `Ratio`,
-        `Algebraic`, `Trigonometric`, `Exponential`, `Primitive`.
-      * std: Tuple traits and accessors defined for up to 12-tuples, e.g.
-        `(0, 1, 2).n2()` or `(0, 1, 2).n2_ref()`.
-      * std: many types implement `Clone` - tuples, @, @mut. TODO
-      * std: `path` type renamed to `Path`.
-      * std: Many standalone functions removed in favor of methods in
-        `vec`, `str`. In the future methods will also work as functions.
-      * std: `reinterpret_cast` removed. Used `transmute`.
-      * std: ascii string handling in `std::ascii`.
-      * std: `Rand` is implemented for ~/@.
-      * std: `run` module for spawning processes overhauled.
-      * std: Various atomic types added to `unstable::atomic`.
-      * std: `LinearMap` and `LinearSet` renamed to `HashMap` and `HashSet`.
-      * std: Added `os::mkdir_recursive`.
-      * std: Added `os::glob` function performs filesystems globs.
-      * std: `FuzzyEq` renamed to `ApproxEq`.
-      * std: `Map` now defines `pop` and `swap` methods.
-      * extra: `flate` module moved from `std` to `extra`.
-      * extra: `FileInput` implements `std::io::Reader`.
-      * extra: `Complex` number type and `complex` module.
-      * extra: `Rational` number type and `rational` module.
-      * extra: `BigInt`, `BigUint` implement numeric and comparison traits.
-      * extra: `term` uses terminfo now, is more correct.
-
-   * Tooling
-      * `unused_unsafe` lint mode for detecting unnecessary `unsafe` blocks.
-      * `unused_mut` lint mode for identifying unused `mut` qualifiers.
-      * The `rusti` command has been rewritten and a number of bugs addressed.
-      * rustc outputs in color on more terminals.
-      * rustc accepts a `--link-args` flag to pass arguments to the linker.
-      * rustc accepts a `-Z print-link-args` flag for debugging linkage.
-      * Compiling with `-g` will make the binary record information about
-        dynamic borrowcheck failures for debugging.
-      * rustdoc has a nicer stylesheet.
-      * Various improvements to rustdoc.
-
-   * Other
-      * More and improved library documentation.
-      * Various improvements on ARM and Android.
-      * Various improvements to MIPS backend.
-      * jemalloc is the Rust allocator.
+      * New `core::iterator` module for external iterator objects
 
 Version 0.6 (April 2013)
 ------------------------

branches/snap-stage3/RELEASES.txt

@@ -138,7 +138,7 @@ validate_opt () {
         done
         if [ "$arg" = "--help" ]
         then
-            echo
+            echo ""
             echo "No more help available for Configure options,"
             echo "check the Uncyclo or join our IRC channel"
             break
@@ -349,11 +349,11 @@ if [ "$1" = "--help" ]
 then
     HELP=1
     shift
-    echo
+    echo ""
     echo "Usage: $CFG_SELF [options]"
-    echo
+    echo ""
     echo "Options:"
-    echo
+    echo ""
 else
     msg "recreating config.tmp"
     echo '' >config.tmp
@@ -394,7 +394,7 @@ validate_opt
 
 if [ $HELP -eq 1 ]
 then
-    echo
+    echo ""
     exit 0
 fi
 
@@ -561,7 +561,7 @@ then
                       | cut -d ' ' -f 2)
 
     case $CFG_CLANG_VERSION in
-        (3.0svn | 3.0 | 3.1* | 3.2* | 3.3* | 3.4* )
+        (3.0svn | 3.0 | 3.1* | 3.2* | 3.3*)
         step_msg "found ok version of CLANG: $CFG_CLANG_VERSION"
         CFG_C_COMPILER="clang"
         ;;
@@ -683,8 +683,7 @@ do
     for i in                                          \
       isaac linenoise sync test \
       arch/i386 arch/x86_64 arch/arm arch/mips  \
-      libuv libuv/src/ares libuv/src/eio libuv/src/ev \
-      jemalloc
+      libuv libuv/src/ares libuv/src/eio libuv/src/ev
     do
       make_dir rt/$t/stage$s/$i
     done
@@ -971,13 +970,6 @@ then
     putvar CFG_CCACHE_CPP2
 fi
 
-if [ ! -z "$CFG_ENABLE_CCACHE" ]
-then
-    CFG_CCACHE_BASEDIR=${CFG_SRC_DIR}
-    putvar CFG_CCACHE_BASEDIR
-fi
-
-
 if [ ! -z $BAD_PANDOC ]
 then
     CFG_PANDOC=