diff options
| author | Steven Fackler <sfackler@gmail.com> | 2015-01-10 13:42:48 -0800 |
|---|---|---|
| committer | Steven Fackler <sfackler@gmail.com> | 2015-01-11 11:47:44 -0800 |
| commit | 8b6cda3ce681d4d95c3097d12ed754975b4a07f6 (patch) | |
| tree | 8d81e1972bcde3ad102209dc9560bf07735995f2 /src/libstd/rt | |
| parent | 099b411e080d302ec0dc5f3aebe53d76c50acfc7 (diff) | |
| download | rust-8b6cda3ce681d4d95c3097d12ed754975b4a07f6.tar.gz rust-8b6cda3ce681d4d95c3097d12ed754975b4a07f6.zip | |
Rename AtomicInt and AtomicUint
Change any use of AtomicInt to AtomicIsize and AtomicUint to AtomicUsize Closes #20893 [breaking-change]
Diffstat (limited to 'src/libstd/rt')
| -rw-r--r-- | src/libstd/rt/backtrace.rs | 2 | ||||
| -rw-r--r-- | src/libstd/rt/unwind.rs | 20 | ||||
| -rw-r--r-- | src/libstd/rt/util.rs | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/libstd/rt/backtrace.rs b/src/libstd/rt/backtrace.rs index bb0b6fe804b..f2d66e1a4d7 100644 --- a/src/libstd/rt/backtrace.rs +++ b/src/libstd/rt/backtrace.rs @@ -22,7 +22,7 @@ pub use sys::backtrace::write; // For now logging is turned off by default, and this function checks to see // whether the magical environment variable is present to see if it's turned on. pub fn log_enabled() -> bool { - static ENABLED: atomic::AtomicInt = atomic::ATOMIC_INT_INIT; + static ENABLED: atomic::AtomicIsize = atomic::ATOMIC_ISIZE_INIT; match ENABLED.load(Ordering::SeqCst) { 1 => return false, 2 => return true, diff --git a/src/libstd/rt/unwind.rs b/src/libstd/rt/unwind.rs index 4cd0b29688a..6326e4c08f1 100644 --- a/src/libstd/rt/unwind.rs +++ b/src/libstd/rt/unwind.rs @@ -83,16 +83,16 @@ pub type Callback = fn(msg: &(Any + Send), file: &'static str, line: uint); // // For more information, see below. const MAX_CALLBACKS: uint = 16; -static CALLBACKS: [atomic::AtomicUint; MAX_CALLBACKS] = - [atomic::ATOMIC_UINT_INIT, atomic::ATOMIC_UINT_INIT, - atomic::ATOMIC_UINT_INIT, atomic::ATOMIC_UINT_INIT, - atomic::ATOMIC_UINT_INIT, atomic::ATOMIC_UINT_INIT, - atomic::ATOMIC_UINT_INIT, atomic::ATOMIC_UINT_INIT, - atomic::ATOMIC_UINT_INIT, atomic::ATOMIC_UINT_INIT, - atomic::ATOMIC_UINT_INIT, atomic::ATOMIC_UINT_INIT, - atomic::ATOMIC_UINT_INIT, atomic::ATOMIC_UINT_INIT, - atomic::ATOMIC_UINT_INIT, atomic::ATOMIC_UINT_INIT]; -static CALLBACK_CNT: atomic::AtomicUint = atomic::ATOMIC_UINT_INIT; +static CALLBACKS: [atomic::AtomicUsize; MAX_CALLBACKS] = + [atomic::ATOMIC_USIZE_INIT, atomic::ATOMIC_USIZE_INIT, + atomic::ATOMIC_USIZE_INIT, atomic::ATOMIC_USIZE_INIT, + atomic::ATOMIC_USIZE_INIT, atomic::ATOMIC_USIZE_INIT, + atomic::ATOMIC_USIZE_INIT, atomic::ATOMIC_USIZE_INIT, + atomic::ATOMIC_USIZE_INIT, atomic::ATOMIC_USIZE_INIT, + atomic::ATOMIC_USIZE_INIT, atomic::ATOMIC_USIZE_INIT, + atomic::ATOMIC_USIZE_INIT, atomic::ATOMIC_USIZE_INIT, + atomic::ATOMIC_USIZE_INIT, atomic::ATOMIC_USIZE_INIT]; +static CALLBACK_CNT: atomic::AtomicUsize = atomic::ATOMIC_USIZE_INIT; thread_local! { static PANICKING: Cell<bool> = Cell::new(false) } diff --git a/src/libstd/rt/util.rs b/src/libstd/rt/util.rs index c076f0a7c6c..be293e8d4cb 100644 --- a/src/libstd/rt/util.rs +++ b/src/libstd/rt/util.rs @@ -46,7 +46,7 @@ pub fn limit_thread_creation_due_to_osx_and_valgrind() -> bool { } pub fn min_stack() -> uint { - static MIN: atomic::AtomicUint = atomic::ATOMIC_UINT_INIT; + static MIN: atomic::AtomicUsize = atomic::ATOMIC_USIZE_INIT; match MIN.load(Ordering::SeqCst) { 0 => {} n => return n - 1, |
