diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2013-12-18 09:57:58 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2013-12-25 23:10:46 -0800 |
| commit | 6cad8f4f14da1dd529100779db74b03d6db20faf (patch) | |
| tree | f3610bdf15fbe38e248a1d92b37919ed8d5a6219 /src/libstd/rt/local_ptr.rs | |
| parent | b47ff23673559ee9a5b91221e0212fd6a57d9802 (diff) | |
| download | rust-6cad8f4f14da1dd529100779db74b03d6db20faf.tar.gz rust-6cad8f4f14da1dd529100779db74b03d6db20faf.zip | |
Test fixes and rebase conflicts
* vec::raw::to_ptr is gone * Pausible => Pausable * Removing @ * Calling the main task "<main>" * Removing unused imports * Removing unused mut * Bringing some libextra tests up to date * Allowing compiletest to work at stage0 * Fixing the bootstrap-from-c rmake tests * assert => rtassert in a few cases * printing to stderr instead of stdout in fail!()
Diffstat (limited to 'src/libstd/rt/local_ptr.rs')
| -rw-r--r-- | src/libstd/rt/local_ptr.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/rt/local_ptr.rs b/src/libstd/rt/local_ptr.rs index b75f2927003..42cce272e44 100644 --- a/src/libstd/rt/local_ptr.rs +++ b/src/libstd/rt/local_ptr.rs @@ -42,7 +42,7 @@ impl<T> Drop for Borrowed<T> { } let val: ~T = cast::transmute(self.val); put::<T>(val); - assert!(exists()); + rtassert!(exists()); } } } @@ -110,7 +110,7 @@ pub mod compiled { #[inline] pub unsafe fn take<T>() -> ~T { let ptr = RT_TLS_PTR; - assert!(!ptr.is_null()); + rtassert!(!ptr.is_null()); let ptr: ~T = cast::transmute(ptr); // can't use `as`, due to type not matching with `cfg(test)` RT_TLS_PTR = cast::transmute(0); @@ -180,7 +180,7 @@ pub mod native { } pub unsafe fn cleanup() { - assert!(INITIALIZED); + rtassert!(INITIALIZED); tls::destroy(RT_TLS_KEY); LOCK.destroy(); INITIALIZED = false; |
