From f6588e66d0ace2d2d8d5809e302f878a9b472a62 Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Mon, 24 Jun 2024 23:09:14 +0100 Subject: [PATCH] Resolve clippy warnings --- ffi/src/plugin.rs | 2 +- src/plugin.rs | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ffi/src/plugin.rs b/ffi/src/plugin.rs index c280a83..951e90c 100644 --- a/ffi/src/plugin.rs +++ b/ffi/src/plugin.rs @@ -124,7 +124,7 @@ pub unsafe extern "C" fn esp_plugin_resolve_record_ids( let plugins_metadata = if plugins_metadata.is_null() { &[] } else { - (&*plugins_metadata).as_slice() + (*plugins_metadata).as_slice() }; match plugin.resolve_record_ids(plugins_metadata) { diff --git a/src/plugin.rs b/src/plugin.rs index 050ff00..065d18a 100644 --- a/src/plugin.rs +++ b/src/plugin.rs @@ -634,7 +634,7 @@ fn hashed_masters_for_starfield( for master in masters { let master_scale = masters_metadata .iter() - .find(|m| unicase::eq(&m.filename, &master)) + .find(|m| unicase::eq(&m.filename, master)) .map(|m| m.scale) .ok_or_else(|| Error::PluginMetadataNotFound(master.clone()))?; @@ -746,7 +746,7 @@ fn read_morrowind_record_ids(reader: &mut R) -> Result(input: &'a [u8], game_id: GameId) -> IResult<&'a [u8], RecordIds> { +fn parse_record_ids(input: &[u8], game_id: GameId) -> IResult<&[u8], RecordIds> { if game_id == GameId::Morrowind { parse_morrowind_record_ids(input) } else { @@ -764,11 +764,11 @@ fn read_record_ids(reader: &mut R, game_id: GameId) -> Result } } -fn parse_plugin<'a>( - input: &'a [u8], +fn parse_plugin( + input: &[u8], game_id: GameId, load_header_only: bool, -) -> IResult<&'a [u8], PluginData> { +) -> IResult<&[u8], PluginData> { let (input1, header_record) = Record::parse(input, game_id, false)?; if load_header_only {