about summary refs log tree commit diff
path: root/src/libstd/sync
diff options
context:
space:
mode:
authorAriel Ben-Yehuda <ariel.byd@gmail.com>2016-06-06 23:41:54 +0300
committerAriel Ben-Yehuda <ariel.byd@gmail.com>2016-06-09 00:38:38 +0300
commita673cedf7bdc79a0b8dd3c831bef1698a0542365 (patch)
tree3123ae93e698c59a0009cdd0655fd91a043729d4 /src/libstd/sync
parentb2100cc7b5b64b058d712a380ebf9630e4579928 (diff)
downloadrust-a673cedf7bdc79a0b8dd3c831bef1698a0542365.tar.gz
rust-a673cedf7bdc79a0b8dd3c831bef1698a0542365.zip
fix stdtest
Diffstat (limited to 'src/libstd/sync')
-rw-r--r--src/libstd/sync/mpsc/spsc_queue.rs13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/libstd/sync/mpsc/spsc_queue.rs b/src/libstd/sync/mpsc/spsc_queue.rs
index ffd33f8518f..02506e7c2f3 100644
--- a/src/libstd/sync/mpsc/spsc_queue.rs
+++ b/src/libstd/sync/mpsc/spsc_queue.rs
@@ -265,15 +265,18 @@ mod tests {
 
             // Ensure the borrowchecker works
             match queue.peek() {
-                Some(vec) => match &**vec {
-                    // Note that `pop` is not allowed here due to borrow
-                    [1] => {}
-                    _ => return
+                Some(vec) => {
+                    assert_eq!(&*vec, &[1]);
                 },
                 None => unreachable!()
             }
 
-            queue.pop();
+            match queue.pop() {
+                Some(vec) => {
+                    assert_eq!(&*vec, &[1]);
+                },
+                None => unreachable!()
+            }
         }
     }