loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix new Clippy errors

Browse Source 
Introduced in Clippy v0.1.89 / Rust v1.89.0.
This commit is contained in:
Oliver Hamlet
2025-08-11 18:54:54 +01:00
parent da0e35bb2b
commit a677041a55
7 changed files with 55 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/database/mod.rs
+18 -20
View File
@@ -248,23 +248,22 @@ impl Database {
) -> Result<Option<PluginMetadata>, MetadataRetrievalError> {
let mut metadata = self.masterlist.find_plugin(plugin_name)?;
if include_user_metadata == MergeMode::WithUserMetadata {
if let Some(mut user_metadata) = self.userlist.find_plugin(plugin_name)? {
if let Some(metadata) = metadata {
user_metadata.merge_metadata(&metadata);
}
metadata = Some(user_metadata);
}
}
if evaluate_conditions == EvalMode::Evaluate {
if include_user_metadata == MergeMode::WithUserMetadata
&& let Some(mut user_metadata) = self.userlist.find_plugin(plugin_name)?
{
if let Some(metadata) = metadata {
return evaluate_all_conditions(metadata, &self.condition_evaluator_state)
.map_err(Into::into);
user_metadata.merge_metadata(&metadata);
}
metadata = Some(user_metadata);
}
Ok(metadata)
if evaluate_conditions == EvalMode::Evaluate
&& let Some(metadata) = metadata
{
evaluate_all_conditions(metadata, &self.condition_evaluator_state).map_err(Into::into)
} else {
Ok(metadata)
}
}
/// Get a plugin's metadata loaded from the given userlist.
@@ -278,14 +277,13 @@ impl Database {
) -> Result<Option<PluginMetadata>, MetadataRetrievalError> {
let metadata = self.userlist.find_plugin(plugin_name)?;
if evaluate_conditions == EvalMode::Evaluate {
if let Some(metadata) = metadata {
return evaluate_all_conditions(metadata, &self.condition_evaluator_state)
.map_err(Into::into);
}
if evaluate_conditions == EvalMode::Evaluate
&& let Some(metadata) = metadata
{
evaluate_all_conditions(metadata, &self.condition_evaluator_state).map_err(Into::into)
} else {
Ok(metadata)
}
Ok(metadata)
}
/// Sets a plugin's user metadata, replacing any loaded user metadata for