From 763ee521be4f6145322d32498162b158d69302bd Mon Sep 17 00:00:00 2001
From: marin postma <postma.marin@protonmail.com>
Date: Mon, 21 Jun 2021 12:09:59 +0200
Subject: [PATCH] fix rebase errors

---
 meilisearch-http/src/index/search.rs  | 3 +--
 meilisearch-http/src/routes/search.rs | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/meilisearch-http/src/index/search.rs b/meilisearch-http/src/index/search.rs
index df3890635..1cdac6351 100644
--- a/meilisearch-http/src/index/search.rs
+++ b/meilisearch-http/src/index/search.rs
@@ -103,7 +103,6 @@ impl Index {
 
         let displayed_ids = self
             .displayed_fields_ids(&rtxn)?
-            .map_err(|e| IndexError::Internal(Box::new(e)))?
             .map(|fields| fields.into_iter().collect::<BTreeSet<_>>())
             .unwrap_or_else(|| fields_ids_map.iter().map(|(id, _)| id).collect());
 
@@ -165,7 +164,7 @@ impl Index {
 
         let documents_iter = self.documents(&rtxn, documents_ids)?;
 
-        for (_id, obkv) in self.documents(&rtxn, documents_ids)? {
+        for (_id, obkv) in documents_iter {
             let document = make_document(&to_retrieve_ids, &fields_ids_map, obkv)?;
             let formatted = format_fields(
                 &fields_ids_map,
diff --git a/meilisearch-http/src/routes/search.rs b/meilisearch-http/src/routes/search.rs
index af557ae95..e8b197caa 100644
--- a/meilisearch-http/src/routes/search.rs
+++ b/meilisearch-http/src/routes/search.rs
@@ -1,5 +1,4 @@
 use std::collections::{BTreeSet, HashSet};
-use std::convert::{TryFrom, TryInto};
 
 use actix_web::{get, post, web, HttpResponse};
 use serde::Deserialize;