---

yaml
---
r: 127667
b: refs/heads/snap-stage3
c: 14e245b
h: refs/heads/master
i:
  127665: 48b285d
  127663: 6a2702e
v: v3

Author: LemmingAvalanche

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 49a970f2449a78f28b6c301e542d38593094ca77
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: c4a63fabe345967e7d6b4570752ea081cae21785
+refs/heads/snap-stage3: 14e245bd47d3ac1a981d50a6f752aa27cca7d85e
 refs/heads/try: d9c23fcbaea89871667272a67ecb8d3a512162f3
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/.gitattributes

@@ -8,4 +8,3 @@ src/etc/pkg/rust-logo.ico binary
 src/etc/pkg/rust-logo.png binary
 src/rt/msvc/* -whitespace
 src/rt/valgrind/* -whitespace
-*.woff binary

branches/snap-stage3/.gitignore

@@ -1,94 +1,90 @@
-*.a
-*.aux
-*.bc
+*~
+\#*\#
+\#*
+.#*
+*.x86
+*.llvm
+*.out
 *.boot
-*.bz2
-*.cmi
-*.cmo
+*.rustc
 *.cmx
-*.cp
-*.cps
-*.d
-*.dSYM
-*.def
-*.diff
 *.dll
-*.dylib
-*.elc
-*.epub
+*.def
 *.exe
+*.a
+*.rlib
+*.so
+*.dylib
+*.orig
+*.cmo
+*.cmi
+*.dSYM
+*.d
+*.o
+*.ll
+*.bc
+*.aux
+*.cp
 *.fn
-*.html
 *.ky
-*.ll
-*.llvm
+*.cps
 *.log
-*.o
-*.orig
-*.out
-*.patch
 *.pdf
+*.epub
+*.html
 *.pg
-*.pot
-*.pyc
-*.rej
-*.rlib
-*.rustc
-*.so
-*.swo
-*.swp
-*.tmp
 *.toc
 *.tp
 *.vr
-*.x86
-*~
-.#*
-.DS_Store
-.cproject
+*.patch
+*.diff
+*.rej
+*.swp
+*.swo
+*.tmp
+*.pyc
+*.elc
 .hg/
 .hgignore
+.cproject
 .project
-.settings/
 .valgrindrc
-/*-*-*-*/
-/*-*-*/
+lexer.ml
+TAGS
+TAGS.emacs
+TAGS.vi
+version.ml
+version.texi
 /Makefile
-/build
-/dist/
-/dl/
-/doc
-/inst/
-/llvm/
-/mingw-build/
-/nd/
+config.mk
 /rt/
 /rustllvm/
-/src/libunicode/DerivedCoreProperties.txt
-/src/libunicode/EastAsianWidth.txt
-/src/libunicode/HangulSyllableType.txt
-/src/libunicode/PropList.txt
-/src/libunicode/Scripts.txt
-/src/libunicode/UnicodeData.txt
+/test/
+/inst/
+/mingw-build/
+src/.DS_Store
+/tmp/
+/dist/
 /stage0/
+/dl/
 /stage1/
 /stage2/
 /stage3/
-/test/
-/tmp/
-TAGS
-TAGS.emacs
-TAGS.vi
-\#*
-\#*\#
-config.mk
-config.stamp
+*.bz2
+/doc
+/nd/
+/llvm/
+version.md
 keywords.md
-lexer.ml
-src/.DS_Store
-src/etc/dl
-src/librustc_llvm/llvmdeps.rs
+x86_64-apple-darwin/
+x86_64-unknown-linux-gnu/
+i686-unknown-linux-gnu/
 tmp.*.rs
-version.md
-version.ml
-version.texi
+config.stamp
+.DS_Store
+src/etc/dl
+.settings/
+/build
+i686-pc-mingw32/
+src/librustc/lib/llvmdeps.rs
+*.pot

branches/snap-stage3/CONTRIBUTING.md

