---

yaml
---
r: 65867
b: refs/heads/master
c: 5393e43
h: refs/heads/master
i:
  65865: 6509e63
  65863: 77c85c8
v: v3

Author: Eric Reed

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 2ef8774ac5b56ae264224d46ffa0078f5d39ce6c
+refs/heads/master: 5393e43b5355284cf24f8afcc2088473fa5a318a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

trunk/.gitattributes

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

trunk/.mailmap

@@ -1,42 +1,27 @@
 ## Pull request procedure
 
-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:
+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 `incoming` 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).

trunk/CONTRIBUTING.md

@@ -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
 

trunk/Makefile.in

@@ -138,7 +138,7 @@ validate_opt () {
         done
         if [ "$arg" = "--help" ]
         then
-            echo
+            echo ""
             echo "No more help available for Configure options,"
             echo "check the Wiki 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=

trunk/configure

@@ -1,81 +1,39 @@
 body {
-    padding: 1em 6em;
-    margin: 0;
-    margin-bottom: 4em;
-    font-family: "Helvetica Neue", Helvetica, sans-serif;
-    font-size: 12pt;
-    background-color: white;
-    color: black;
-    line-height: 1.6em;
-    min-width: 45em;
-    max-width: 60em;
+  padding: 1em;
+  margin: 0;
+  margin-bottom: 4em;
+  font-family: "Helvetica Neue", Helvetica, sans-serif;
+  background-color: white;
+  color: black;
+  line-height: 1.6em;
 }
 
-h1 {
-    font-size: 20pt;
-    margin-top: 2em;
-    padding-left: 0.4em;
-    line-height: 1.6em;
-    background-color:#FFF2CE;
-    border-radius: 0.2em;
-    border: 1px solid rgba(0, 0, 0, 0.15);
+body {
+  padding: 1em 6em;
+  max-width: 60em;
 }
 
+h1 {
+  font-size: 20pt;
+  margin-top: 2em;
+  border-bottom: 1px solid silver;
+  line-height: 1.6em;
+}
 h2 {
     font-size: 15pt;
     margin-top: 2em;
-    padding-left: 0.4em;
-    background-color:#FFF2CE;
-    border-radius: 0.4em;
-    border: 1px solid rgba(0, 0, 0, 0.15);
-}
-
-h2 code {
-    color: #097334;
-    font-size: 15pt;
-}
-
-h3 {
-    font-size: 13pt;
-    color: black;
-    background-color:#D9E7FF;
-    border-radius: 0.4em;
-    border: 1px solid rgba(0, 0, 0, 0.15);
-    padding: 0 0.4em 0 0.4em;
-}
-
-h3 code {
-    color: #541800;
-    font-size: 13pt;
-    font-style: italic;
-}
-
-h4 {
-    font-size: 11pt;
-    margin-top: 0em;
-    margin-bottom: 0em;
-}
-
-code {
-    font-size: 11pt;
 }
+h3 { font-size: 13pt; }
 
 pre {
-    margin-left: 1.1em;
-    padding: .4em .4em .4em .8em;
-    font-size: 10pt;
-    background-color: #F5F5F5;
-    border-radius: 0.5em;
-    border: 1px solid rgba(0, 0, 0, 0.15);
-}
-
-pre.rust {
-    background-color: #F3F6FF;
+  margin: 1.1em 0;
+  padding: .4em .4em .4em 2em;
+  font-size: 120%;
 }
 
 a, a:visited, a:link {
-    text-decoration: none;
-    color: rgb(0, 105, 214);
+  text-decoration: none;
+  color: rgb(0, 105, 214);
 }
 
 h1 a:link, h1 a:visited, h2 a:link, h2 a:visited,
@@ -148,12 +106,4 @@ td {
 /* Adjust list alignment so rustdoc indexes don't align with blockquotes */
 div.index ul {
     padding-left: 1em;
-}
-
-ul {
-    margin-top: 0em
-}
-
-div.section.level3  {
-    margin-left: 1.0em;
-}
+}