Skip to content

Commit

Permalink
Rename static mut to upper case
Browse files Browse the repository at this point in the history
  • Loading branch information
matklad committed Oct 14, 2016
1 parent 350b0d8 commit 72399f2
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 26 deletions.
10 changes: 5 additions & 5 deletions src/libcollectionstest/vec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -271,22 +271,22 @@ fn test_zip_unzip() {

#[test]
fn test_vec_truncate_drop() {
static mut drops: u32 = 0;
static mut DROPS: u32 = 0;
struct Elem(i32);
impl Drop for Elem {
fn drop(&mut self) {
unsafe {
drops += 1;
DROPS += 1;
}
}
}

let mut v = vec![Elem(1), Elem(2), Elem(3), Elem(4), Elem(5)];
assert_eq!(unsafe { drops }, 0);
assert_eq!(unsafe { DROPS }, 0);
v.truncate(3);
assert_eq!(unsafe { drops }, 2);
assert_eq!(unsafe { DROPS }, 2);
v.truncate(0);
assert_eq!(unsafe { drops }, 5);
assert_eq!(unsafe { DROPS }, 5);
}

#[test]
Expand Down
22 changes: 11 additions & 11 deletions src/libcollectionstest/vec_deque.rs
Original file line number Diff line number Diff line change
Expand Up @@ -695,12 +695,12 @@ fn test_show() {

#[test]
fn test_drop() {
static mut drops: i32 = 0;
static mut DROPS: i32 = 0;
struct Elem;
impl Drop for Elem {
fn drop(&mut self) {
unsafe {
drops += 1;
DROPS += 1;
}
}
}
Expand All @@ -712,17 +712,17 @@ fn test_drop() {
ring.push_front(Elem);
drop(ring);

assert_eq!(unsafe { drops }, 4);
assert_eq!(unsafe { DROPS }, 4);
}

#[test]
fn test_drop_with_pop() {
static mut drops: i32 = 0;
static mut DROPS: i32 = 0;
struct Elem;
impl Drop for Elem {
fn drop(&mut self) {
unsafe {
drops += 1;
DROPS += 1;
}
}
}
Expand All @@ -735,20 +735,20 @@ fn test_drop_with_pop() {

drop(ring.pop_back());
drop(ring.pop_front());
assert_eq!(unsafe { drops }, 2);
assert_eq!(unsafe { DROPS }, 2);

drop(ring);
assert_eq!(unsafe { drops }, 4);
assert_eq!(unsafe { DROPS }, 4);
}

#[test]
fn test_drop_clear() {
static mut drops: i32 = 0;
static mut DROPS: i32 = 0;
struct Elem;
impl Drop for Elem {
fn drop(&mut self) {
unsafe {
drops += 1;
DROPS += 1;
}
}
}
Expand All @@ -759,10 +759,10 @@ fn test_drop_clear() {
ring.push_back(Elem);
ring.push_front(Elem);
ring.clear();
assert_eq!(unsafe { drops }, 4);
assert_eq!(unsafe { DROPS }, 4);

drop(ring);
assert_eq!(unsafe { drops }, 4);
assert_eq!(unsafe { DROPS }, 4);
}

#[test]
Expand Down
14 changes: 7 additions & 7 deletions src/libstd/sync/once.rs
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ mod tests {
#[test]
fn stampede_once() {
static O: Once = Once::new();
static mut run: bool = false;
static mut RUN: bool = false;

let (tx, rx) = channel();
for _ in 0..10 {
Expand All @@ -396,21 +396,21 @@ mod tests {
for _ in 0..4 { thread::yield_now() }
unsafe {
O.call_once(|| {
assert!(!run);
run = true;
assert!(!RUN);
RUN = true;
});
assert!(run);
assert!(RUN);
}
tx.send(()).unwrap();
});
}

unsafe {
O.call_once(|| {
assert!(!run);
run = true;
assert!(!RUN);
RUN = true;
});
assert!(run);
assert!(RUN);
}

for _ in 0..10 {
Expand Down
6 changes: 3 additions & 3 deletions src/rtstartup/rsbegin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ pub mod eh_frames {

// Scratch space for unwinder's internal book-keeping.
// This is defined as `struct object` in $GCC/libgcc/unwind-dw2-fde.h.
static mut obj: [isize; 6] = [0; 6];
static mut OBJ: [isize; 6] = [0; 6];

// Unwind info registration/deregistration routines.
// See the docs of `unwind` module in libstd.
Expand All @@ -56,13 +56,13 @@ pub mod eh_frames {
unsafe fn init() {
// register unwind info on module startup
rust_eh_register_frames(&__EH_FRAME_BEGIN__ as *const u8,
&mut obj as *mut _ as *mut u8);
&mut OBJ as *mut _ as *mut u8);
}

unsafe fn uninit() {
// unregister on shutdown
rust_eh_unregister_frames(&__EH_FRAME_BEGIN__ as *const u8,
&mut obj as *mut _ as *mut u8);
&mut OBJ as *mut _ as *mut u8);
}

// MSVC-specific init/uninit routine registration
Expand Down

0 comments on commit 72399f2

Please sign in to comment.