---

yaml
---
r: 36057
b: refs/heads/try2
c: 9aec7a3
h: refs/heads/master
i:
  36055: 38b49f2
v: v3

Author: 14427

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 9ee5fff4f16cfc3390bd69abbb46b0a68521667c
+refs/heads/try2: 9aec7a3e85c5b07923eab05d3ebe9d031bf258f3
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/AUTHORS.txt

@@ -41,7 +41,6 @@ Erick Tryzelaar <[email protected]>
 Erik Rose <[email protected]>
 Evan McClanahan <[email protected]>
 Francisco Souza <[email protected]>
-Gabriel <[email protected]>
 Gareth Daniel Smith <[email protected]>
 Glenn Willen <[email protected]>
 Gonçalo Cabrita <[email protected]>
@@ -50,7 +49,6 @@ Grahame Bowland <[email protected]>
 Haitao Li <[email protected]>
 Ian D. Bollinger <[email protected]>
 Ivano Coppola <[email protected]>
-Jacob Harris Cryer Kragh <[email protected]>
 Jacob Parker <[email protected]>
 Jason Orendorff <[email protected]>
 Jed Davis <[email protected]>
@@ -73,9 +71,7 @@ Kevin Cantu <[email protected]>
 Lennart Kudling
 Lindsey Kuper <[email protected]>
 Luca Bruno <[email protected]>
-Luqman Aden <[email protected]>
 Magnus Auvinen <[email protected]>
-Mahmut Bulut <[email protected]>
 Margaret Meyerhofer <[email protected]>
 Marijn Haverbeke <[email protected]>
 Matt Brubeck <[email protected]>

branches/try2/Makefile.in

@@ -132,7 +132,7 @@ LIBSYNTAX_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,syntax)
 
 # version-string calculation
 CFG_GIT_DIR := $(CFG_SRC_DIR).git
-CFG_RELEASE = 0.5
+CFG_RELEASE = 0.4
 CFG_VERSION = $(CFG_RELEASE)
 
 ifneq ($(wildcard $(CFG_GIT)),)
@@ -144,9 +144,8 @@ ifneq ($(wildcard $(CFG_GIT_DIR)),)
 endif
 endif
 
-ifdef CFG_ENABLE_VALGRIND
-  $(info cfg: enabling valgrind (CFG_ENABLE_VALGRIND))
-else
+ifdef CFG_DISABLE_VALGRIND
+  $(info cfg: disabling valgrind (CFG_DISABLE_VALGRIND))
   CFG_VALGRIND :=
 endif
 ifdef CFG_BAD_VALGRIND

branches/try2/README.md

@@ -6,61 +6,52 @@ documentation.
 
 ## Installation
 
-The Rust compiler currently must be built from a [tarball], unless you
-are on Windows, in which case using the [installer][win-exe] is
-recommended.
+The Rust compiler is slightly unusual in that it is written in Rust and
+therefore must be built by a precompiled "snapshot" version of itself (made in
+an earlier state of development). As such, source builds require that:
 
-Since the Rust compiler is written in Rust, it must be built by
-a precompiled "snapshot" version of itself (made in an earlier state
-of development). As such, source builds require a connection to
-the Internet, to fetch snapshots, and an OS that can execute the
-available snapshot binaries.
+* You are connected to the internet, to fetch snapshots.
 
-Snapshot binaries are currently built and tested on several platforms:
+* You can at least execute snapshot binaries of one of the forms we offer
+  them in. Currently we build and test snapshots on:
 
-* Windows (7, Server 2008 R2), x86 only
-* Linux (various distributions), x86 and x86-64
-* OSX 10.6 ("Snow Leopard") or greater, x86 and x86-64
+  * Windows (7, server 2008 r2) x86 only
+  * Linux 2.6.x (various distributions) x86 and x86-64
+  * OSX 10.6 ("Snow Leopard") or 10.7 ("Lion") x86 and x86-64
 
-You may find that other platforms work, but these are our "tier 1"
-supported build environments that are most likely to work.
+You may find other platforms work, but these are our "tier 1" supported build
+environments that are most likely to work. Further platforms will be added to
+the list in the future via cross-compilation.
 
-> ***Note:*** Windows users should read the detailed
-> [getting started][wiki-start] notes on the wiki. Even when using
-> the binary installer the Windows build requires a MinGW installation,
-> the precise details of which are not discussed here.
-
-To build from source you will also need the following prerequisite
-packages:
+To build from source you will also need the following prerequisite packages:
 
 * g++ 4.4 or clang++ 3.x
-* python 2.6 or later (but not 3.x)
+* python 2.6 or later
 * perl 5.0 or later
 * gnu make 3.81 or later
 * curl
 
-Assuming you're on a relatively modern *nix system and have met the
-prerequisites, something along these lines should work.
+Assuming you're on a relatively modern Linux/OSX system and have met the
+prerequisites, something along these lines should work:
 
-    $ wget http://dl.rust-lang.org/dist/rust-0.4.tar.gz
     $ tar -xzf rust-0.4.tar.gz
     $ cd rust-0.4
     $ ./configure
     $ make && make install
 
