Rename SettingsDiff::diff to SettingsDiff::apply_and_diff

This commit is contained in:
Louis Dureuil 2025-03-05 17:48:31 +01:00
parent afb4b9677f
commit 4fab72cbea
No known key found for this signature in database

View File

@ -661,7 +661,7 @@ impl SettingsDiff {
let mut reindex_action = None; let mut reindex_action = None;
Self::diff( Self::apply_and_diff(
&mut reindex_action, &mut reindex_action,
&mut source, &mut source,
&mut model, &mut model,
@ -791,7 +791,7 @@ impl SettingsDiff {
indexing_embedder: new_indexing_embedder, indexing_embedder: new_indexing_embedder,
} = new_sub_embedder; } = new_sub_embedder;
Self::diff( Self::apply_and_diff(
reindex_action, reindex_action,
&mut source, &mut source,
&mut model, &mut model,
@ -852,7 +852,7 @@ impl SettingsDiff {
} }
#[allow(clippy::too_many_arguments)] #[allow(clippy::too_many_arguments)]
fn diff( fn apply_and_diff(
reindex_action: &mut Option<ReindexAction>, reindex_action: &mut Option<ReindexAction>,
source: &mut Setting<EmbedderSource>, source: &mut Setting<EmbedderSource>,
model: &mut Setting<String>, model: &mut Setting<String>,