From 4fab72cbea3eb0867927fd9788ad324d824a7e57 Mon Sep 17 00:00:00 2001
From: Louis Dureuil <louis@meilisearch.com>
Date: Wed, 5 Mar 2025 17:48:31 +0100
Subject: [PATCH] Rename SettingsDiff::diff to SettingsDiff::apply_and_diff

---
 crates/milli/src/vector/settings.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/milli/src/vector/settings.rs b/crates/milli/src/vector/settings.rs
index 610597dd5..3948ad4d8 100644
--- a/crates/milli/src/vector/settings.rs
+++ b/crates/milli/src/vector/settings.rs
@@ -661,7 +661,7 @@ impl SettingsDiff {
 
                 let mut reindex_action = None;
 
-                Self::diff(
+                Self::apply_and_diff(
                     &mut reindex_action,
                     &mut source,
                     &mut model,
@@ -791,7 +791,7 @@ impl SettingsDiff {
                     indexing_embedder: new_indexing_embedder,
                 } = new_sub_embedder;
 
-                Self::diff(
+                Self::apply_and_diff(
                     reindex_action,
                     &mut source,
                     &mut model,
@@ -852,7 +852,7 @@ impl SettingsDiff {
     }
 
     #[allow(clippy::too_many_arguments)]
-    fn diff(
+    fn apply_and_diff(
         reindex_action: &mut Option<ReindexAction>,
         source: &mut Setting<EmbedderSource>,
         model: &mut Setting<String>,