diff options
| author | mat <27899617+mat-1@users.noreply.github.com> | 2022-10-07 20:12:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-07 20:12:36 -0500 |
| commit | bc3aa9467ae1e2d0ea1727093af9b0af14965e69 (patch) | |
| tree | 8db3b735daed484507129eb0683db88ddec14210 /azalea-core/src/resource_location.rs | |
| parent | 695efef66fdf1e08f0cb6d8783c085875100fa2d (diff) | |
| download | azalea-drasl-bc3aa9467ae1e2d0ea1727093af9b0af14965e69.tar.xz | |
Replace impl Read with Cursor<&[u8]> (#26)
* Start getting rid of Cursor
* try to make the tests pass and fail
* make the tests pass
* remove unused uses
* fix clippy warnings
* fix potential OOM exploits
* fix OOM in az-nbt
* fix nbt benchmark
* fix a test
* start replacing it with Cursor<Vec<u8>>
* wip
* fix all the issues
* fix all tests
* fix nbt benchmark
* fix warnings
Diffstat (limited to 'azalea-core/src/resource_location.rs')
| -rwxr-xr-x | azalea-core/src/resource_location.rs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/azalea-core/src/resource_location.rs b/azalea-core/src/resource_location.rs index 4c0764e5..5f8dcea1 100755 --- a/azalea-core/src/resource_location.rs +++ b/azalea-core/src/resource_location.rs @@ -1,7 +1,7 @@ //! A resource, like minecraft:stone use azalea_buf::{BufReadError, McBufReadable, McBufWritable}; -use std::io::{Read, Write}; +use std::io::{Cursor, Write}; #[derive(Hash, Clone, PartialEq, Eq)] pub struct ResourceLocation { @@ -46,7 +46,7 @@ impl std::fmt::Debug for ResourceLocation { } impl McBufReadable for ResourceLocation { - fn read_from(buf: &mut impl Read) -> Result<Self, BufReadError> { + fn read_from(buf: &mut Cursor<&[u8]>) -> Result<Self, BufReadError> { let location_string = String::read_from(buf)?; ResourceLocation::new(&location_string) } @@ -59,8 +59,6 @@ impl McBufWritable for ResourceLocation { #[cfg(test)] mod tests { - use std::io::Cursor; - use super::*; #[test] @@ -96,7 +94,7 @@ mod tests { .write_into(&mut buf) .unwrap(); - let mut buf = Cursor::new(buf); + let mut buf = &mut &buf[..]; assert_eq!( ResourceLocation::read_from(&mut buf).unwrap(), |
