From 8c16abd6b1156ae8e8ca409fadcda4bb6d6c2e98 Mon Sep 17 00:00:00 2001 From: Erica Marigold Date: Sat, 13 Apr 2024 18:19:36 +0530 Subject: [PATCH] refactor: fix clippy warns I know this is out of the scope of this current PRs, but these minor clippy warnings have been a bit annoying to look at lately, so I've gone ahead and fixed them! :) --- src/lune/util/formatting.rs | 2 +- src/lune/util/traits.rs | 1 + src/roblox/instance/terrain.rs | 8 +++++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/lune/util/formatting.rs b/src/lune/util/formatting.rs index 19f9a88..8ca4b0c 100644 --- a/src/lune/util/formatting.rs +++ b/src/lune/util/formatting.rs @@ -231,7 +231,7 @@ pub fn pretty_format_luau_error(e: &LuaError, colorized: bool) -> String { let mut found_stack_begin = false; for (index, line) in err_lines.clone().iter().enumerate().rev() { if *line == "stack traceback:" { - err_lines[index] = stack_begin.clone(); + err_lines[index].clone_from(&stack_begin); found_stack_begin = true; break; } diff --git a/src/lune/util/traits.rs b/src/lune/util/traits.rs index 2c75d65..523a33c 100644 --- a/src/lune/util/traits.rs +++ b/src/lune/util/traits.rs @@ -4,6 +4,7 @@ use super::formatting::format_label; use crate::RuntimeError; pub trait LuaEmitErrorExt { + #[allow(dead_code)] fn emit_error(&self, err: LuaError); } diff --git a/src/roblox/instance/terrain.rs b/src/roblox/instance/terrain.rs index fad8e3d..a0236a6 100644 --- a/src/roblox/instance/terrain.rs +++ b/src/roblox/instance/terrain.rs @@ -27,11 +27,13 @@ pub fn add_methods<'lua, M: LuaUserDataMethods<'lua, Instance>>(methods: &mut M) } fn get_or_create_material_colors(instance: &Instance) -> MaterialColors { - if let Some(Variant::MaterialColors(material_colors)) = instance.get_property("MaterialColors") + if let Variant::MaterialColors(inner) = instance + .get_property("MaterialColors") + .unwrap_or(Variant::MaterialColors(MaterialColors::default())) { - material_colors + inner } else { - MaterialColors::default() + unreachable!() } }