Skip to content

Commit 33f8e1e

Browse files
committed
---
yaml --- r: 187621 b: refs/heads/tmp c: ee6f2a1 h: refs/heads/master i: 187619: 75a84c6 v: v3
1 parent f531c1f commit 33f8e1e

File tree

5 files changed

+3
-4
lines changed

5 files changed

+3
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
3434
refs/heads/beta: 522d09dfecbeca1595f25ac58c6d0178bbd21d7d
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3636
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
37-
refs/heads/tmp: 1beaebbaa69be535d00592e2ac37af4dcba427d9
37+
refs/heads/tmp: ee6f2a1ad6ab79ed954cd96fff6eaddcdfb6a043
3838
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/tmp/src/libstd/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@
122122
#![feature(unsafe_destructor)]
123123
#![feature(unsafe_no_drop_flag)]
124124
#![feature(macro_reexport)]
125+
#![feature(hash)]
125126
#![cfg_attr(test, feature(test, rustc_private, env))]
126127

127128
// Don't link to std. We are std.

branches/tmp/src/libstd/sys/windows/thread.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ use prelude::v1::*;
1313
use boxed;
1414
use cmp;
1515
use io;
16-
use mem;
1716
use ptr;
1817
use libc;
1918
use libc::types::os::arch::extra::{LPSECURITY_ATTRIBUTES, SIZE_T, BOOL,

branches/tmp/src/libstd/sys/windows/thread_local.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ use prelude::v1::*;
1313
use libc::types::os::arch::extra::{DWORD, LPVOID, BOOL};
1414

1515
use boxed;
16-
use mem;
1716
use ptr;
1817
use rt;
1918
use sys_common::mutex::{MUTEX_INIT, Mutex};

branches/tmp/src/libstd/thread_local/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,6 @@ impl<T: 'static> Key<T> {
330330
mod imp {
331331
use prelude::v1::*;
332332

333-
use alloc::boxed;
334333
use cell::UnsafeCell;
335334
use intrinsics;
336335
use ptr;
@@ -389,6 +388,7 @@ mod imp {
389388
// Due to rust-lang/rust#18804, make sure this is not generic!
390389
#[cfg(target_os = "linux")]
391390
unsafe fn register_dtor(t: *mut u8, dtor: unsafe extern fn(*mut u8)) {
391+
use boxed;
392392
use mem;
393393
use libc;
394394
use sys_common::thread_local as os;

0 commit comments

Comments
 (0)