From 149922d7cf4b76d00066bb8615df2f7b1d9ace44 Mon Sep 17 00:00:00 2001
From: Carl Lerche <me@carllerche.com>
Date: Sat, 21 Oct 2017 15:47:45 -0700
Subject: [PATCH] Get test passing again
---
tests/test_buf.rs | 7 ++++++-
tests/test_chain.rs | 48 ++++++++++++++++++++++++++++++++-------------
2 files changed, 40 insertions(+), 15 deletions(-)
diff --git a/tests/test_buf.rs b/tests/test_buf.rs
index 5a1baed..db51692 100644
--- a/tests/test_buf.rs
+++ b/tests/test_buf.rs
@@ -47,7 +47,12 @@ fn test_get_u16_buffer_underflow() {
#[test]
fn test_bufs_vec() {
let buf = Cursor::new(b"hello world");
- let mut dst: [&IoVec; 2] = Default::default();
+
+ let b1: &[u8] = &mut [0];
+ let b2: &[u8] = &mut [0];
+
+ let mut dst: [&IoVec; 2] =
+ [b1.into(), b2.into()];
assert_eq!(1, buf.bytes_vec(&mut dst[..]));
}
diff --git a/tests/test_chain.rs b/tests/test_chain.rs
index 002df59..2789e7c 100644
--- a/tests/test_chain.rs
+++ b/tests/test_chain.rs
@@ -55,48 +55,68 @@ fn vectored_read() {
let mut buf = a.chain(b);
{
- let mut iovecs: [&IoVec; 4] = Default::default();
+ let b1: &[u8] = &mut [0];
+ let b2: &[u8] = &mut [0];
+ let b3: &[u8] = &mut [0];
+ let b4: &[u8] = &mut [0];
+ let mut iovecs: [&IoVec; 4] =
+ [b1.into(), b2.into(), b3.into(), b4.into()];
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());
+ assert_eq!(iovecs[2][..], b"\0"[..]);
+ assert_eq!(iovecs[3][..], b"\0"[..]);
}
buf.advance(2);
{
- let mut iovecs: [&IoVec; 4] = Default::default();
+ let b1: &[u8] = &mut [0];
+ let b2: &[u8] = &mut [0];
+ let b3: &[u8] = &mut [0];
+ let b4: &[u8] = &mut [0];
+ let mut iovecs: [&IoVec; 4] =
+ [b1.into(), b2.into(), b3.into(), b4.into()];
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!(iovecs[2][..], b"\0"[..]);
+ assert_eq!(iovecs[3][..], b"\0"[..]);
}
buf.advance(3);
{
- let mut iovecs: [&IoVec; 4] = Default::default();
+ let b1: &[u8] = &mut [0];
+ let b2: &[u8] = &mut [0];
+ let b3: &[u8] = &mut [0];
+ let b4: &[u8] = &mut [0];
+ let mut iovecs: [&IoVec; 4] =
+ [b1.into(), b2.into(), b3.into(), b4.into()];
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!(iovecs[1][..], b"\0"[..]);
+ assert_eq!(iovecs[2][..], b"\0"[..]);
+ assert_eq!(iovecs[3][..], b"\0"[..]);
}
buf.advance(3);
{
- let mut iovecs: [&IoVec; 4] = Default::default();
+ let b1: &[u8] = &mut [0];
+ let b2: &[u8] = &mut [0];
+ let b3: &[u8] = &mut [0];
+ let b4: &[u8] = &mut [0];
+ let mut iovecs: [&IoVec; 4] =
+ [b1.into(), b2.into(), b3.into(), b4.into()];
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!(iovecs[1][..], b"\0"[..]);
+ assert_eq!(iovecs[2][..], b"\0"[..]);
+ assert_eq!(iovecs[3][..], b"\0"[..]);
}
}
--
GitLab