From bbbe58a112396f5e689f74cdcfe5c796914be906 Mon Sep 17 00:00:00 2001
From: iceiix <43691553+iceiix@users.noreply.github.com>
Date: Sun, 28 Aug 2022 08:27:39 -0700
Subject: [PATCH] Update to Rust 1.59.0 (#718)

* Update to Rust 1.59.0

* Fix clippy::single_char_pattern in console, ui/logo

* Fix clippy::needless_late_init in load_block_entities
---
 .github/workflows/build.yaml | 8 ++++----
 Cargo.toml                   | 2 +-
 README.md                    | 2 +-
 src/console/mod.rs           | 2 +-
 src/server/mod.rs            | 7 +++----
 src/ui/logo.rs               | 2 +-
 6 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index ca8cc02..45b83e0 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -11,7 +11,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           # TODO: refactor toolchain version
-          toolchain: 1.58.1
+          toolchain: 1.59.0
           components: clippy, rustfmt
           default: true
       - name: Install dependencies
@@ -60,7 +60,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.58.1
+          toolchain: 1.59.0
           components: clippy, rustfmt
           default: true
       - name: Build binary
@@ -105,7 +105,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.58.1
+          toolchain: 1.59.0
           components: clippy, rustfmt
           default: true
       - name: Build binary
@@ -161,7 +161,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           # TODO: refactor toolchain version
-          toolchain: 1.58.1
+          toolchain: 1.59.0
           components: clippy, rustfmt
           default: true
       - name: Install wasm-pack
diff --git a/Cargo.toml b/Cargo.toml
index 12d97d6..3624e4d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,7 +3,7 @@ name = "stevenarella"
 version = "0.0.1"
 authors = [ "Thinkofdeath <thinkofdeath@spigotmc.org>", "iceiix <ice_ix@protonmail.ch>" ]
 edition = "2021"
-rust-version = "1.58.1"
+rust-version = "1.59.0"
 resolver = "2"
 description = "Multi-protocol multi-platform Minecraft-compatible client"
 repository = "https://github.com/iceiix/stevenarella"
diff --git a/README.md b/README.md
index 99b6c9f..b1b9c33 100644
--- a/README.md
+++ b/README.md
@@ -70,7 +70,7 @@ from [GitHub Actions](https://actions-badge.atrox.dev/iceiix/stevenarella/goto?r
 
 ## Dependencies
 
-Requires Rust stable version 1.58.1 or newer.
+Requires Rust stable version 1.59.0 or newer.
 
 **Debian/Ubuntu**
 
diff --git a/src/console/mod.rs b/src/console/mod.rs
index aab12b8..28b0689 100644
--- a/src/console/mod.rs
+++ b/src/console/mod.rs
@@ -370,7 +370,7 @@ impl Console {
             }
         }
 
-        let mut file = &record.file().unwrap_or("").replace("\\", "/")[..];
+        let mut file = &record.file().unwrap_or("").replace('\\', "/")[..];
         if let Some(pos) = file.rfind("src/") {
             file = &file[pos + 4..];
         }
diff --git a/src/server/mod.rs b/src/server/mod.rs
index 54731bc..6a8fed9 100644
--- a/src/server/mod.rs
+++ b/src/server/mod.rs
@@ -1947,13 +1947,12 @@ impl Server {
             let z = block_entity.1.get("z").unwrap().as_int().unwrap();
             if let Some(tile_id) = block_entity.1.get("id") {
                 let tile_id = tile_id.as_str().unwrap();
-                let action;
-                match tile_id {
+                let action = match tile_id {
                     // Fake a sign update
-                    "Sign" => action = 9,
+                    "Sign" => 9,
                     // Not something we care about, so break the loop
                     _ => continue,
-                }
+                };
                 self.on_block_entity_update_u8(packet::play::clientbound::UpdateBlockEntity_u8 {
                     location: Position::new(x, y, z),
                     action,
diff --git a/src/ui/logo.rs b/src/ui/logo.rs
index b33f1ec..686d04a 100644
--- a/src/ui/logo.rs
+++ b/src/ui/logo.rs
@@ -99,7 +99,7 @@ impl Logo {
                 let mut texts = String::new();
                 file.read_to_string(&mut texts).unwrap();
                 for line in texts.lines() {
-                    text_strings.push(line.to_owned().replace("\r", ""));
+                    text_strings.push(line.to_owned().replace('\r', ""));
                 }
             }
             let mut r: rand_pcg::Pcg32 =