Merge pull request #743 from iceiix/rust1.64

Update to Rust 1.64.0

.github/workflows/build.yaml

@@ -11,7 +11,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           # TODO: refactor toolchain version
-          toolchain: 1.59.0
+          toolchain: 1.64.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.59.0
+          toolchain: 1.64.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.59.0
+          toolchain: 1.64.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.59.0
+          toolchain: 1.64.0
           components: clippy, rustfmt
           default: true
       - name: Install wasm-pack

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.59.0"
+rust-version = "1.64.0"
 resolver = "2"
 description = "Multi-protocol multi-platform Minecraft-compatible client"
 repository = "https://github.com/iceiix/stevenarella"

README.md

@@ -70,7 +70,7 @@ from [GitHub Actions](https://actions-badge.atrox.dev/iceiix/stevenarella/goto?r
 
 ## Dependencies
 
-Requires Rust stable version 1.59.0 or newer.
+Requires Rust stable version 1.64.0 or newer.
 
 **Debian/Ubuntu**
 

src/console/mod.rs

@@ -135,7 +135,7 @@ impl Var for CVar<String> {
     }
 
     fn deserialize(&self, input: &str) -> Box<dyn Any> {
-        Box::new((&input[1..input.len() - 1]).to_owned())
+        Box::new(input[1..input.len() - 1].to_owned())
     }
 
     fn description(&self) -> &'static str {

src/ecs/mod.rs

@@ -603,7 +603,7 @@ impl ComponentMem {
             drop_func: Box::new(|data| unsafe {
                 let mut val = mem::MaybeUninit::<T>::uninit();
                 ptr::copy(data as *mut T, val.as_mut_ptr(), 1);
-                mem::drop(val);
+                val.assume_init_drop();
             }),
         }
     }

src/settings.rs

@@ -115,12 +115,9 @@ impl Stevenkey {
     }
 
     pub fn get_by_keycode(keycode: VirtualKeyCode, vars: &console::Vars) -> Option<Stevenkey> {
-        for steven_key in Stevenkey::values() {
-            if keycode as i64 == *vars.get(steven_key.get_cvar()) {
-                return Some(steven_key);
-            }
-        }
-        None
+        Stevenkey::values()
+            .into_iter()
+            .find(|steven_key| keycode as i64 == *vars.get(steven_key.get_cvar()))
     }
 
     pub fn get_cvar(&self) -> console::CVar<i64> {

src/ui/mod.rs

@@ -1494,6 +1494,8 @@ impl Button {
     }
 }
 
+type SubmitFunc = dyn Fn(&mut TextBox, &mut crate::Game);
+
 element! {
     ref TextBoxRef
     pub struct TextBox {
@@ -1505,7 +1507,7 @@ element! {
         priv text: Option<TextRef>,
         priv was_focused: bool,
         priv cursor_tick: f64,
-        priv submit_funcs: Vec<Box<dyn Fn(&mut TextBox, &mut crate::Game)>>,
+        priv submit_funcs: Vec<Box<SubmitFunc>>,
     }
     builder TextBoxBuilder {
         hardcode button = None,