From 65130d9ee7aa380dc42a404032bf50aa79eb80ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9mentine=20Urquizar?= <clementine@meilisearch.com>
Date: Sun, 13 Jun 2021 12:37:38 +0200
Subject: [PATCH] Change crop_length type from Option(usize) to usize

---
 meilisearch-http/src/index/search.rs  | 8 ++++----
 meilisearch-http/src/routes/search.rs | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/meilisearch-http/src/index/search.rs b/meilisearch-http/src/index/search.rs
index acabcf46d..7e93b7099 100644
--- a/meilisearch-http/src/index/search.rs
+++ b/meilisearch-http/src/index/search.rs
@@ -22,8 +22,8 @@ const fn default_search_limit() -> usize {
 }
 
 pub const DEFAULT_CROP_LENGTH: usize = 200;
-const fn default_crop_length() -> Option<usize> {
-    Some(DEFAULT_CROP_LENGTH)
+const fn default_crop_length() -> usize {
+    DEFAULT_CROP_LENGTH
 }
 
 #[derive(Deserialize)]
@@ -36,7 +36,7 @@ pub struct SearchQuery {
     pub attributes_to_retrieve: Option<HashSet<String>>,
     pub attributes_to_crop: Option<Vec<String>>,
     #[serde(default = "default_crop_length")]
-    pub crop_length: Option<usize>,
+    pub crop_length: usize,
     pub attributes_to_highlight: Option<HashSet<String>>,
     pub matches: Option<bool>,
     pub filter: Option<Value>,
@@ -133,7 +133,7 @@ impl Index {
                 let mut ids_length_crop = HashMap::new();
                 for attribute in attributes {
                     let mut attr_name = attribute.clone();
-                    let mut attr_len = query.crop_length;
+                    let mut attr_len = Some(query.crop_length);
 
                     if attr_name.contains(':') {
                         let mut split = attr_name.rsplit(':');
diff --git a/meilisearch-http/src/routes/search.rs b/meilisearch-http/src/routes/search.rs
index 8489215e7..c2c83e3c8 100644
--- a/meilisearch-http/src/routes/search.rs
+++ b/meilisearch-http/src/routes/search.rs
@@ -23,7 +23,7 @@ pub struct SearchQueryGet {
     limit: Option<usize>,
     attributes_to_retrieve: Option<String>,
     attributes_to_crop: Option<String>,
-    crop_length: Option<usize>,
+    crop_length: usize,
     attributes_to_highlight: Option<String>,
     filter: Option<String>,
     matches: Option<bool>,