From 1acfb2ebb56ae33c58abd059450849c83cf74f33 Mon Sep 17 00:00:00 2001 From: Paul Masurel Date: Wed, 23 Jan 2019 10:21:39 +0900 Subject: [PATCH] cargo fmt --- src/core/index.rs | 2 +- src/indexer/index_writer.rs | 3 +-- src/indexer/segment_updater.rs | 31 +++++++++++++------------------ src/indexer/stamper.rs | 6 ++---- 4 files changed, 17 insertions(+), 25 deletions(-) diff --git a/src/core/index.rs b/src/core/index.rs index 3cf3657e9..005746cf2 100644 --- a/src/core/index.rs +++ b/src/core/index.rs @@ -150,7 +150,7 @@ impl Index { /// /// This will overwrite existing meta.json fn from_directory(mut directory: ManagedDirectory, schema: Schema) -> Result { - save_new_metas(schema.clone(), directory.borrow_mut())?; + save_new_metas(schema.clone(), directory.borrow_mut())?; let metas = IndexMeta::with_schema(schema); Index::create_from_metas(directory, &metas) } diff --git a/src/indexer/index_writer.rs b/src/indexer/index_writer.rs index 0e7d14ed1..2f0625217 100644 --- a/src/indexer/index_writer.rs +++ b/src/indexer/index_writer.rs @@ -557,8 +557,7 @@ impl IndexWriter { // and recreate a new one channels. self.recreate_document_channel(); - let former_workers_join_handle = - mem::replace(&mut self.workers_join_handle, Vec::new()); + let former_workers_join_handle = mem::replace(&mut self.workers_join_handle, Vec::new()); for worker_handle in former_workers_join_handle { let indexing_worker_result = worker_handle diff --git a/src/indexer/segment_updater.rs b/src/indexer/segment_updater.rs index 13b1f33c0..ac2930529 100644 --- a/src/indexer/segment_updater.rs +++ b/src/indexer/segment_updater.rs @@ -50,9 +50,10 @@ pub fn save_new_metas(schema: Schema, directory: &mut Directory) -> Result<()> { segments: Vec::new(), schema, opstamp: 0u64, - payload: None + payload: None, }, - directory) + directory, + ) } /// Save the index meta file. @@ -64,16 +65,13 @@ pub fn save_new_metas(schema: Schema, directory: &mut Directory) -> Result<()> { /// and flushed. /// /// This method is not part of tantivy's public API -fn save_metas( - metas: &IndexMeta, - directory: &mut Directory, -) -> Result<()> { -// let metas = IndexMeta { -// segments: segment_metas, -// schema, -// opstamp, -// payload, -// }; +fn save_metas(metas: &IndexMeta, directory: &mut Directory) -> Result<()> { + // let metas = IndexMeta { + // segments: segment_metas, + // schema, + // opstamp, + // payload, + // }; let mut buffer = serde_json::to_vec_pretty(metas)?; writeln!(&mut buffer)?; directory.atomic_write(&META_FILEPATH, &buffer[..])?; @@ -265,13 +263,10 @@ impl SegmentUpdater { segments: commited_segment_metas, schema: index.schema(), opstamp, - payload: commit_message + payload: commit_message, }; - save_metas( - &index_meta, - directory.box_clone().borrow_mut(), - ) - .expect("Could not save metas."); + save_metas(&index_meta, directory.box_clone().borrow_mut()) + .expect("Could not save metas."); self.store_meta(&index_meta); } } diff --git a/src/indexer/stamper.rs b/src/indexer/stamper.rs index f3fd1f943..7713e6c75 100644 --- a/src/indexer/stamper.rs +++ b/src/indexer/stamper.rs @@ -1,6 +1,5 @@ -use std::sync::Arc; use std::sync::atomic::Ordering; - +use std::sync::Arc; // AtomicU64 have not landed in stable. // For the moment let's just use AtomicUsize on @@ -27,9 +26,9 @@ mod archicture_impl { #[cfg(not(target_arch = "x86_64"))] mod archicture_impl { + use std::sync::atomic::Ordering; /// Under other architecture, we rely on a mutex. use std::sync::Mutex; - use std::sync::atomic::Ordering; #[derive(Default)] pub struct AtomicU64Ersatz(Mutex); @@ -63,7 +62,6 @@ impl Stamper { } } - #[cfg(test)] mod test {