From 2a2e82efeb4e090abf9144b39be834972c7a0a4d Mon Sep 17 00:00:00 2001
From: mat <github@matdoes.dev>
Date: Wed, 24 Aug 2022 20:00:44 -0500
Subject: make some code more idiomatic

---
 azalea-buf/src/read.rs   |  4 ++--
 azalea-nbt/src/decode.rs | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/azalea-buf/src/read.rs b/azalea-buf/src/read.rs
index 7372018e..a7ebc10c 100644
--- a/azalea-buf/src/read.rs
+++ b/azalea-buf/src/read.rs
@@ -68,7 +68,7 @@ where
     }
 
     // fast varints modified from https://github.com/luojia65/mc-varint/blob/master/src/lib.rs#L67
-    /// Read a single varint from the reader and return the value, along with the number of bytes read
+    /// Read a single varint from the reader and return the value
     fn read_varint(&mut self) -> Result<i32, BufReadError> {
         let mut buffer = [0];
         let mut ans = 0;
@@ -77,7 +77,7 @@ where
                 .map_err(|_| BufReadError::InvalidVarInt)?;
             ans |= ((buffer[0] & 0b0111_1111) as i32) << (7 * i);
             if buffer[0] & 0b1000_0000 == 0 {
-                return Ok(ans);
+                break;
             }
         }
         Ok(ans)
diff --git a/azalea-nbt/src/decode.rs b/azalea-nbt/src/decode.rs
index 314e763e..5164bb0f 100755
--- a/azalea-nbt/src/decode.rs
+++ b/azalea-nbt/src/decode.rs
@@ -18,7 +18,7 @@ fn read_string(stream: &mut impl Read) -> Result<String, Error> {
 impl Tag {
     #[inline]
     fn read_known(stream: &mut impl Read, id: u8) -> Result<Tag, Error> {
-        let tag = match id {
+        Ok(match id {
             // Signifies the end of a TAG_Compound. It is only ever used inside
             // a TAG_Compound, and is not named despite being in a TAG_Compound
             0 => Tag::End,
@@ -104,8 +104,7 @@ impl Tag {
                 Tag::LongArray(longs)
             }
             _ => return Err(Error::InvalidTagType(id)),
-        };
-        Ok(tag)
+        })
     }
 
     pub fn read(stream: &mut impl Read) -> Result<Tag, Error> {
@@ -137,10 +136,11 @@ impl Tag {
 
 impl McBufReadable for Tag {
     fn read_from(buf: &mut impl Read) -> Result<Self, BufReadError> {
-        match Tag::read(buf) {
-            Ok(r) => Ok(r),
-            // Err(e) => Err(e.to_string()),
-            Err(e) => Err(e.to_string()).unwrap(),
-        }
+        Ok(Tag::read(buf)?)
+    }
+}
+impl From<Error> for BufReadError {
+    fn from(e: Error) -> Self {
+        BufReadError::Custom(e.to_string())
     }
 }
-- 
cgit v1.2.3