@@ -16,8 +16,7 @@ please do two things:
 
 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! Although for simple
-   wording or grammar fixes, this is probably unnecessary.
+   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

branches/snap-stage3/Makefile.in

@@ -216,7 +216,6 @@ ifneq ($(strip $(findstring check,$(MAKECMDGOALS)) \
                $(findstring tidy,$(MAKECMDGOALS))),)
   CFG_INFO := $(info cfg: including test rules)
   include $(CFG_SRC_DIR)mk/tests.mk
-  include $(CFG_SRC_DIR)mk/grammar.mk
 endif
 
 # Performance and benchmarking

branches/snap-stage3/RELEASES.txt

@@ -306,7 +306,7 @@ Version 0.9 (January 2014)
       * A new facility for enabling experimental features (feature gating) has
         been added, using the crate-level `#[feature(foo)]` attribute.
       * Managed boxes (@) are now behind a feature gate
-        (`#[feature(managed_boxes)]`) in preparation for future removal. Use the
+        (`#[feature(managed_boxes)]`) in preperation for future removal. Use the
         standard library's `Gc` or `Rc` types instead.
       * `@mut` has been removed. Use `std::cell::{Cell, RefCell}` instead.
       * Jumping back to the top of a loop is now done with `continue` instead of
@@ -398,7 +398,7 @@ Version 0.9 (January 2014)
       * std: `fmt::Default` can be implemented for any type to provide default
         formatting to the `format!` macro, as in `format!("{}", myfoo)`.
       * std: The `rand` API continues to be tweaked.
-      * std: The `rust_begin_unwind` function, useful for inserting breakpoints
+      * std: The `rust_begin_unwind` function, useful for insterting breakpoints
         on failure in gdb, is now named `rust_fail`.
       * std: The `each_key` and `each_value` methods on `HashMap` have been
         replaced by the `keys` and `values` iterators.
@@ -429,7 +429,7 @@ Version 0.9 (January 2014)
         extensible interfaces and is now implemented by two different crates:
         libnative, for native threading and I/O; and libgreen, for green threading
         and I/O. This paves the way for using the standard library in more limited
-        embedded environments.
+        embeded environments.
       * std: The `comm` module has been rewritten to be much faster, have a
         simpler, more consistent API, and to work for both native and green
         threading.

branches/snap-stage3/configure

@@ -291,10 +291,6 @@ case $CFG_OSTYPE in
         CFG_OSTYPE=unknown-freebsd
         ;;
 
-    DragonFly)
-        CFG_OSTYPE=unknown-dragonfly
-        ;;
-
     Darwin)
         CFG_OSTYPE=apple-darwin
         ;;
@@ -422,12 +418,10 @@ opt ccache 0 "invoke gcc/clang via ccache to reuse object files between builds"
 opt local-rust 0 "use an installed rustc rather than downloading a snapshot"
 opt inject-std-version 1 "inject the current compiler version of libstd into programs"
 opt llvm-static-stdcpp 0 "statically link to libstdc++ for LLVM"
-opt rpath 0 "build rpaths into rustc itself"
+opt rpath 1 "build rpaths into rustc itself"
 opt nightly 0 "build nightly packages"
 opt verify-install 1 "verify installed binaries work"
 opt jemalloc 1 "build liballoc with jemalloc"
-# This is used by the automation to produce single-target nightlies
-opt dist-host-only 0 "only install bins for the host architecture"
 valopt prefix "/usr/local" "set installation prefix"
 valopt local-rust-root "/usr/local" "set prefix for local rust binary"
 valopt llvm-root "" "set LLVM root"
@@ -499,9 +493,6 @@ probe CFG_VALGRIND         valgrind
 probe CFG_PERF             perf
 probe CFG_ISCC             iscc
 probe CFG_LLNEXTGEN        LLnextgen
