Skip to content

Commit 57bdf46

Browse files
committed
---
yaml --- r: 58812 b: refs/heads/incoming c: 18bf9bd h: refs/heads/master v: v3
1 parent c479411 commit 57bdf46

File tree

6 files changed

+4
-11
lines changed

6 files changed

+4
-11
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: c50a9d5b664478e533ba1d1d353213d70c8ad589
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/incoming: 5fb5a94118399e50c50f25586266c317ee5ba69b
9+
refs/heads/incoming: 18bf9bd55aa87d3da19e343241d1171414e2fc92
1010
refs/heads/dist-snap: 00dbbd01c2aee72982b3e0f9511ae1d4428c3ba9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libstd/arena.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
// to waste time running the destructors of POD.
3434

3535
use list::{MutList, MutCons, MutNil};
36-
use list;
3736

3837
use core::at_vec;
3938
use core::cast::{transmute, transmute_mut_region};
@@ -79,7 +78,7 @@ struct Chunk {
7978
}
8079

8180
pub struct Arena {
82-
// The head is seperated out from the list as a unbenchmarked
81+
// The head is separated out from the list as a unbenchmarked
8382
// microoptimization, to avoid needing to case on the list to
8483
// access the head.
8584
priv head: Chunk,

branches/incoming/src/libstd/future.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
use core::cast;
2525
use core::cell::Cell;
26-
use core::comm::{ChanOne, PortOne, oneshot, send_one};
26+
use core::comm::{PortOne, oneshot, send_one};
2727
use core::pipes::recv;
2828
use core::task;
2929

branches/incoming/src/libstd/net_tcp.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
//! High-level interface to libuv's TCP functionality
1212
// FIXME #4425: Need FFI fixes
1313

14-
#[allow(deprecated_mode)];
15-
1614
use future;
1715
use future_spawn = future::spawn;
1816
use ip = net_ip;

branches/incoming/src/libstd/net_url.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010

1111
//! Types/fns concerning URLs (see RFC 3986)
1212
13-
#[allow(deprecated_mode)];
14-
1513
use core::cmp::Eq;
1614
use core::io::{Reader, ReaderUtil};
1715
use core::io;

branches/incoming/src/libstd/workcache.rs

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

11-
#[allow(deprecated_mode)];
12-
1311
use json;
1412
use sha1;
1513
use serialize::{Encoder, Encodable, Decoder, Decodable};
1614
use sort;
1715

1816
use core::cell::Cell;
1917
use core::cmp;
20-
use core::comm::{ChanOne, PortOne, oneshot, send_one};
18+
use core::comm::{PortOne, oneshot, send_one};
2119
use core::either::{Either, Left, Right};
2220
use core::hashmap::HashMap;
2321
use core::io;

0 commit comments

Comments
 (0)