Merge remote-tracking branch 'upstream/io' into io

Conflicts:
	src/libstd/rt/uvio.rs

Author: Eric Reed

.gitattributes

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

.mailmap

@@ -0,0 +1,12 @@
+#
+# This list is used by git-shortlog to aggregate contributions.  It is
+# necessary when either the author's full name is not always written
+# the same way, and/or the same author contributes from different
+# email addresses.
+#
+
+Elly Jones <[email protected]>
+ILyoan <[email protected]>
+Junyoung Cho <[email protected]>
+Matthijs Hofstra <[email protected]>
+Rob Arnold <[email protected]>

CONTRIBUTING.md

@@ -1,27 +1,38 @@
 ## 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 `master` branch.
+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.
-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!
+1. [Rebase](http://git-scm.com/book/en/Git-Branching-Rebasing) your
+   local changes against the `master` branch. Resolve any conflicts
+   that arise.
 
-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.
+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!
 
-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.
+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.
 
-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:
+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:
 
 ```
 // 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).

Makefile.in

@@ -146,8 +146,7 @@ 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) log -1 \
-                     --pretty=format:'%H')
+    CFG_VER_HASH = $(shell git --git-dir=$(CFG_GIT_DIR) rev-parse HEAD)
 endif
 endif
 

RELEASES.txt

@@ -3,12 +3,37 @@ Version 0.7 (July 2013)
 
    * ??? changes, numerous bugfixes
 
+   * Syntax changes
+      * `#[deriving(Encodable)]`, `#[deriving(Decodable)]`
+
    * Semantic changes
-      * The `self` parameter no longer implicitly means `&'self self`, and can be explicitly marked
-        with a lifetime.
+      * 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.
 
    * Libraries
-      * New `core::iterator` module for external iterator objects
+
+      **Note: in 0.7 `core` was renamed `std` and `std` to `extra.
+        These notes use the new crate names.**
+
+      * The `core` crate was renamed to `std`.
+      * The `std` crate was renamed to `extra`.
+      * `std::mut` removed.
+      * std: `iterator` module for external iterator objects.
+      * 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`, TODO. In the future methods will also work as functions.
+      * 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.
+
+   * Other
+      * `unused_unsafe` lint mode for detecting unnecessary `unsafe` blocks.
+      * More and improved library documentation.
+      * The `rusti` command has been rewritten and a number of bugs addressed.
 
 Version 0.6 (April 2013)
 ------------------------

configure

@@ -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.0svn | 3.0 | 3.1* | 3.2* | 3.3* | 3.4* )
         step_msg "found ok version of CLANG: $CFG_CLANG_VERSION"
         CFG_C_COMPILER="clang"
         ;;
@@ -683,7 +683,8 @@ 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
+      libuv libuv/src/ares libuv/src/eio libuv/src/ev \
+      jemalloc
     do
       make_dir rt/$t/stage$s/$i
     done
@@ -970,6 +971,13 @@ 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=

doc/rust.css

@@ -1,39 +1,81 @@
 body {
-  padding: 1em;
-  margin: 0;
-  margin-bottom: 4em;
-  font-family: "Helvetica Neue", Helvetica, sans-serif;
-  background-color: white;
-  color: black;
-  line-height: 1.6em;
-}
-
-body {
-  padding: 1em 6em;
-  max-width: 60em;
+    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;
 }
 
 h1 {
-  font-size: 20pt;
-  margin-top: 2em;
-  border-bottom: 1px solid silver;
-  line-height: 1.6em;
+    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);
 }
+
 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: 1.1em 0;
-  padding: .4em .4em .4em 2em;
-  font-size: 120%;
+    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;
 }
 
 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,
@@ -106,4 +148,12 @@ 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;
+}