---

yaml
---
r: 49110
b: refs/heads/snap-stage3
c: f7f6013
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 3bbcac322669cff3abde5be937cc4ec3860f3985
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: b0d1643fa6de6526368f9ebae62c29fb4680e574
+refs/heads/snap-stage3: f7f6013a625cefcf914ed890c297a87dacf7bb91
 refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/configure

@@ -308,8 +308,6 @@ case $CFG_OSTYPE in
 esac
 
 
-if [ -z "$CFG_CPUTYPE" ]
-then
 case $CFG_CPUTYPE in
 
     i386 | i486 | i686 | i786 | x86)
@@ -327,7 +325,6 @@ case $CFG_CPUTYPE in
     *)
         err "unknown CPU type: $CFG_CPUTYPE"
 esac
-fi
 
 # 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 ]

branches/snap-stage3/src/libcore/hashmap.rs

@@ -8,7 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//! Sendable hash maps.
+//! An unordered map and set type implemented as hash tables
+//!
+//! The tables use a keyed hash with new random keys generated for each container, so the ordering
+//! of a set of keys in a hash table is randomized.
 
 /// Open addressing with linear probing.
 pub mod linear {

branches/snap-stage3/src/libcore/ops.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// Core operators
+//! Traits for the built-in operators
 
 #[lang="drop"]
 pub trait Drop {

branches/snap-stage3/src/libcore/stackwalk.rs

@@ -80,7 +80,7 @@ fn breakpoint() {
     }
 }
 
-fn frame_address(f: &fn(x: *u8)) {
+fn frame_address(f: &fn(++x: *u8)) {
     unsafe {
         rusti::frame_address(f)
     }
@@ -95,7 +95,7 @@ pub mod rustrt {
 pub mod rusti {
     #[abi = "rust-intrinsic"]
     pub extern {
-        pub fn frame_address(f: &once fn(x: *u8));
+        pub fn frame_address(f: &once fn(++x: *u8));
     }
 }
 

branches/snap-stage3/src/libstd/base64.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+//! Base64 binary-to-text encoding
+
 use core::iter;
 use core::str;
 use core::vec;

branches/snap-stage3/src/libstd/ebml.rs

@@ -61,6 +61,7 @@ pub mod reader {
 
     use core::int;
     use core::io;
+    use core::ops;
     use core::prelude::*;
     use core::str;
     use core::vec;

branches/snap-stage3/src/libstd/net_tcp.rs

@@ -1281,7 +1281,7 @@ impl ToTcpErr for uv::ll::uv_err_data {
 
 extern fn on_tcp_read_cb(stream: *uv::ll::uv_stream_t,
                     nread: libc::ssize_t,
-                    buf: uv::ll::uv_buf_t) {
+                    ++buf: uv::ll::uv_buf_t) {
     unsafe {
         debug!("entering on_tcp_read_cb stream: %? nread: %?",
                         stream, nread);