Modify sys_common::RWLock to use parking_lot

Author: faern

src/libstd/sys_common/rwlock.rs

@@ -8,30 +8,30 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use sys::rwlock as imp;
+use super::parking_lot::raw_rwlock::RawRwLock;
 
 /// An OS-based reader-writer lock.
 ///
 /// This structure is entirely unsafe and serves as the lowest layer of a
 /// cross-platform binding of system rwlocks. It is recommended to use the
 /// safer types at the top level of this crate instead of this type.
-pub struct RWLock(imp::RWLock);
+pub struct RWLock(RawRwLock);
 
 impl RWLock {
     /// Creates a new reader-writer lock for use.
     ///
     /// Behavior is undefined if the reader-writer lock is moved after it is
     /// first used with any of the functions below.
     #[unstable(feature = "sys_internals", issue = "0")] // FIXME: min_const_fn
-    pub const fn new() -> RWLock { RWLock(imp::RWLock::new()) }
+    pub const fn new() -> RWLock { RWLock(RawRwLock::INIT) }
 
     /// Acquires shared access to the underlying lock, blocking the current
     /// thread to do so.
     ///
     /// Behavior is undefined if the rwlock has been moved between this and any
     /// previous method call.
     #[inline]
-    pub unsafe fn read(&self) { self.0.read() }
+    pub unsafe fn read(&self) { self.0.lock_shared() }
 
     /// Attempts to acquire shared access to this lock, returning whether it
     /// succeeded or not.
@@ -41,15 +41,15 @@ impl RWLock {
     /// Behavior is undefined if the rwlock has been moved between this and any
     /// previous method call.
     #[inline]
-    pub unsafe fn try_read(&self) -> bool { self.0.try_read() }
+    pub unsafe fn try_read(&self) -> bool { self.0.try_lock_shared() }
 
     /// Acquires write access to the underlying lock, blocking the current thread
     /// to do so.
     ///
     /// Behavior is undefined if the rwlock has been moved between this and any
     /// previous method call.
     #[inline]
-    pub unsafe fn write(&self) { self.0.write() }
+    pub unsafe fn write(&self) { self.0.lock_exclusive() }
 
     /// Attempts to acquire exclusive access to this lock, returning whether it
     /// succeeded or not.
@@ -59,25 +59,25 @@ impl RWLock {
     /// Behavior is undefined if the rwlock has been moved between this and any
     /// previous method call.
     #[inline]
-    pub unsafe fn try_write(&self) -> bool { self.0.try_write() }
+    pub unsafe fn try_write(&self) -> bool { self.0.try_lock_exclusive() }
 
     /// Unlocks previously acquired shared access to this lock.
     ///
     /// Behavior is undefined if the current thread does not have shared access.
     #[inline]
-    pub unsafe fn read_unlock(&self) { self.0.read_unlock() }
+    pub unsafe fn read_unlock(&self) { self.0.unlock_shared() }
 
     /// Unlocks previously acquired exclusive access to this lock.
     ///
     /// Behavior is undefined if the current thread does not currently have
     /// exclusive access.
     #[inline]
-    pub unsafe fn write_unlock(&self) { self.0.write_unlock() }
+    pub unsafe fn write_unlock(&self) { self.0.unlock_exclusive() }
 
     /// Destroys OS-related resources with this RWLock.
     ///
     /// Behavior is undefined if there are any currently active users of this
     /// lock.
     #[inline]
-    pub unsafe fn destroy(&self) { self.0.destroy() }
+    pub unsafe fn destroy(&self) { }
 }