Skip to content

Commit 03c2190

Browse files
committed
---
yaml --- r: 184047 b: refs/heads/auto c: cc61f9c h: refs/heads/master i: 184045: a717055 184043: 9e0a3d9 184039: d5faa01 184031: f21deee v: v3
1 parent 731c733 commit 03c2190

File tree

4 files changed

+2
-4
lines changed

4 files changed

+2
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: f5491e63b4a4389aded637b872b7e02180b9585b
13+
refs/heads/auto: cc61f9c1d5baa29209b29a51cb9c553dcb2fb725
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libstd/path.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ mod platform {
143143
use super::Prefix;
144144
use core::prelude::*;
145145
use ffi::OsStr;
146-
use std::marker::PhantomData;
147146

148147
#[inline]
149148
pub fn is_sep_byte(b: u8) -> bool {

branches/auto/src/libstd/thread.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ use any::Any;
153153
use cell::UnsafeCell;
154154
use fmt;
155155
use io;
156-
use marker::{PhantomData, Send, Sync};
156+
use marker::PhantomData;
157157
use old_io::stdio;
158158
use rt::{self, unwind};
159159
use sync::{Mutex, Condvar, Arc};

branches/auto/src/libterm/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
html_playground_url = "http://play.rust-lang.org/")]
5151
#![deny(missing_docs)]
5252

53-
#![feature(core)]
5453
#![feature(box_syntax)]
5554
#![feature(collections)]
5655
#![feature(int_uint)]

0 commit comments

Comments
 (0)