---

yaml
---
r: 108338
b: refs/heads/dist-snap
c: 75d92db
h: refs/heads/master
v: v3

Author: huonw

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: f64fdf524a434f0e5cd0bc91d09c144723f3c90d
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 76a59fd6e2d5c8c42193c047fd5eaba982d499f7
+refs/heads/dist-snap: 75d92dbabe5bab3a1ca85c305a3773bca2e38145
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libstd/unstable/mutex.rs

@@ -459,15 +459,15 @@ mod test {
     use rt::thread::Thread;
 
     #[test]
-    fn somke_lock() {
+    fn smoke_lock() {
         static mut lock: Mutex = MUTEX_INIT;
         unsafe {
             let _guard = lock.lock();
         }
     }
 
     #[test]
-    fn somke_cond() {
+    fn smoke_cond() {
         static mut lock: Mutex = MUTEX_INIT;
         unsafe {
             let mut guard = lock.lock();
@@ -482,6 +482,32 @@ mod test {
         }
     }
 
+    #[test]
+    fn smoke_lock_noguard() {
+        static mut lock: Mutex = MUTEX_INIT;
+        unsafe {
+            lock.lock_noguard();
+            lock.unlock_noguard();
+        }
+    }
+
+    #[test]
+    fn smoke_cond_noguard() {
+        static mut lock: Mutex = MUTEX_INIT;
+        unsafe {
+            lock.lock_noguard();
+            let t = Thread::start(proc() {
+                lock.lock_noguard();
+                lock.signal_noguard();
+                lock.unlock_noguard();
+            });
+            lock.wait_noguard();
+            lock.unlock_noguard();
+
+            t.join();
+        }
+    }
+
     #[test]
     fn destroy_immediately() {
         unsafe {