-probe CFG_JAVAC            javac
-probe CFG_ANTLR4           antlr4
-probe CFG_GRUN             grun
 probe CFG_PANDOC           pandoc
 probe CFG_PDFLATEX         pdflatex
 probe CFG_XELATEX          xelatex
@@ -557,21 +548,13 @@ fi
 
 if [ ! -z "$CFG_ENABLE_LOCAL_RUST" ]
 then
-    system_rustc=$(which rustc)
-    if [ -f ${CFG_LOCAL_RUST_ROOT}/bin/rustc${BIN_SUF} ]
-    then
-        : # everything already configured
-    elif [ -n "$system_rustc" ]
+    if [ ! -f ${CFG_LOCAL_RUST_ROOT}/bin/rustc${BIN_SUF} ]
     then
-        # we assume that rustc is in a /bin directory
-        CFG_LOCAL_RUST_ROOT=${system_rustc%/bin/rustc}
-    else
         err "no local rust to use"
+    else
+        LRV=`${CFG_LOCAL_RUST_ROOT}/bin/rustc${BIN_SUF} --version`
+        step_msg "using rustc at: ${CFG_LOCAL_RUST_ROOT} with version: $LRV"
     fi
-
-    LRV=`${CFG_LOCAL_RUST_ROOT}/bin/rustc${BIN_SUF} --version`
-    step_msg "using rustc at: ${CFG_LOCAL_RUST_ROOT} with version: $LRV"
-    putvar CFG_LOCAL_RUST_ROOT
 fi
 
 # Force freebsd to build with clang; gcc doesn't like us there

branches/snap-stage3/man/rustc.1

@@ -1,4 +1,4 @@
-.TH RUSTC "1" "March 2014" "rustc 0.12.0-pre" "User Commands"
+.TH RUSTC "1" "March 2014" "rustc 0.11.0" "User Commands"
 .SH NAME
 rustc \- The Rust compiler
 .SH SYNOPSIS
@@ -11,9 +11,6 @@ This program is a compiler for the Rust language, available at
 
 .SH OPTIONS
 
-.TP
-\fB\-\-crate-name NAME\fR
-Specify the name of the crate being built
 .TP
 \fB\-\-crate-type=[bin|lib|dylib|rlib|staticlib]\fR
 Configure the flavor of rust crate that is generated (default `bin`)
@@ -63,12 +60,11 @@ Parse only; do not compile, assemble, or link
 \fB\-\-pretty\fR [TYPE]
 Pretty-print the input instead of compiling; valid types are: normal
 (un-annotated source), expanded (crates expanded), typed (crates
-expanded, with type annotations), identified (fully parenthesized,
-AST nodes and blocks with IDs), or flowgraph=<nodeid> (graphviz
-formatted flowgraph for node)
+expanded, with type annotations), or identified (fully parenthesized,
+AST nodes and blocks with IDs)
 .TP
 \fB\-\-dep-info\fR [FILENAME]
-Output dependency info to <filename> after compiling, in a format suitable
+Output dependency info to <filename> after compiling, in o format suitable
 for use by Makefiles.
 .TP
 \fB\-\-sysroot\fR PATH
@@ -142,8 +138,8 @@ A space-separated list of arguments to pass through to LLVM.
 If specified, the compiler will save more files (.bc, .o, .no-opt.bc) generated
 throughout compilation in the output directory.
 .TP
-\fBrpath\fR
-If specified, then the rpath value for dynamic libraries will be set in
+\fBno-rpath\fR
+If specified, then the rpath value for dynamic libraries will not be set in
 either dynamic library or executable outputs.
 .TP
 \fBno-prepopulate-passes\fR

branches/snap-stage3/man/rustdoc.1

@@ -1,4 +1,4 @@
-.TH RUSTDOC "1" "March 2014" "rustdoc 0.12.0-pre" "User Commands"
+.TH RUSTDOC "1" "March 2014" "rustdoc 0.11.0" "User Commands"
 .SH NAME
 rustdoc \- generate documentation from Rust source code
 .SH SYNOPSIS