diff --git a/tests/test_buf.rs b/tests/test_buf.rs index 5a1baedf5c3b217c390b6412ac89e9309b75d511..db516920c583406b5201b67f7ac35409e9ab7b0a 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 002df590f024ee51ccfc1015e232d4d031c975bc..2789e7c0602de137ca2bb9074ba2a13a36575d42 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"[..]); } }