Skip to content

Commit 0cf1831

Browse files
committed
---
yaml --- r: 184179 b: refs/heads/beta c: cc61f9c h: refs/heads/master i: 184177: 3b19262 184175: fc0e7d7 v: v3
1 parent b23d9b1 commit 0cf1831

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
@@ -31,7 +31,7 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
3131
refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
3232
refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
3333
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
34-
refs/heads/beta: f5491e63b4a4389aded637b872b7e02180b9585b
34+
refs/heads/beta: cc61f9c1d5baa29209b29a51cb9c553dcb2fb725
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3636
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
3737
refs/heads/tmp: c65fb1a81e5dc58cf171cc47f65de9e6e2119247

branches/beta/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/beta/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/beta/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)