From 35801984476e4f6a59abb77aec2424b84be4dd25 Mon Sep 17 00:00:00 2001
From: Paul Masurel <paul@quickwit.io>
Date: Wed, 21 Dec 2022 12:18:01 +0900
Subject: [PATCH] Minor refactoring

---
 fastfield_codecs/src/null_index/sparse.rs |  2 +-
 fastfield_codecs/src/serialize.rs         | 19 ---------------
 src/postings/serializer.rs                | 28 +++++++++++------------
 src/query/range_query_ip_fastfield.rs     |  3 +--
 4 files changed, 16 insertions(+), 36 deletions(-)

diff --git a/fastfield_codecs/src/null_index/sparse.rs b/fastfield_codecs/src/null_index/sparse.rs
index 96ca0517f..591d78078 100644
--- a/fastfield_codecs/src/null_index/sparse.rs
+++ b/fastfield_codecs/src/null_index/sparse.rs
@@ -160,7 +160,7 @@ fn deserialize_sparse_codec_block(data: &OwnedBytes) -> Vec<SparseCodecBlockVari
     // The number of vals so far
     let mut offset = 0;
     let mut sparse_codec_blocks = Vec::new();
-    let num_blocks = get_u16(&data, data.len() - 2);
+    let num_blocks = get_u16(data, data.len() - 2);
     let block_data_index_start =
         data.len() - 2 - num_blocks as usize * SERIALIZED_BLOCK_METADATA_SIZE;
     let mut byte_start = 0;
diff --git a/fastfield_codecs/src/serialize.rs b/fastfield_codecs/src/serialize.rs
index 2f1cbc28b..e1a996e5b 100644
--- a/fastfield_codecs/src/serialize.rs
+++ b/fastfield_codecs/src/serialize.rs
@@ -1,22 +1,3 @@
-// Copyright (C) 2022 Quickwit, Inc.
-//
-// Quickwit is offered under the AGPL v3.0 and as commercial software.
-// For commercial licensing, contact us at hello@quickwit.io.
-//
-// AGPL:
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
-
 use std::io;
 use std::num::NonZeroU64;
 use std::sync::Arc;
diff --git a/src/postings/serializer.rs b/src/postings/serializer.rs
index 6afa6edce..8eed14a43 100644
--- a/src/postings/serializer.rs
+++ b/src/postings/serializer.rs
@@ -213,21 +213,21 @@ impl<'a> FieldSerializer<'a> {
         fail_point!("FieldSerializer::close_term", |msg: Option<String>| {
             Err(io::Error::new(io::ErrorKind::Other, format!("{:?}", msg)))
         });
-        if self.term_open {
-            self.postings_serializer
-                .close_term(self.current_term_info.doc_freq)?;
-            self.current_term_info.postings_range.end =
-                self.postings_serializer.written_bytes() as usize;
-
-            if let Some(positions_serializer) = self.positions_serializer_opt.as_mut() {
-                positions_serializer.close_term()?;
-                self.current_term_info.positions_range.end =
-                    positions_serializer.written_bytes() as usize;
-            }
-            self.term_dictionary_builder
-                .insert_value(&self.current_term_info)?;
-            self.term_open = false;
+        if !self.term_open {
+            return Ok(());
         }
+        self.postings_serializer
+            .close_term(self.current_term_info.doc_freq)?;
+        self.current_term_info.postings_range.end =
+            self.postings_serializer.written_bytes() as usize;
+        if let Some(positions_serializer) = self.positions_serializer_opt.as_mut() {
+            positions_serializer.close_term()?;
+            self.current_term_info.positions_range.end =
+                positions_serializer.written_bytes() as usize;
+        }
+        self.term_dictionary_builder
+            .insert_value(&self.current_term_info)?;
+        self.term_open = false;
         Ok(())
     }
 
diff --git a/src/query/range_query_ip_fastfield.rs b/src/query/range_query_ip_fastfield.rs
index 175d0f4a9..52be80e5d 100644
--- a/src/query/range_query_ip_fastfield.rs
+++ b/src/query/range_query_ip_fastfield.rs
@@ -126,7 +126,7 @@ impl VecCursor {
     }
     #[inline]
     fn current(&self) -> Option<u32> {
-        self.docs.get(self.current_pos).map(|el| *el)
+        self.docs.get(self.current_pos).copied()
     }
     fn get_cleared_data(&mut self) -> &mut Vec<u32> {
         self.docs.clear();
@@ -282,7 +282,6 @@ impl DocSet for IpRangeDocSet {
     fn doc(&self) -> DocId {
         self.loaded_docs
             .current()
-            .map(|el| el)
             .unwrap_or(TERMINATED)
     }