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-world/src/palette.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-world/src/palette.rs')
| -rw-r--r-- | azalea-world/src/palette.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/azalea-world/src/palette.rs b/azalea-world/src/palette.rs index ddb0c587..a467ea93 100644 --- a/azalea-world/src/palette.rs +++ b/azalea-world/src/palette.rs @@ -1,5 +1,5 @@ use azalea_buf::{BufReadError, McBufReadable, McBufVarReadable, McBufWritable}; -use std::io::{Read, Write}; +use std::io::{Cursor, Write}; use crate::BitStorage; @@ -33,7 +33,7 @@ impl PalettedContainer { } pub fn read_with_type( - buf: &mut impl Read, + buf: &mut Cursor<&[u8]>, container_type: &'static PalettedContainerType, ) -> Result<Self, BufReadError> { let bits_per_entry = u8::read_from(buf)?; @@ -256,7 +256,7 @@ impl PaletteType { } } - pub fn read(&self, buf: &mut impl Read) -> Result<Palette, BufReadError> { + pub fn read(&self, buf: &mut Cursor<&[u8]>) -> Result<Palette, BufReadError> { Ok(match self { PaletteType::SingleValue => Palette::SingleValue(u32::var_read_from(buf)?), PaletteType::Linear => Palette::Linear(Vec::<u32>::var_read_from(buf)?), |
