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

Fix nits.

Browse Source
This commit is contained in:
Steven Stewart-Gallus 2013-07-22 14:43:30 -07:00
parent d0b7515aed
commit 39b3a0561f
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/libextra/arc.rs
View File

@ -182,11 +182,11 @@ impl<T:Send> MutexArc<T> {
* Create a mutex-protected Arc with the supplied data and a specified number
* of condvars (as sync::Mutex::new_with_condvars).
*/
pub fn new_with_condvars(user_data: T,
num_condvars: uint) -> MutexArc<T> {
let data =
MutexArcInner { lock: Mutex::new_with_condvars(num_condvars),
failed: false, data: user_data };
pub fn new_with_condvars(user_data: T, num_condvars: uint) -> MutexArc<T> {
let data = MutexArcInner {
lock: Mutex::new_with_condvars(num_condvars),
failed: false, data: user_data
};
MutexArc { x: UnsafeAtomicRcBox::new(data) }
}
@ -333,9 +333,10 @@ impl<T:Freeze + Send> RWArc<T> {
* of condvars (as sync::RWLock::new_with_condvars).
*/
pub fn new_with_condvars(user_data: T, num_condvars: uint) -> RWArc<T> {
let data =
RWArcInner { lock: RWLock::new_with_condvars(num_condvars),
failed: false, data: user_data };
let data = RWArcInner {
lock: RWLock::new_with_condvars(num_condvars),
failed: false, data: user_data
};
RWArc { x: UnsafeAtomicRcBox::new(data), }
}

16
src/libstd/unstable/sync.rs
View File

@ -236,13 +236,11 @@ impl<T> Drop for UnsafeAtomicRcBox<T>{
/****************************************************************************/
enum RTLittleLock {
// We know nothing about the runtime's representation of the
// little lock so we leave the definition empty.
}
#[allow(non_camel_case_types)] // runtime type
type rust_little_lock = *libc::c_void;
pub struct LittleLock {
l: *RTLittleLock,
l: rust_little_lock,
}
impl Drop for LittleLock {
@ -351,10 +349,10 @@ impl<T:Send> Exclusive<T> {
}
extern {
fn rust_create_little_lock() -> *RTLittleLock;
fn rust_destroy_little_lock(lock: *RTLittleLock);
fn rust_lock_little_lock(lock: *RTLittleLock);
fn rust_unlock_little_lock(lock: *RTLittleLock);
fn rust_create_little_lock() -> rust_little_lock;
fn rust_destroy_little_lock(lock: rust_little_lock);
fn rust_lock_little_lock(lock: rust_little_lock);
fn rust_unlock_little_lock(lock: rust_little_lock);
}
#[cfg(test)]