diff --git a/src/main/rust/src/bin/rgk.rs b/src/main/rust/src/bin/rgk.rs index d8e3324..2842fb4 100644 --- a/src/main/rust/src/bin/rgk.rs +++ b/src/main/rust/src/bin/rgk.rs @@ -1,14 +1,18 @@ -use std::thread::available_parallelism; use clap::Parser; use colored::Colorize; use memmap2::Mmap; -use onebrc::implementations::rgk::{find_city_names, format, run_parallel, to_str, Args, Record, S}; +use onebrc::implementations::rgk::{ + find_city_names, format, run_parallel, to_str, Args, Record, S, +}; +use std::thread::available_parallelism; fn main() { let args = Args::parse(); let start = std::time::Instant::now(); - let filename = args.input.unwrap_or("../../../measurements.txt".to_string()); + let filename = args + .input + .unwrap_or("../../../measurements.txt".to_string()); let mmap: Mmap; let data; { @@ -84,4 +88,4 @@ fn main() { "total: {}", format!("{:>5.2?}", start.elapsed()).bold().green() ); -} \ No newline at end of file +} diff --git a/src/main/rust/src/implementations.rs b/src/main/rust/src/implementations.rs index e3d1da6..789d0ff 100644 --- a/src/main/rust/src/implementations.rs +++ b/src/main/rust/src/implementations.rs @@ -5,6 +5,6 @@ pub mod multi_threaded_smol; pub mod multi_threaded_structured; pub mod phcs; pub mod reference_impl; +pub mod rgk; pub mod single_thread; pub mod smol; -pub mod rgk; diff --git a/src/main/rust/src/implementations/libraries.rs b/src/main/rust/src/implementations/libraries.rs index 6bf54f2..b30b06e 100644 --- a/src/main/rust/src/implementations/libraries.rs +++ b/src/main/rust/src/implementations/libraries.rs @@ -1,10 +1,10 @@ use crate::models::station_measurements::StationMeasurements; use crate::utils::{hash, parse}; use memmap2::MmapOptions; +use rustc_hash::{FxBuildHasher, FxHashMap as HashMap}; use std::sync::mpsc; use std::time::Instant; use std::{fs::File, thread}; -use rustc_hash::{FxHashMap as HashMap, FxBuildHasher}; const DEFAULT_HASHMAP_LENGTH: usize = 10000; diff --git a/src/main/rust/src/implementations/rgk.rs b/src/main/rust/src/implementations/rgk.rs index 5d1b832..ace38e4 100644 --- a/src/main/rust/src/implementations/rgk.rs +++ b/src/main/rust/src/implementations/rgk.rs @@ -1,9 +1,9 @@ use ptr_hash::PtrHashParams; +use rustc_hash::FxHashSet; use std::{ simd::{cmp::SimdPartialEq, Simd}, vec::Vec, }; -use rustc_hash::FxHashSet; type V = i32; diff --git a/src/main/rust/src/utils/hash.rs b/src/main/rust/src/utils/hash.rs index a17fb02..b312376 100644 --- a/src/main/rust/src/utils/hash.rs +++ b/src/main/rust/src/utils/hash.rs @@ -37,4 +37,4 @@ mod tests { assert_ne!(hash_1, hash_2); assert_ne!(hash_3, hash_4); } -} \ No newline at end of file +}