tests: fix fallout from empowering unused_allocation in comparisons.

This commit is contained in:
Eduard-Mihai Burtescu 2017-05-28 18:24:53 +03:00
parent 3ce443828b
commit 58632f3c1c
2 changed files with 16 additions and 16 deletions

View File

@ -134,22 +134,22 @@ fn test_push() {
fn test_push_unique() { fn test_push_unique() {
let mut heap = BinaryHeap::<Box<_>>::from(vec![box 2, box 4, box 9]); let mut heap = BinaryHeap::<Box<_>>::from(vec![box 2, box 4, box 9]);
assert_eq!(heap.len(), 3); assert_eq!(heap.len(), 3);
assert!(*heap.peek().unwrap() == box 9); assert!(**heap.peek().unwrap() == 9);
heap.push(box 11); heap.push(box 11);
assert_eq!(heap.len(), 4); assert_eq!(heap.len(), 4);
assert!(*heap.peek().unwrap() == box 11); assert!(**heap.peek().unwrap() == 11);
heap.push(box 5); heap.push(box 5);
assert_eq!(heap.len(), 5); assert_eq!(heap.len(), 5);
assert!(*heap.peek().unwrap() == box 11); assert!(**heap.peek().unwrap() == 11);
heap.push(box 27); heap.push(box 27);
assert_eq!(heap.len(), 6); assert_eq!(heap.len(), 6);
assert!(*heap.peek().unwrap() == box 27); assert!(**heap.peek().unwrap() == 27);
heap.push(box 3); heap.push(box 3);
assert_eq!(heap.len(), 7); assert_eq!(heap.len(), 7);
assert!(*heap.peek().unwrap() == box 27); assert!(**heap.peek().unwrap() == 27);
heap.push(box 103); heap.push(box 103);
assert_eq!(heap.len(), 8); assert_eq!(heap.len(), 8);
assert!(*heap.peek().unwrap() == box 103); assert!(**heap.peek().unwrap() == 103);
} }
fn check_to_vec(mut data: Vec<i32>) { fn check_to_vec(mut data: Vec<i32>) {

View File

@ -1924,7 +1924,7 @@ mod tests {
fn oneshot_single_thread_send_then_recv() { fn oneshot_single_thread_send_then_recv() {
let (tx, rx) = channel::<Box<i32>>(); let (tx, rx) = channel::<Box<i32>>();
tx.send(box 10).unwrap(); tx.send(box 10).unwrap();
assert!(rx.recv().unwrap() == box 10); assert!(*rx.recv().unwrap() == 10);
} }
#[test] #[test]
@ -1981,7 +1981,7 @@ mod tests {
fn oneshot_multi_task_recv_then_send() { fn oneshot_multi_task_recv_then_send() {
let (tx, rx) = channel::<Box<i32>>(); let (tx, rx) = channel::<Box<i32>>();
let _t = thread::spawn(move|| { let _t = thread::spawn(move|| {
assert!(rx.recv().unwrap() == box 10); assert!(*rx.recv().unwrap() == 10);
}); });
tx.send(box 10).unwrap(); tx.send(box 10).unwrap();
@ -1994,7 +1994,7 @@ mod tests {
drop(tx); drop(tx);
}); });
let res = thread::spawn(move|| { let res = thread::spawn(move|| {
assert!(rx.recv().unwrap() == box 10); assert!(*rx.recv().unwrap() == 10);
}).join(); }).join();
assert!(res.is_err()); assert!(res.is_err());
} }
@ -2048,7 +2048,7 @@ mod tests {
let _t = thread::spawn(move|| { let _t = thread::spawn(move|| {
tx.send(box 10).unwrap(); tx.send(box 10).unwrap();
}); });
assert!(rx.recv().unwrap() == box 10); assert!(*rx.recv().unwrap() == 10);
} }
} }
@ -2073,7 +2073,7 @@ mod tests {
if i == 10 { return } if i == 10 { return }
thread::spawn(move|| { thread::spawn(move|| {
assert!(rx.recv().unwrap() == box i); assert!(*rx.recv().unwrap() == i);
recv(rx, i + 1); recv(rx, i + 1);
}); });
} }
@ -2610,7 +2610,7 @@ mod sync_tests {
fn oneshot_single_thread_send_then_recv() { fn oneshot_single_thread_send_then_recv() {
let (tx, rx) = sync_channel::<Box<i32>>(1); let (tx, rx) = sync_channel::<Box<i32>>(1);
tx.send(box 10).unwrap(); tx.send(box 10).unwrap();
assert!(rx.recv().unwrap() == box 10); assert!(*rx.recv().unwrap() == 10);
} }
#[test] #[test]
@ -2682,7 +2682,7 @@ mod sync_tests {
fn oneshot_multi_task_recv_then_send() { fn oneshot_multi_task_recv_then_send() {
let (tx, rx) = sync_channel::<Box<i32>>(0); let (tx, rx) = sync_channel::<Box<i32>>(0);
let _t = thread::spawn(move|| { let _t = thread::spawn(move|| {
assert!(rx.recv().unwrap() == box 10); assert!(*rx.recv().unwrap() == 10);
}); });
tx.send(box 10).unwrap(); tx.send(box 10).unwrap();
@ -2695,7 +2695,7 @@ mod sync_tests {
drop(tx); drop(tx);
}); });
let res = thread::spawn(move|| { let res = thread::spawn(move|| {
assert!(rx.recv().unwrap() == box 10); assert!(*rx.recv().unwrap() == 10);
}).join(); }).join();
assert!(res.is_err()); assert!(res.is_err());
} }
@ -2749,7 +2749,7 @@ mod sync_tests {
let _t = thread::spawn(move|| { let _t = thread::spawn(move|| {
tx.send(box 10).unwrap(); tx.send(box 10).unwrap();
}); });
assert!(rx.recv().unwrap() == box 10); assert!(*rx.recv().unwrap() == 10);
} }
} }
@ -2774,7 +2774,7 @@ mod sync_tests {
if i == 10 { return } if i == 10 { return }
thread::spawn(move|| { thread::spawn(move|| {
assert!(rx.recv().unwrap() == box i); assert!(*rx.recv().unwrap() == i);
recv(rx, i + 1); recv(rx, i + 1);
}); });
} }