Skip to content

Commit 800aae5

Browse files
committed
---
yaml --- r: 50319 b: refs/heads/auto c: f7f6013 h: refs/heads/master i: 50317: daa6e14 50315: c3f8cff 50311: 7aa3c48 50303: f7cf71a v: v3
1 parent 1cb0ba1 commit 800aae5

File tree

8 files changed

+12
-9
lines changed

8 files changed

+12
-9
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: b0d1643fa6de6526368f9ebae62c29fb4680e574
17+
refs/heads/auto: f7f6013a625cefcf914ed890c297a87dacf7bb91
1818
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167

branches/auto/configure

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -308,8 +308,6 @@ case $CFG_OSTYPE in
308308
esac
309309

310310

311-
if [ -z "$CFG_CPUTYPE" ]
312-
then
313311
case $CFG_CPUTYPE in
314312

315313
i386 | i486 | i686 | i786 | x86)
@@ -327,7 +325,6 @@ case $CFG_CPUTYPE in
327325
*)
328326
err "unknown CPU type: $CFG_CPUTYPE"
329327
esac
330-
fi
331328

332329
# Detect 64 bit linux systems with 32 bit userland and force 32 bit compilation
333330
if [ $CFG_OSTYPE = unknown-linux-gnu -a $CFG_CPUTYPE = x86_64 ]

branches/auto/src/libcore/hashmap.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
//! Sendable hash maps.
11+
//! An unordered map and set type implemented as hash tables
12+
//!
13+
//! The tables use a keyed hash with new random keys generated for each container, so the ordering
14+
//! of a set of keys in a hash table is randomized.
1215
1316
/// Open addressing with linear probing.
1417
pub mod linear {

branches/auto/src/libcore/ops.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// Core operators
11+
//! Traits for the built-in operators
1212
1313
#[lang="drop"]
1414
pub trait Drop {

branches/auto/src/libcore/stackwalk.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ fn breakpoint() {
8080
}
8181
}
8282

83-
fn frame_address(f: &fn(x: *u8)) {
83+
fn frame_address(f: &fn(++x: *u8)) {
8484
unsafe {
8585
rusti::frame_address(f)
8686
}
@@ -95,7 +95,7 @@ pub mod rustrt {
9595
pub mod rusti {
9696
#[abi = "rust-intrinsic"]
9797
pub extern {
98-
pub fn frame_address(f: &once fn(x: *u8));
98+
pub fn frame_address(f: &once fn(++x: *u8));
9999
}
100100
}
101101

branches/auto/src/libstd/base64.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
//! Base64 binary-to-text encoding
12+
1113
use core::iter;
1214
use core::str;
1315
use core::vec;

branches/auto/src/libstd/ebml.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ pub mod reader {
6161

6262
use core::int;
6363
use core::io;
64+
use core::ops;
6465
use core::prelude::*;
6566
use core::str;
6667
use core::vec;

branches/auto/src/libstd/net_tcp.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1281,7 +1281,7 @@ impl ToTcpErr for uv::ll::uv_err_data {
12811281

12821282
extern fn on_tcp_read_cb(stream: *uv::ll::uv_stream_t,
12831283
nread: libc::ssize_t,
1284-
buf: uv::ll::uv_buf_t) {
1284+
++buf: uv::ll::uv_buf_t) {
12851285
unsafe {
12861286
debug!("entering on_tcp_read_cb stream: %? nread: %?",
12871287
stream, nread);

0 commit comments

Comments
 (0)