From 6902ecaa7c1a0701467ab94efbab60f5b6bd94ef Mon Sep 17 00:00:00 2001 From: Filip Tibell Date: Mon, 24 Mar 2025 19:43:53 +0100 Subject: [PATCH] Fix various new clippy lints --- crates/lune-roblox/src/document/postprocessing.rs | 2 +- crates/lune-roblox/src/shared/userdata.rs | 2 +- crates/lune-std-datetime/src/values.rs | 4 ++-- crates/lune-std-process/src/tee_writer.rs | 2 +- crates/lune-std-serde/src/compress_decompress.rs | 4 ++-- crates/lune-std/src/globals/require/context.rs | 4 ++-- crates/lune/src/cli/utils/files.rs | 4 ++-- crates/mlua-luau-scheduler/src/traits.rs | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/crates/lune-roblox/src/document/postprocessing.rs b/crates/lune-roblox/src/document/postprocessing.rs index 69481f5..28ec7ad 100644 --- a/crates/lune-roblox/src/document/postprocessing.rs +++ b/crates/lune-roblox/src/document/postprocessing.rs @@ -41,7 +41,7 @@ where } fn remove_matching_prop(inst: &mut DomInstance, ty: DomType, name: &'static str) { - if inst.properties.get(name).map_or(false, |u| u.ty() == ty) { + if inst.properties.get(name).is_some_and(|u| u.ty() == ty) { inst.properties.remove(name); } } diff --git a/crates/lune-roblox/src/shared/userdata.rs b/crates/lune-roblox/src/shared/userdata.rs index eaaa129..d197600 100644 --- a/crates/lune-roblox/src/shared/userdata.rs +++ b/crates/lune-roblox/src/shared/userdata.rs @@ -23,7 +23,7 @@ pub fn make_list_writer() -> Box { }) } -/** +/* Userdata metamethod implementations Note that many of these return [`LuaResult`] even though they don't diff --git a/crates/lune-std-datetime/src/values.rs b/crates/lune-std-datetime/src/values.rs index 4193d63..e270bfa 100644 --- a/crates/lune-std-datetime/src/values.rs +++ b/crates/lune-std-datetime/src/values.rs @@ -60,7 +60,7 @@ where } } -/** +/* Conversion methods between `DateTimeValues` and plain lua tables Note that the `IntoLua` implementation here uses a read-only table, @@ -117,7 +117,7 @@ impl IntoLua<'_> for DateTimeValues { } } -/** +/* Conversion methods between chrono's timezone-aware `DateTime` to and from our non-timezone-aware `DateTimeValues` values struct */ diff --git a/crates/lune-std-process/src/tee_writer.rs b/crates/lune-std-process/src/tee_writer.rs index fee7776..9a8a54f 100644 --- a/crates/lune-std-process/src/tee_writer.rs +++ b/crates/lune-std-process/src/tee_writer.rs @@ -33,7 +33,7 @@ where } } -impl<'a, W> AsyncWrite for AsyncTeeWriter<'a, W> +impl AsyncWrite for AsyncTeeWriter<'_, W> where W: AsyncWrite + Unpin, { diff --git a/crates/lune-std-serde/src/compress_decompress.rs b/crates/lune-std-serde/src/compress_decompress.rs index 86b5c87..b0f560a 100644 --- a/crates/lune-std-serde/src/compress_decompress.rs +++ b/crates/lune-std-serde/src/compress_decompress.rs @@ -117,7 +117,7 @@ impl<'lua> FromLua<'lua> for CompressDecompressFormat { Errors when the compression fails. */ -pub async fn compress<'lua>( +pub async fn compress( source: impl AsRef<[u8]>, format: CompressDecompressFormat, level: Option, @@ -163,7 +163,7 @@ pub async fn compress<'lua>( Errors when the decompression fails. */ -pub async fn decompress<'lua>( +pub async fn decompress( source: impl AsRef<[u8]>, format: CompressDecompressFormat, ) -> LuaResult> { diff --git a/crates/lune-std/src/globals/require/context.rs b/crates/lune-std/src/globals/require/context.rs index 0355d27..3734b6c 100644 --- a/crates/lune-std/src/globals/require/context.rs +++ b/crates/lune-std/src/globals/require/context.rs @@ -150,9 +150,9 @@ impl RequireContext { self.get_from_cache(lua, abs_path.as_ref()) } - async fn load<'lua>( + async fn load( &self, - lua: &'lua Lua, + lua: &Lua, abs_path: impl AsRef, rel_path: impl AsRef, ) -> LuaResult { diff --git a/crates/lune/src/cli/utils/files.rs b/crates/lune/src/cli/utils/files.rs index 2e02bb8..c808b4c 100644 --- a/crates/lune/src/cli/utils/files.rs +++ b/crates/lune/src/cli/utils/files.rs @@ -64,8 +64,8 @@ pub fn discover_script_path(path: impl AsRef, in_home_dir: bool) -> Result< // NOTE: We use metadata directly here to try to // avoid accessing the file path more than once let file_meta = file_path.metadata(); - let is_file = file_meta.as_ref().map_or(false, Metadata::is_file); - let is_dir = file_meta.as_ref().map_or(false, Metadata::is_dir); + let is_file = file_meta.as_ref().is_ok_and(Metadata::is_file); + let is_dir = file_meta.as_ref().is_ok_and(Metadata::is_dir); let is_abs = file_path.is_absolute(); let ext = file_path.extension(); if is_file { diff --git a/crates/mlua-luau-scheduler/src/traits.rs b/crates/mlua-luau-scheduler/src/traits.rs index caca387..943bc97 100644 --- a/crates/mlua-luau-scheduler/src/traits.rs +++ b/crates/mlua-luau-scheduler/src/traits.rs @@ -334,7 +334,7 @@ impl<'lua> LuaSchedulerExt<'lua> for Lua { } } -impl<'lua> LuaSpawnExt<'lua> for Lua { +impl LuaSpawnExt<'_> for Lua { fn spawn(&self, fut: F) -> Task where F: Future + Send + 'static,