From ae4b1e85e669bc882d158509ef1eda46c6b2a72e Mon Sep 17 00:00:00 2001 From: mat Date: Fri, 30 May 2025 19:36:59 -0800 Subject: fix clippy issues and improve formatting everywhere --- azalea-buf/src/write.rs | 80 ++++++++++++++++++++++++------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) (limited to 'azalea-buf/src/write.rs') diff --git a/azalea-buf/src/write.rs b/azalea-buf/src/write.rs index 0f35dba8..a925647d 100644 --- a/azalea-buf/src/write.rs +++ b/azalea-buf/src/write.rs @@ -8,7 +8,7 @@ use byteorder::{BigEndian, WriteBytesExt}; use super::{MAX_STRING_LENGTH, UnsizedByteArray}; -fn write_utf_with_len(buf: &mut impl Write, string: &str, len: usize) -> Result<(), io::Error> { +fn write_utf_with_len(buf: &mut impl Write, string: &str, len: usize) -> io::Result<()> { if string.len() > len { panic!( "String too big (was {} bytes encoded, max {})", @@ -21,21 +21,21 @@ fn write_utf_with_len(buf: &mut impl Write, string: &str, len: usize) -> Result< } pub trait AzaleaWrite { - fn azalea_write(&self, buf: &mut impl Write) -> Result<(), io::Error>; + fn azalea_write(&self, buf: &mut impl Write) -> io::Result<()>; } pub trait AzaleaWriteVar { - fn azalea_write_var(&self, buf: &mut impl Write) -> Result<(), io::Error>; + fn azalea_write_var(&self, buf: &mut impl Write) -> io::Result<()>; } impl AzaleaWrite for i32 { - fn azalea_write(&self, buf: &mut impl Write) -> Result<(), io::Error> { + fn azalea_write(&self, buf: &mut impl Write) -> io::Result<()> { WriteBytesExt::write_i32::(buf, *self) } } impl AzaleaWriteVar for i32 { - fn azalea_write_var(&self, buf: &mut impl Write) -> Result<(), io::Error> { + fn azalea_write_var(&self, buf: &mut impl Write) -> io::Result<()> { let mut buffer = [0]; let mut value = *self; if value == 0 { @@ -54,24 +54,24 @@ impl AzaleaWriteVar for i32 { } impl AzaleaWrite for UnsizedByteArray { - fn azalea_write(&self, buf: &mut impl Write) -> Result<(), io::Error> { + fn azalea_write(&self, buf: &mut impl Write) -> io::Result<()> { buf.write_all(self) } } impl AzaleaWrite for Vec { - default fn azalea_write(&self, buf: &mut impl Write) -> Result<(), io::Error> { + default fn azalea_write(&self, buf: &mut impl Write) -> io::Result<()> { self[..].azalea_write(buf) } } impl AzaleaWrite for Box<[T]> { - default fn azalea_write(&self, buf: &mut impl Write) -> Result<(), io::Error> { + default fn azalea_write(&self, buf: &mut impl Write) -> io::Result<()> { self[..].azalea_write(buf) } } impl AzaleaWrite for [T] { - fn azalea_write(&self, buf: &mut impl Write) -> Result<(), io::Error> { + fn azalea_write(&self, buf: &mut impl Write) -> io::Result<()> { (self.len() as u32).azalea_write_var(buf)?; for item in self { T::azalea_write(item, buf)?; @@ -81,7 +81,7 @@ impl AzaleaWrite for [T] { } impl AzaleaWrite for HashMap { - fn azalea_write(&self, buf: &mut impl Write) -> Result<(), io::Error> { + fn azalea_write(&self, buf: &mut impl Write) -> io::Result<()> { u32::azalea_write_var(&(self.len() as u32), buf)?; for (key, value) in self { key.azalea_write(buf)?; @@ -93,7 +93,7 @@ impl AzaleaWrite for HashMap { } impl AzaleaWriteVar for HashMap { - fn azalea_write_var(&self, buf: &mut impl Write) -> Result<(), io::Error> { + fn azalea_write_var(&self, buf: &mut impl Write) -> io::Result<()> { u32::azalea_write_var(&(self.len() as u32), buf)?; for (key, value) in self { key.azalea_write(buf)?; @@ -105,38 +105,38 @@ impl AzaleaWriteVar for HashMap { } impl AzaleaWrite for Vec { - fn azalea_write(&self, buf: &mut impl Write) -> Result<(), io::Error> { + fn azalea_write(&self, buf: &mut impl Write) -> io::Result<()> { (self.len() as u32).azalea_write_var(buf)?; buf.write_all(self) } } impl AzaleaWrite for String { - fn azalea_write(&self, buf: &mut impl Write) -> Result<(), io::Error> { + fn azalea_write(&self, buf: &mut impl Write) -> io::Result<()> { write_utf_with_len(buf, self, MAX_STRING_LENGTH.into()) } } impl AzaleaWrite for &str { - fn azalea_write(&self, buf: &mut impl Write) -> Result<(), io::Error> { + fn azalea_write(&self, buf: &mut impl Write) -> io::Result<()> { write_utf_with_len(buf, self, MAX_STRING_LENGTH.into()) } } impl AzaleaWrite for u32 { - fn azalea_write(&self, buf: &mut impl Write) -> Result<(), io::Error> { + fn azalea_write(&self, buf: &mut impl Write) -> io::Result<()> { i32::azalea_write(&(*self as i32), buf) } } impl AzaleaWriteVar for u32 { - fn azalea_write_var(&self, buf: &mut impl Write) -> Result<(), io::Error> { + fn azalea_write_var(&self, buf: &mut impl Write) -> io::Result<()> { i32::azalea_write_var(&(*self as i32), buf) } } impl AzaleaWriteVar for i64 { - fn azalea_write_var(&self, buf: &mut impl Write) -> Result<(), io::Error> { + fn azalea_write_var(&self, buf: &mut impl Write) -> io::Result<()> { let mut buffer = [0]; let mut value = *self; if value == 0 { @@ -155,25 +155,25 @@ impl AzaleaWriteVar for i64 { } impl AzaleaWriteVar for u64 { - fn azalea_write_var(&self, buf: &mut impl Write) -> Result<(), io::Error> { + fn azalea_write_var(&self, buf: &mut impl Write) -> io::Result<()> { i64::azalea_write_var(&(*self as i64), buf) } } impl AzaleaWrite for u16 { - fn azalea_write(&self, buf: &mut impl Write) -> Result<(), io::Error> { + fn azalea_write(&self, buf: &mut impl Write) -> io::Result<()> { i16::azalea_write(&(*self as i16), buf) } } impl AzaleaWriteVar for u16 { - fn azalea_write_var(&self, buf: &mut impl Write) -> Result<(), io::Error> { + fn azalea_write_var(&self, buf: &mut impl Write) -> io::Result<()> { i32::azalea_write_var(&(*self as i32), buf) } } impl AzaleaWriteVar for [T] { - fn azalea_write_var(&self, buf: &mut impl Write) -> Result<(), io::Error> { + fn azalea_write_var(&self, buf: &mut impl Write) -> io::Result<()> { u32::azalea_write_var(&(self.len() as u32), buf)?; for i in self { i.azalea_write_var(buf)?; @@ -182,67 +182,67 @@ impl AzaleaWriteVar for [T] { } } impl AzaleaWriteVar for Vec { - fn azalea_write_var(&self, buf: &mut impl Write) -> Result<(), io::Error> { + fn azalea_write_var(&self, buf: &mut impl Write) -> io::Result<()> { self[..].azalea_write_var(buf) } } impl AzaleaWriteVar for Box<[T]> { - fn azalea_write_var(&self, buf: &mut impl Write) -> Result<(), io::Error> { + fn azalea_write_var(&self, buf: &mut impl Write) -> io::Result<()> { self[..].azalea_write_var(buf) } } impl AzaleaWrite for u8 { - fn azalea_write(&self, buf: &mut impl Write) -> Result<(), io::Error> { + fn azalea_write(&self, buf: &mut impl Write) -> io::Result<()> { WriteBytesExt::write_u8(buf, *self) } } impl AzaleaWrite for i16 { - fn azalea_write(&self, buf: &mut impl Write) -> Result<(), io::Error> { + fn azalea_write(&self, buf: &mut impl Write) -> io::Result<()> { WriteBytesExt::write_i16::(buf, *self) } } impl AzaleaWrite for i64 { - fn azalea_write(&self, buf: &mut impl Write) -> Result<(), io::Error> { + fn azalea_write(&self, buf: &mut impl Write) -> io::Result<()> { WriteBytesExt::write_i64::(buf, *self) } } impl AzaleaWrite for u64 { - fn azalea_write(&self, buf: &mut impl Write) -> Result<(), io::Error> { + fn azalea_write(&self, buf: &mut impl Write) -> io::Result<()> { i64::azalea_write(&(*self as i64), buf) } } impl AzaleaWrite for bool { - fn azalea_write(&self, buf: &mut impl Write) -> Result<(), io::Error> { + fn azalea_write(&self, buf: &mut impl Write) -> io::Result<()> { let byte = u8::from(*self); byte.azalea_write(buf) } } impl AzaleaWrite for i8 { - fn azalea_write(&self, buf: &mut impl Write) -> Result<(), io::Error> { + fn azalea_write(&self, buf: &mut impl Write) -> io::Result<()> { (*self as u8).azalea_write(buf) } } impl AzaleaWrite for f32 { - fn azalea_write(&self, buf: &mut impl Write) -> Result<(), io::Error> { + fn azalea_write(&self, buf: &mut impl Write) -> io::Result<()> { WriteBytesExt::write_f32::(buf, *self) } } impl AzaleaWrite for f64 { - fn azalea_write(&self, buf: &mut impl Write) -> Result<(), io::Error> { + fn azalea_write(&self, buf: &mut impl Write) -> io::Result<()> { WriteBytesExt::write_f64::(buf, *self) } } impl AzaleaWrite for Option { - fn azalea_write(&self, buf: &mut impl Write) -> Result<(), io::Error> { + fn azalea_write(&self, buf: &mut impl Write) -> io::Result<()> { if let Some(s) = self { true.azalea_write(buf)?; s.azalea_write(buf)?; @@ -254,7 +254,7 @@ impl AzaleaWrite for Option { } impl AzaleaWriteVar for Option { - fn azalea_write_var(&self, buf: &mut impl Write) -> Result<(), io::Error> { + fn azalea_write_var(&self, buf: &mut impl Write) -> io::Result<()> { if let Some(s) = self { true.azalea_write(buf)?; s.azalea_write_var(buf)?; @@ -267,7 +267,7 @@ impl AzaleaWriteVar for Option { // [T; N] impl AzaleaWrite for [T; N] { - fn azalea_write(&self, buf: &mut impl Write) -> Result<(), io::Error> { + fn azalea_write(&self, buf: &mut impl Write) -> io::Result<()> { for i in self { i.azalea_write(buf)?; } @@ -276,7 +276,7 @@ impl AzaleaWrite for [T; N] { } impl AzaleaWrite for simdnbt::owned::NbtTag { - fn azalea_write(&self, buf: &mut impl Write) -> Result<(), io::Error> { + fn azalea_write(&self, buf: &mut impl Write) -> io::Result<()> { let mut data = Vec::new(); self.write(&mut data); buf.write_all(&data) @@ -284,7 +284,7 @@ impl AzaleaWrite for simdnbt::owned::NbtTag { } impl AzaleaWrite for simdnbt::owned::NbtCompound { - fn azalea_write(&self, buf: &mut impl Write) -> Result<(), io::Error> { + fn azalea_write(&self, buf: &mut impl Write) -> io::Result<()> { let mut data = Vec::new(); simdnbt::owned::NbtTag::Compound(self.clone()).write(&mut data); buf.write_all(&data) @@ -292,7 +292,7 @@ impl AzaleaWrite for simdnbt::owned::NbtCompound { } impl AzaleaWrite for simdnbt::owned::Nbt { - fn azalea_write(&self, buf: &mut impl Write) -> Result<(), io::Error> { + fn azalea_write(&self, buf: &mut impl Write) -> io::Result<()> { let mut data = Vec::new(); self.write_unnamed(&mut data); buf.write_all(&data) @@ -303,20 +303,20 @@ impl AzaleaWrite for Box where T: AzaleaWrite, { - fn azalea_write(&self, buf: &mut impl Write) -> Result<(), io::Error> { + fn azalea_write(&self, buf: &mut impl Write) -> io::Result<()> { T::azalea_write(&**self, buf) } } impl AzaleaWrite for (A, B) { - fn azalea_write(&self, buf: &mut impl Write) -> Result<(), io::Error> { + fn azalea_write(&self, buf: &mut impl Write) -> io::Result<()> { self.0.azalea_write(buf)?; self.1.azalea_write(buf) } } impl AzaleaWrite for Arc { - fn azalea_write(&self, buf: &mut impl Write) -> Result<(), io::Error> { + fn azalea_write(&self, buf: &mut impl Write) -> io::Result<()> { T::azalea_write(&**self, buf) } } -- cgit v1.2.3