From 8d0cad77846f61d3ab0bce55394ff127ede0b898 Mon Sep 17 00:00:00 2001
From: mat <github@matdoes.dev>
Date: Thu, 20 Oct 2022 22:16:34 -0500
Subject: [PATCH] Remove let chains

---
 azalea-auth/src/auth.rs               | 8 +++++---
 azalea-auth/src/lib.rs                | 2 --
 azalea-physics/src/collision/shape.rs | 7 ++++---
 azalea-physics/src/lib.rs             | 1 -
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/azalea-auth/src/auth.rs b/azalea-auth/src/auth.rs
index ec20d31e..98ea4952 100644
--- a/azalea-auth/src/auth.rs
+++ b/azalea-auth/src/auth.rs
@@ -69,7 +69,8 @@ pub async fn auth(email: &str, opts: AuthOpts) -> Result<AuthResult, AuthError>
     let profile: ProfileResponse;
     let minecraft_access_token: String;
 
-    if let Some(account) = &cached_account && !account.mca.is_expired() {
+    if cached_account.is_some() && !cached_account.as_ref().unwrap().mca.is_expired() {
+        let account = cached_account.as_ref().unwrap();
         // the minecraft auth data is cached and not expired, so we can just
         // use that instead of doing auth all over again :)
         profile = account.profile.clone();
@@ -102,7 +103,7 @@ pub async fn auth(email: &str, opts: AuthOpts) -> Result<AuthResult, AuthError>
         // Minecraft auth
         let mca = auth_with_minecraft(&client, &xbl_auth.data.user_hash, &xsts_token).await?;
 
-         minecraft_access_token = mca
+        minecraft_access_token = mca
             .get()
             .expect("Minecraft auth shouldn't have expired yet")
             .access_token
@@ -129,7 +130,8 @@ pub async fn auth(email: &str, opts: AuthOpts) -> Result<AuthResult, AuthError>
                     profile: profile.clone(),
                 },
             )
-            .await {
+            .await
+            {
                 log::error!("{}", e);
             }
         }
diff --git a/azalea-auth/src/lib.rs b/azalea-auth/src/lib.rs
index 03e15c71..17c87636 100755
--- a/azalea-auth/src/lib.rs
+++ b/azalea-auth/src/lib.rs
@@ -1,5 +1,3 @@
-#![feature(let_chains)]
-
 mod auth;
 mod cache;
 pub mod game_profile;
diff --git a/azalea-physics/src/collision/shape.rs b/azalea-physics/src/collision/shape.rs
index 0157724f..59a83c80 100644
--- a/azalea-physics/src/collision/shape.rs
+++ b/azalea-physics/src/collision/shape.rs
@@ -171,9 +171,10 @@ impl Shapes {
         );
         let var8 = BitSetDiscreteVoxelShape::join(&a.shape(), &b.shape(), &var5, &var6, &var7, op);
         // if var5.is_discrete_cube_merger()
-        if let IndexMerger::DiscreteCube { .. } = var5
-            && let IndexMerger::DiscreteCube { .. } = var6
-            && let IndexMerger::DiscreteCube { .. } = var7
+
+        if matches!(var5, IndexMerger::DiscreteCube { .. })
+            && matches!(var6, IndexMerger::DiscreteCube { .. })
+            && matches!(var7, IndexMerger::DiscreteCube { .. })
         {
             VoxelShape::Cube(CubeVoxelShape::new(DiscreteVoxelShape::BitSet(var8)))
         } else {
diff --git a/azalea-physics/src/lib.rs b/azalea-physics/src/lib.rs
index fe75c71e..ac0b92a8 100644
--- a/azalea-physics/src/lib.rs
+++ b/azalea-physics/src/lib.rs
@@ -1,5 +1,4 @@
 #![feature(trait_alias)]
-#![feature(let_chains)]
 
 pub mod collision;