mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integer audit in libstd/thread_local/*, part of #22240

Browse Source
This commit is contained in:
Vojtech Kral 2015-02-23 17:24:50 +01:00
parent f0f7ca27de
commit e5e76e9b96
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/libstd/thread_local/mod.rs
View File

@ -74,7 +74,7 @@ pub mod __impl {
/// use std::cell::RefCell;
/// use std::thread;
///
/// thread_local!(static FOO: RefCell<uint> = RefCell::new(1));
/// thread_local!(static FOO: RefCell<u32> = RefCell::new(1));
///
/// FOO.with(|f| {
/// assert_eq!(*f.borrow(), 1);
@ -501,7 +501,7 @@ mod imp {
unsafe fn ptr(&'static self) -> Option<*mut T> {
let ptr = self.os.get() as *mut Value<T>;
if !ptr.is_null() {
if ptr as uint == 1 {
if ptr as usize == 1 {
return None
}
return Some(&mut (*ptr).value as *mut T);
@ -561,7 +561,7 @@ mod tests {
#[test]
fn smoke_no_dtor() {
thread_local!(static FOO: UnsafeCell<int> = UnsafeCell { value: 1 });
thread_local!(static FOO: UnsafeCell<i32> = UnsafeCell { value: 1 });
FOO.with(|f| unsafe {
assert_eq!(*f.get(), 1);
@ -630,7 +630,7 @@ mod tests {
thread_local!(static K2: UnsafeCell<Option<S2>> = UnsafeCell {
value: None
});
static mut HITS: uint = 0;
static mut HITS: u32 = 0;
impl Drop for S1 {
fn drop(&mut self) {
@ -721,8 +721,8 @@ mod dynamic_tests {
#[test]
fn smoke() {
fn square(i: int) -> int { i * i }
thread_local!(static FOO: int = square(3));
fn square(i: i32) -> i32 { i * i }
thread_local!(static FOO: i32 = square(3));
FOO.with(|f| {
assert_eq!(*f, 9);
@ -731,12 +731,12 @@ mod dynamic_tests {
#[test]
fn hashmap() {
fn map() -> RefCell<HashMap<int, int>> {
fn map() -> RefCell<HashMap<i32, i32>> {
let mut m = HashMap::new();
m.insert(1, 2);
RefCell::new(m)
}
thread_local!(static FOO: RefCell<HashMap<int, int>> = map());
thread_local!(static FOO: RefCell<HashMap<i32, i32>> = map());
FOO.with(|map| {
assert_eq!(map.borrow()[1], 2);
@ -745,7 +745,7 @@ mod dynamic_tests {
#[test]
fn refcell_vec() {
thread_local!(static FOO: RefCell<Vec<uint>> = RefCell::new(vec![1, 2, 3]));
thread_local!(static FOO: RefCell<Vec<u32>> = RefCell::new(vec![1, 2, 3]));
FOO.with(|vec| {
assert_eq!(vec.borrow().len(), 3);

12
src/libstd/thread_local/scoped.rs
View File

@ -24,7 +24,7 @@
//! # Example
//!
//! ```
//! scoped_thread_local!(static FOO: uint);
//! scoped_thread_local!(static FOO: u32);
//!
//! // Initially each scoped slot is empty.
//! assert!(!FOO.is_set());
@ -140,7 +140,7 @@ impl<T> Key<T> {
/// # Example
///
/// ```
/// scoped_thread_local!(static FOO: uint);
/// scoped_thread_local!(static FOO: u32);
///
/// FOO.set(&100, || {
/// let val = FOO.with(|v| *v);
@ -192,7 +192,7 @@ impl<T> Key<T> {
/// # Example
///
/// ```no_run
/// scoped_thread_local!(static FOO: uint);
/// scoped_thread_local!(static FOO: u32);
///
/// FOO.with(|slot| {
/// // work with `slot`
@ -269,11 +269,11 @@ mod tests {
use cell::Cell;
use prelude::v1::*;
scoped_thread_local!(static FOO: uint);
scoped_thread_local!(static FOO: u32);
#[test]
fn smoke() {
scoped_thread_local!(static BAR: uint);
scoped_thread_local!(static BAR: u32);
assert!(!BAR.is_set());
BAR.set(&1, || {
@ -287,7 +287,7 @@ mod tests {
#[test]
fn cell_allowed() {
scoped_thread_local!(static BAR: Cell<uint>);
scoped_thread_local!(static BAR: Cell<u32>);
BAR.set(&Cell::new(1), || {
BAR.with(|slot| {