summary refs log tree commit diff
path: root/src/libstd/sync/mutex.rs
diff options
context:
space:
mode:
authorNick Cameron <ncameron@mozilla.com>2015-05-12 14:41:08 +1200
committerNick Cameron <ncameron@mozilla.com>2015-05-13 14:35:53 +1200
commit5d4cce6cec7c0975263bbe6f4260167a772bfc89 (patch)
tree1dba65dbc1d9332fe808af52bc82951b3f453c8b /src/libstd/sync/mutex.rs
parentdb1b14a194cbdbba813aeb4773ee7fa203a40fb1 (diff)
downloadrust-5d4cce6cec7c0975263bbe6f4260167a772bfc89.tar.gz
rust-5d4cce6cec7c0975263bbe6f4260167a772bfc89.zip
Rebasing
Diffstat (limited to 'src/libstd/sync/mutex.rs')
-rw-r--r--src/libstd/sync/mutex.rs23
1 files changed, 12 insertions, 11 deletions
diff --git a/src/libstd/sync/mutex.rs b/src/libstd/sync/mutex.rs
index febf5f1b183..f9ed7c863d1 100644
--- a/src/libstd/sync/mutex.rs
+++ b/src/libstd/sync/mutex.rs
@@ -531,15 +531,16 @@ mod tests {
         assert_eq!(*lock, 2);
     }
 
-    #[test]
-    fn test_mutex_unsized() {
-        let mutex: &Mutex<[i32]> = &Mutex::new([1, 2, 3]);
-        {
-            let b = &mut *mutex.lock().unwrap();
-            b[0] = 4;
-            b[2] = 5;
-        }
-        let comp: &[i32] = &[4, 2, 5];
-        assert_eq!(&*mutex.lock().unwrap(), comp);
-    }
+    // FIXME(#25351) needs deeply nested coercions of DST structs.
+    // #[test]
+    // fn test_mutex_unsized() {
+    //     let mutex: &Mutex<[i32]> = &Mutex::new([1, 2, 3]);
+    //     {
+    //         let b = &mut *mutex.lock().unwrap();
+    //         b[0] = 4;
+    //         b[2] = 5;
+    //     }
+    //     let comp: &[i32] = &[4, 2, 5];
+    //     assert_eq!(&*mutex.lock().unwrap(), comp);
+    // }
 }