From 1bb6466edd29069d2758cb5f731e1676dce606a6 Mon Sep 17 00:00:00 2001
From: Andrew Langmeier <raymi306@gmail.com>
Date: Thu, 27 Apr 2023 16:55:27 -0400
Subject: [PATCH 1/4] Add search into the serialized config (#2165)

---
 components/config/src/config/mod.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/config/src/config/mod.rs b/components/config/src/config/mod.rs
index e0674276dd..32e6bc7c94 100644
--- a/components/config/src/config/mod.rs
+++ b/components/config/src/config/mod.rs
@@ -109,6 +109,7 @@ pub struct SerializedConfig<'a> {
     build_search_index: bool,
     extra: &'a HashMap<String, Toml>,
     markdown: &'a markup::Markdown,
+    search: &'a search::Search,
 }
 
 impl Config {
@@ -331,6 +332,7 @@ impl Config {
             build_search_index: options.build_search_index,
             extra: &self.extra,
             markdown: &self.markdown,
+            search: &self.search,
         }
     }
 }

From 4b3b6bcc2cc97a987fcadfc179b781fe7246326c Mon Sep 17 00:00:00 2001
From: Andrew Langmeier <raymi306@gmail.com>
Date: Fri, 28 Apr 2023 15:39:32 -0400
Subject: [PATCH 2/4] Only expose index_format

---
 components/config/src/config/mod.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/config/src/config/mod.rs b/components/config/src/config/mod.rs
index 32e6bc7c94..dcb65ae581 100644
--- a/components/config/src/config/mod.rs
+++ b/components/config/src/config/mod.rs
@@ -109,7 +109,7 @@ pub struct SerializedConfig<'a> {
     build_search_index: bool,
     extra: &'a HashMap<String, Toml>,
     markdown: &'a markup::Markdown,
-    search: &'a search::Search,
+    search_index_format: &'a search::IndexFormat,
 }
 
 impl Config {
@@ -332,7 +332,7 @@ impl Config {
             build_search_index: options.build_search_index,
             extra: &self.extra,
             markdown: &self.markdown,
-            search: &self.search,
+            search_index_format: &self.search.index_format,
         }
     }
 }

From e2390452758d167ca7bde13eb7a32b5b69de57ae Mon Sep 17 00:00:00 2001
From: Andrew Langmeier <raymi306@gmail.com>
Date: Sun, 30 Apr 2023 14:01:19 -0400
Subject: [PATCH 3/4] Create config.search struct

---
 components/config/src/config/mod.rs    |  4 ++--
 components/config/src/config/search.rs | 13 +++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/components/config/src/config/mod.rs b/components/config/src/config/mod.rs
index dcb65ae581..2cda172127 100644
--- a/components/config/src/config/mod.rs
+++ b/components/config/src/config/mod.rs
@@ -109,7 +109,7 @@ pub struct SerializedConfig<'a> {
     build_search_index: bool,
     extra: &'a HashMap<String, Toml>,
     markdown: &'a markup::Markdown,
-    search_index_format: &'a search::IndexFormat,
+    search: search::SerializedSearch<'a>,
 }
 
 impl Config {
@@ -332,7 +332,7 @@ impl Config {
             build_search_index: options.build_search_index,
             extra: &self.extra,
             markdown: &self.markdown,
-            search_index_format: &self.search.index_format,
+            search: self.search.serialize(),
         }
     }
 }
diff --git a/components/config/src/config/search.rs b/components/config/src/config/search.rs
index c96a874847..46186cda56 100644
--- a/components/config/src/config/search.rs
+++ b/components/config/src/config/search.rs
@@ -44,3 +44,16 @@ impl Default for Search {
         }
     }
 }
+
+impl Search {
+    pub fn serialize(&self) -> SerializedSearch {
+        SerializedSearch {
+            index_format: &self.index_format
+        }
+    }
+}
+
+#[derive(Serialize)]
+pub struct SerializedSearch<'a> {
+    pub index_format: &'a IndexFormat,
+}

From 309969db56027eddc8f783f3e1378fb72a2b3aef Mon Sep 17 00:00:00 2001
From: Andrew Langmeier <raymi306@gmail.com>
Date: Mon, 1 May 2023 14:47:45 -0400
Subject: [PATCH 4/4] cargo fmt

---
 components/config/src/config/search.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/components/config/src/config/search.rs b/components/config/src/config/search.rs
index 46186cda56..26c78f7464 100644
--- a/components/config/src/config/search.rs
+++ b/components/config/src/config/search.rs
@@ -47,9 +47,7 @@ impl Default for Search {
 
 impl Search {
     pub fn serialize(&self) -> SerializedSearch {
-        SerializedSearch {
-            index_format: &self.index_format
-        }
+        SerializedSearch { index_format: &self.index_format }
     }
 }