From 814b6ab422169cc5928b05bc65175d0b2bf4143a Mon Sep 17 00:00:00 2001 From: ice_iix Date: Sat, 31 Jul 2021 19:03:15 -0700 Subject: [PATCH 1/4] Update to Rust 1.54.0 --- .github/workflows/build.yaml | 8 ++++---- README.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index dd86b74..8c0bab5 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.53.0 + toolchain: 1.54.0 components: clippy, rustfmt default: true - name: Install dependencies @@ -49,7 +49,7 @@ jobs: - name: Install Rust uses: actions-rs/toolchain@v1 with: - toolchain: 1.53.0 + toolchain: 1.54.0 components: clippy, rustfmt default: true - name: Build binary @@ -83,7 +83,7 @@ jobs: - name: Install Rust uses: actions-rs/toolchain@v1 with: - toolchain: 1.53.0 + toolchain: 1.54.0 components: clippy, rustfmt default: true - name: Build binary @@ -128,7 +128,7 @@ jobs: uses: actions-rs/toolchain@v1 with: # TODO: refactor toolchain version - toolchain: 1.53.0 + toolchain: 1.54.0 components: clippy, rustfmt default: true - name: Install wasm-pack diff --git a/README.md b/README.md index 7e04262..1152f18 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ from [GitHub Actions](https://actions-badge.atrox.dev/iceiix/stevenarella/goto?r ## Dependencies -Requires Rust stable version 1.53.0 or newer. +Requires Rust stable version 1.54.0 or newer. **Debian/Ubuntu** From eb420c4896208364db6c4bb65e6b4367c6b4c27a Mon Sep 17 00:00:00 2001 From: ice_iix Date: Sat, 31 Jul 2021 19:06:42 -0700 Subject: [PATCH 2/4] Fix clippy::manual_str_repeat --- src/ui/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/mod.rs b/src/ui/mod.rs index 5873919..15b4b09 100644 --- a/src/ui/mod.rs +++ b/src/ui/mod.rs @@ -1643,7 +1643,7 @@ impl TextBox { fn transform_input(&self) -> String { if self.password { - ::std::iter::repeat('*').take(self.input.len()).collect() + "*".repeat(self.input.len()) } else { self.input.clone() } From 3d1bea85fe04c0365ed6c45968d5890a258d4eaf Mon Sep 17 00:00:00 2001 From: ice_iix Date: Sat, 31 Jul 2021 19:05:03 -0700 Subject: [PATCH 3/4] Fix clippy::needless_borrow --- src/main.rs | 6 +++--- src/screen/server_list.rs | 2 +- src/server/mod.rs | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main.rs b/src/main.rs index 1a0d410..7022475 100644 --- a/src/main.rs +++ b/src/main.rs @@ -92,7 +92,7 @@ pub struct Game { impl Game { pub fn connect_to(&mut self, address: &str) { let (protocol_version, forge_mods, fml_network_version) = - match protocol::Conn::new(&address, self.default_protocol_version) + match protocol::Conn::new(address, self.default_protocol_version) .and_then(|conn| conn.do_status()) { Ok(res) => { @@ -509,14 +509,14 @@ fn main2() { glutin_window.resize(physical_size); } - if !handle_window_event(&winit_window, &mut game, &mut ui_container, event) { + if !handle_window_event(winit_window, &mut game, &mut ui_container, event) { return; } #[cfg(not(target_arch = "wasm32"))] { tick_all( - &winit_window, + winit_window, &mut game, &mut ui_container, &mut last_frame, diff --git a/src/screen/server_list.rs b/src/screen/server_list.rs index f18efb1..acdb0e7 100644 --- a/src/screen/server_list.rs +++ b/src/screen/server_list.rs @@ -518,7 +518,7 @@ impl super::Screen for ServerList { } else { &res.protocol_name }; - let mut txt = TextComponent::new(&st); + let mut txt = TextComponent::new(st); txt.modifier.color = Some(format::Color::Yellow); let mut msg = Component::Text(txt); format::convert_legacy(&mut msg); diff --git a/src/server/mod.rs b/src/server/mod.rs index e0b2027..b26dcef 100644 --- a/src/server/mod.rs +++ b/src/server/mod.rs @@ -1823,8 +1823,7 @@ impl Server { continue; } }; - let skin_blob: serde_json::Value = match serde_json::from_slice(&skin_blob) - { + let skin_blob: serde_json::Value = match serde_json::from_slice(skin_blob) { Ok(val) => val, Err(err) => { error!("Failed to parse skin blob, {:?}", err); From 47df12b5eeec27a6b6eb9a393daabc737dbdd3b0 Mon Sep 17 00:00:00 2001 From: ice_iix Date: Sun, 1 Aug 2021 06:25:57 -0700 Subject: [PATCH 4/4] main: allow clippy::needless_borrow since it isn't needless for web --- src/main.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main.rs b/src/main.rs index 7022475..ce2a175 100644 --- a/src/main.rs +++ b/src/main.rs @@ -509,7 +509,8 @@ fn main2() { glutin_window.resize(physical_size); } - if !handle_window_event(winit_window, &mut game, &mut ui_container, event) { + #[allow(clippy::needless_borrow)] // needless for native, not for web + if !handle_window_event(&winit_window, &mut game, &mut ui_container, event) { return; }