Pleasing clippy

This commit is contained in:
Paul Masurel
2021-12-02 14:48:33 +09:00
parent dde49ac8e2
commit f378d9a57b
3 changed files with 6 additions and 6 deletions

View File

@@ -553,7 +553,7 @@ impl IndexWriter {
// marks the segment updater as killed. From now on, all
// segment updates will be ignored.
self.segment_updater.kill();
let document_receiver = self.operation_receiver();
let document_receiver_res = self.operation_receiver();
// take the directory lock to create a new index_writer.
let directory_lock = self
@@ -579,7 +579,9 @@ impl IndexWriter {
//
// This will reach an end as the only document_sender
// was dropped with the index_writer.
for _ in document_receiver {}
if let Ok(document_receiver) = document_receiver_res {
for _ in document_receiver {}
}
Ok(self.committed_opstamp)
}

View File

@@ -22,7 +22,7 @@ impl IndexWriterStatus {
.receive_channel
.read()
.expect("This lock should never be poisoned");
rlock.as_ref().map(|receiver| receiver.clone())
rlock.as_ref().cloned()
}
/// Create an index writer bomb.

View File

@@ -19,9 +19,7 @@ impl<'a> Iterator for LayerCursor<'a> {
return None;
}
let (block_mut, remaining_mut) = (&mut self.block, &mut self.remaining);
if block_mut.deserialize(remaining_mut).is_err() {
return None;
}
block_mut.deserialize(remaining_mut).ok()?;
self.cursor = 0;
}
let res = Some(self.block.get(self.cursor));