Skip to content

Commit 00aba5a

Browse files
committed
---
yaml --- r: 187199 b: refs/heads/try c: ee6f2a1 h: refs/heads/master i: 187197: 369f0c1 187195: 38ce05c 187191: c945159 187183: 621d9a2 187167: 20860d3 187135: f080bbf v: v3
1 parent ba911ac commit 00aba5a

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
@@ -2,7 +2,7 @@
22
refs/heads/master: b4c965ee803a4521d8b4575f634e036f93e408f3
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 3a96d6a9818fe2affc98a187fb1065120458cee9
5-
refs/heads/try: 1beaebbaa69be535d00592e2ac37af4dcba427d9
5+
refs/heads/try: ee6f2a1ad6ab79ed954cd96fff6eaddcdfb6a043
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

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