-You may need to use `sudo make install` if you do not normally have
-permission to modify the destination directory. The install locations
-can be adjusted by passing a `--prefix` argument to
-`configure`. Various other options are also supported, pass `--help`
-for more information on them.
+When complete, make install will place the following programs into
+/usr/local/bin:
+
+* rustc, the Rust compiler
+* rustdoc, the API-documentation tool
+* cargo, the Rust package manager
 
-When complete, `make install` will place several programs into
-`/usr/local/bin`: `rustc`, the Rust compiler; `rustdoc`, the
-API-documentation tool, and `cargo`, the Rust package manager.
+In addition to a manual page under /usr/local/share/man and a set of host and
+target libraries under /usr/local/lib/rustc.
 
-[wiki-start]: https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust
-[tarball]: http://dl.rust-lang.org/dist/rust-0.4.tar.gz
-[win-exe]: http://dl.rust-lang.org/dist/rust-0.4-install.exe
+The install locations can be adjusted by passing a --prefix argument to
+configure. Various other options are also supported, pass --help for more
+information on them.
 
 
 ## License

branches/try2/RELEASES.txt

@@ -1,7 +1,7 @@
 Version 0.4 (October 2012)
 --------------------------
 
-   * ~2000 changes, numerous bugfixes
+   * ~1500 changes, numerous bugfixes
 
    * Syntax
       * All keywords are now strict and may not be used as identifiers anywhere

branches/try2/configure

@@ -187,7 +187,6 @@ need_cmd cmp
 need_cmd mkdir
 need_cmd printf
 need_cmd cut
-need_cmd head
 need_cmd grep
 need_cmd xargs
 need_cmd cp
@@ -258,16 +257,6 @@ case $CFG_CPUTYPE in
         err "unknown CPU type: $CFG_CPUTYPE"
 esac
 
-# Detect 64 bit linux systems with 32 bit userland and force 32 bit compilation
-if [ $CFG_OSTYPE = unknown-linux-gnu -a $CFG_CPUTYPE = x86_64 ]
-then
-    file -L "$SHELL" | grep -q "x86[_-]64"
-    if [ $? != 0 ]; then
-        CFG_CPUTYPE=i686
-    fi
-fi
-
-
 DEFAULT_HOST_TRIPLE="${CFG_CPUTYPE}-${CFG_OSTYPE}"
 
 CFG_SRC_DIR="$(cd $(dirname $0) && pwd)/"
@@ -294,7 +283,7 @@ else
 fi
 
 opt sharedstd 1 "build libstd as a shared library"
-opt valgrind 0 "run tests with valgrind (memcheck by default)"
+opt valgrind 1 "run tests with valgrind (memcheck by default)"
 opt helgrind 0 "run tests with helgrind instead of memcheck"
 opt docs     1 "build documentation"
 opt optimize 1 "build optimized rust code"
@@ -363,16 +352,11 @@ fi
 
 if [ ! -z "$CFG_PANDOC" ]
 then
-    PANDOC_VER_LINE=$(pandoc --version | grep '^pandoc ')
-    PANDOC_VER=${PANDOC_VER_LINE#pandoc }
-    PV_MAJOR_MINOR=${PANDOC_VER%.[0-9]*}
-    PV_MAJOR=${PV_MAJOR_MINOR%%[.][0-9]*}
-    PV_MINOR=${PV_MAJOR_MINOR#[0-9]*[.]}
-    PV_MINOR=${PV_MINOR%%[.][0-9]*}
-    if [ "$PV_MAJOR" -lt "1" ] || [ "$PV_MINOR" -lt "8" ]
+    PV=$(pandoc --version | awk '/^pandoc/ {print $2}')
+    if [ "$PV" \< "1.8" ]
     then
-		step_msg "pandoc $PV_MAJOR.$PV_MINOR is too old. disabling"
-		BAD_PANDOC=1
+	step_msg "pandoc $PV is too old. disabling"
+	BAD_PANDOC=1
     fi
 fi
 
@@ -595,7 +579,7 @@ then
     need_ok "git failed"
 
     msg "git: submodule foreach sync"
-    "${CFG_GIT}" submodule --quiet foreach --recursive 'if test -e .gitmodules; then git submodule sync; fi'
+    "${CFG_GIT}" submodule --quiet foreach --recursive git submodule sync
     need_ok "git failed"
 
     msg "git: submodule foreach update"

branches/try2/doc/lib/codemirror-rust.js

@@ -9,7 +9,7 @@ CodeMirror.defineMode("rust", function() {
     "as": "op", "true": "atom", "false": "atom", "assert": "op", "check": "op",
     "claim": "op", "extern": "ignore", "unsafe": "ignore", "import": "else-style",
     "export": "else-style", "copy": "op", "log": "op",
-    "use": "op", "self": "atom", "pub": "atom", "priv": "atom"
+    "use": "op", "self": "atom"
   };
   var typeKeywords = function() {
     var keywords = {"fn": "fn"};