diff options
Diffstat (limited to 'azalea-buf/src/lib.rs')
| -rw-r--r-- | azalea-buf/src/lib.rs | 73 |
1 files changed, 36 insertions, 37 deletions
diff --git a/azalea-buf/src/lib.rs b/azalea-buf/src/lib.rs index b8daa325..2c42f2ca 100644 --- a/azalea-buf/src/lib.rs +++ b/azalea-buf/src/lib.rs @@ -12,7 +12,7 @@ mod write; pub use azalea_buf_macros::*; pub use definitions::*; -pub use read::{read_varint_async, BufReadError, McBufReadable, McBufVarReadable}; +pub use read::{BufReadError, McBufReadable, McBufVarReadable}; pub use serializable_uuid::*; pub use write::{McBufVarWritable, McBufWritable}; @@ -23,7 +23,7 @@ const MAX_STRING_LENGTH: u16 = 32767; #[cfg(test)] mod tests { use super::*; - use std::{collections::HashMap, io::Cursor}; + use std::collections::HashMap; #[test] fn test_write_varint() { @@ -74,44 +74,44 @@ mod tests { #[test] fn test_read_varint() { - let mut buf = Cursor::new(vec![0]); - assert_eq!(i32::var_read_from(&mut buf).unwrap(), 0); + let buf = &mut &vec![0][..]; + assert_eq!(i32::var_read_from(buf).unwrap(), 0); - let mut buf = Cursor::new(vec![1]); - assert_eq!(i32::var_read_from(&mut buf).unwrap(), 1); + let buf = &mut &vec![1][..]; + assert_eq!(i32::var_read_from(buf).unwrap(), 1); - let mut buf = Cursor::new(vec![2]); - assert_eq!(i32::var_read_from(&mut buf).unwrap(), 2); + let buf = &mut &vec![2][..]; + assert_eq!(i32::var_read_from(buf).unwrap(), 2); - let mut buf = Cursor::new(vec![127]); - assert_eq!(i32::var_read_from(&mut buf).unwrap(), 127); + let buf = &mut &vec![127][..]; + assert_eq!(i32::var_read_from(buf).unwrap(), 127); - let mut buf = Cursor::new(vec![128, 1]); - assert_eq!(i32::var_read_from(&mut buf).unwrap(), 128); + let buf = &mut &vec![128, 1][..]; + assert_eq!(i32::var_read_from(buf).unwrap(), 128); - let mut buf = Cursor::new(vec![255, 1]); - assert_eq!(i32::var_read_from(&mut buf).unwrap(), 255); + let buf = &mut &vec![255, 1][..]; + assert_eq!(i32::var_read_from(buf).unwrap(), 255); - let mut buf = Cursor::new(vec![221, 199, 1]); - assert_eq!(i32::var_read_from(&mut buf).unwrap(), 25565); + let buf = &mut &vec![221, 199, 1][..]; + assert_eq!(i32::var_read_from(buf).unwrap(), 25565); - let mut buf = Cursor::new(vec![255, 255, 127]); - assert_eq!(i32::var_read_from(&mut buf).unwrap(), 2097151); + let buf = &mut &vec![255, 255, 127][..]; + assert_eq!(i32::var_read_from(buf).unwrap(), 2097151); - let mut buf = Cursor::new(vec![255, 255, 255, 255, 7]); - assert_eq!(i32::var_read_from(&mut buf).unwrap(), 2147483647); + let buf = &mut &vec![255, 255, 255, 255, 7][..]; + assert_eq!(i32::var_read_from(buf).unwrap(), 2147483647); - let mut buf = Cursor::new(vec![255, 255, 255, 255, 15]); - assert_eq!(i32::var_read_from(&mut buf).unwrap(), -1); + let buf = &mut &vec![255, 255, 255, 255, 15][..]; + assert_eq!(i32::var_read_from(buf).unwrap(), -1); - let mut buf = Cursor::new(vec![128, 128, 128, 128, 8]); - assert_eq!(i32::var_read_from(&mut buf).unwrap(), -2147483648); + let buf = &mut &vec![128, 128, 128, 128, 8][..]; + assert_eq!(i32::var_read_from(buf).unwrap(), -2147483648); } #[test] fn test_read_varint_longer() { - let mut buf = Cursor::new(vec![138, 56, 0, 135, 56, 123]); - assert_eq!(i32::var_read_from(&mut buf).unwrap(), 7178); + let buf = &mut &vec![138, 56, 0, 135, 56, 123][..]; + assert_eq!(i32::var_read_from(buf).unwrap(), 7178); } #[test] @@ -123,8 +123,8 @@ mod tests { dbg!(&buf); - let mut buf = Cursor::new(buf); - let result = Vec::<String>::read_from(&mut buf).unwrap(); + let buf = &mut &buf[..]; + let result = Vec::<String>::read_from(buf).unwrap(); assert_eq!(result, original_vec); } @@ -133,9 +133,9 @@ mod tests { let mut buf = Vec::new(); vec![1, 2, 3].var_write_into(&mut buf).unwrap(); - let mut buf = Cursor::new(buf); + let buf = &mut &buf[..]; - let result = Vec::<i32>::var_read_from(&mut buf).unwrap(); + let result = Vec::<i32>::var_read_from(buf).unwrap(); assert_eq!(result, vec![1, 2, 3]); } @@ -149,20 +149,19 @@ mod tests { let mut buf = Vec::new(); original_map.var_write_into(&mut buf).unwrap(); - let mut buf = Cursor::new(buf); + let buf = &mut &buf[..]; - let result = HashMap::<String, i32>::var_read_from(&mut buf).unwrap(); + let result = HashMap::<String, i32>::var_read_from(buf).unwrap(); assert_eq!(result, original_map); } #[test] fn test_long() { - let mut buf = Vec::new(); - 123456u64.write_into(&mut buf).unwrap(); - - let mut buf = Cursor::new(buf); + let buf: &mut Vec<u8> = &mut Vec::new(); + 123456u64.write_into(buf).unwrap(); - assert_eq!(u64::read_from(&mut buf).unwrap(), 123456); + let buf = &mut &buf[..]; + assert_eq!(u64::read_from(buf).unwrap(), 123456); } } |
