From 9a4018e7571538c8cabb1cae0bde3f0d8949fde2 Mon Sep 17 00:00:00 2001
From: Carl Lerche <me@carllerche.com>
Date: Sun, 19 Mar 2017 09:08:37 -0700
Subject: [PATCH] Fix tests on nightly
Closes #83
---
tests/test_chain.rs | 57 ++++++++++++++++++++++++++-------------------
1 file changed, 33 insertions(+), 24 deletions(-)
diff --git a/tests/test_chain.rs b/tests/test_chain.rs
index 08181bd..002df59 100644
--- a/tests/test_chain.rs
+++ b/tests/test_chain.rs
@@ -53,41 +53,50 @@ fn vectored_read() {
let b = Cursor::new(Bytes::from(&b"world"[..]));
let mut buf = a.chain(b);
- let mut iovecs: [&IoVec; 4] = Default::default();
- assert_eq!(2, buf.bytes_vec(&mut iovecs));
- assert_eq!(iovecs[0][..], b"hello"[..]);
- assert_eq!(iovecs[1][..], b"world"[..]);
- assert!(iovecs[2].is_empty());
- assert!(iovecs[3].is_empty());
+ {
+ let mut iovecs: [&IoVec; 4] = Default::default();
+
+ assert_eq!(2, buf.bytes_vec(&mut iovecs));
+ assert_eq!(iovecs[0][..], b"hello"[..]);
+ assert_eq!(iovecs[1][..], b"world"[..]);
+ assert!(iovecs[2].is_empty());
+ assert!(iovecs[3].is_empty());
+ }
buf.advance(2);
- iovecs = Default::default();
+ {
+ let mut iovecs: [&IoVec; 4] = Default::default();
- assert_eq!(2, buf.bytes_vec(&mut iovecs));
- assert_eq!(iovecs[0][..], b"llo"[..]);
- assert_eq!(iovecs[1][..], b"world"[..]);
- assert!(iovecs[2].is_empty());
- assert!(iovecs[3].is_empty());
+ assert_eq!(2, buf.bytes_vec(&mut iovecs));
+ assert_eq!(iovecs[0][..], b"llo"[..]);
+ assert_eq!(iovecs[1][..], b"world"[..]);
+ assert!(iovecs[2].is_empty());
+ assert!(iovecs[3].is_empty());
+ }
buf.advance(3);
- iovecs = Default::default();
+ {
+ let mut iovecs: [&IoVec; 4] = Default::default();
- assert_eq!(1, buf.bytes_vec(&mut iovecs));
- assert_eq!(iovecs[0][..], b"world"[..]);
- assert!(iovecs[1].is_empty());
- assert!(iovecs[2].is_empty());
- assert!(iovecs[3].is_empty());
+ assert_eq!(1, buf.bytes_vec(&mut iovecs));
+ assert_eq!(iovecs[0][..], b"world"[..]);
+ assert!(iovecs[1].is_empty());
+ assert!(iovecs[2].is_empty());
+ assert!(iovecs[3].is_empty());
+ }
buf.advance(3);
- iovecs = Default::default();
+ {
+ let mut iovecs: [&IoVec; 4] = Default::default();
- assert_eq!(1, buf.bytes_vec(&mut iovecs));
- assert_eq!(iovecs[0][..], b"ld"[..]);
- assert!(iovecs[1].is_empty());
- assert!(iovecs[2].is_empty());
- assert!(iovecs[3].is_empty());
+ assert_eq!(1, buf.bytes_vec(&mut iovecs));
+ assert_eq!(iovecs[0][..], b"ld"[..]);
+ assert!(iovecs[1].is_empty());
+ assert!(iovecs[2].is_empty());
+ assert!(iovecs[3].is_empty());
+ }
}
--
GitLab