Skip to content

Commit 4ffde08

Browse files
committed
Test fixes and rebase conflicts
1 parent 9c999c7 commit 4ffde08

File tree

11 files changed

+7
-42
lines changed

11 files changed

+7
-42
lines changed

src/liballoc/heap.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ mod imp {
280280
if align <= MIN_ALIGN {
281281
libc::malloc(size as libc::size_t) as *mut u8
282282
} else {
283-
let mut out = ptr::null();
283+
let mut out = ptr::null_mut();
284284
let ret = posix_memalign(&mut out,
285285
align as libc::size_t,
286286
size as libc::size_t);

src/libcore/any.rs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ use mem::transmute;
7575
use option::Option::{self, Some, None};
7676
use raw::TraitObject;
7777
use intrinsics;
78-
#[cfg(not(stage0))] use marker::Sized;
78+
use marker::Sized;
7979

8080
///////////////////////////////////////////////////////////////////////////////
8181
// Any trait
@@ -175,17 +175,10 @@ pub struct TypeId {
175175
impl TypeId {
176176
/// Returns the `TypeId` of the type this generic function has been
177177
/// instantiated with
178-
#[cfg(not(stage0))]
179178
#[unstable = "may grow a `Reflect` bound soon via marker traits"]
180179
pub fn of<T: ?Sized + 'static>() -> TypeId {
181180
TypeId {
182181
t: unsafe { intrinsics::type_id::<T>() },
183182
}
184183
}
185-
186-
/// dox
187-
#[cfg(stage0)]
188-
pub fn of<T: 'static>() -> TypeId {
189-
unsafe { intrinsics::type_id::<T>() }
190-
}
191184
}

src/libcore/intrinsics.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@
4444

4545
use marker::Sized;
4646

47-
#[cfg(stage0)] use any::TypeId;
48-
4947
pub type GlueFn = extern "Rust" fn(*const i8);
5048

5149
#[lang="ty_desc"]
@@ -208,12 +206,8 @@ extern "rust-intrinsic" {
208206
/// Gets an identifier which is globally unique to the specified type. This
209207
/// function will return the same value for a type regardless of whichever
210208
/// crate it is invoked in.
211-
#[cfg(not(stage0))]
212209
pub fn type_id<T: ?Sized + 'static>() -> u64;
213210

214-
#[cfg(stage0)]
215-
pub fn type_id<T: ?Sized + 'static>() -> TypeId;
216-
217211
/// Create a value initialized to zero.
218212
///
219213
/// `init` is unsafe because it returns a zeroed-out datum,

src/librustdoc/clean/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2088,7 +2088,7 @@ impl Clean<Mutability> for ast::Mutability {
20882088
}
20892089
}
20902090

2091-
#[derive(Show, Clone, RustcEncodable, RustcDecodable, PartialEq, Copy, Show)]
2091+
#[derive(Clone, RustcEncodable, RustcDecodable, PartialEq, Copy, Show)]
20922092
pub enum ImplPolarity {
20932093
Positive,
20942094
Negative,

src/libstd/io/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1444,7 +1444,7 @@ pub trait Buffer: Reader {
14441444
}
14451445
}
14461446
};
1447-
buffer.consume(used);
1447+
self.consume(used);
14481448
if done {
14491449
return Ok(res);
14501450
}

src/libstd/sync/mpsc/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,8 +319,6 @@ use prelude::v1::*;
319319

320320
use sync::Arc;
321321
use fmt;
322-
#[cfg(stage0)] // NOTE remove use after next snapshot
323-
use marker;
324322
use mem;
325323
use cell::UnsafeCell;
326324

src/libstd/sys/windows/backtrace.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ use mem;
3131
use ops::Drop;
3232
use option::Option::{Some, None};
3333
use path::Path;
34+
use ptr;
3435
use result::Result::{Ok, Err};
3536
use slice::SliceExt;
3637
use str::{self, StrExt};

src/libstd/sys/windows/thread_local.rs

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

1515
use mem;
16+
use ptr;
1617
use rt;
1718
use sys_common::mutex::{MUTEX_INIT, Mutex};
1819

src/libstd/thread_local/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -459,6 +459,7 @@ mod imp {
459459

460460
use cell::UnsafeCell;
461461
use mem;
462+
use ptr;
462463
use sys_common::thread_local::StaticKey as OsStaticKey;
463464

464465
#[doc(hidden)]

src/test/run-make/test-shard-completeness/Makefile

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)