Skip to content

Commit ab44ad3

Browse files
committed
Cargo fmt everything
1 parent 47a2e40 commit ab44ad3

File tree

15 files changed

+63
-53
lines changed

15 files changed

+63
-53
lines changed

benches/benchmark.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
use hannoy::{distances::Cosine, Database, Writer};
1+
use hannoy::distances::Cosine;
2+
use hannoy::{Database, Writer};
23
use heed::{Env, EnvOpenOptions, RwTxn};
3-
use rand::{rngs::StdRng, Rng, SeedableRng};
4+
use rand::rngs::StdRng;
5+
use rand::{Rng, SeedableRng};
46
use tempfile::tempdir;
57

68
static M: usize = 16;

benches/speed.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ use std::fs::OpenOptions;
33
use std::hint::black_box;
44
use std::io::Write;
55

6-
use hannoy::Reader;
7-
use hannoy::{distances::Cosine, Database, Writer};
6+
use hannoy::distances::Cosine;
7+
use hannoy::{Database, Reader, Writer};
88
use heed::{Env, EnvOpenOptions, RwTxn};
99
use hnsw_rs;
1010
use hnsw_rs::hnsw::Hnsw;
1111
use hnsw_rs::prelude::DistCosine;
12-
use rand::thread_rng;
13-
use rand::{rngs::StdRng, Rng, SeedableRng};
12+
use rand::rngs::StdRng;
13+
use rand::{thread_rng, Rng, SeedableRng};
1414
use tempfile::tempdir;
1515

1616
static M: usize = 16;

src/distance/hamming.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
use std::fmt;
22

3+
use bytemuck::{Pod, Zeroable};
4+
35
use crate::distance::Distance;
46
use crate::node::Item;
57
use crate::unaligned_vector::{Binary, UnalignedVector};
6-
use bytemuck::{Pod, Zeroable};
78

89
/// The Hamming distance between two vectors is the number of positions at
910
/// which the corresponding symbols are different.

src/error.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
use std::io;
22

3-
use crate::{key::Key, node_id::NodeMode, version::Version, ItemId, LayerId};
3+
use crate::key::Key;
4+
use crate::node_id::NodeMode;
5+
use crate::version::Version;
6+
use crate::{ItemId, LayerId};
47

58
/// The different set of errors that hannoy can encounter.
69
#[derive(Debug, thiserror::Error)]

src/hnsw.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,8 @@ impl<'a, D: Distance, const M: usize, const M0: usize> HnswBuilder<'a, D, M, M0>
173173

174174
level_groups.into_iter().try_for_each(|grp| {
175175
grp.into_par_iter().try_for_each(|&(item_id, lvl)| {
176-
if cancel_index.fetch_add(1, Relaxed).is_multiple_of(CANCELLATION_PROBING) && (self.cancel)()
176+
if cancel_index.fetch_add(1, Relaxed).is_multiple_of(CANCELLATION_PROBING)
177+
&& (self.cancel)()
177178
{
178179
Err(Error::BuildCancelled)
179180
} else {

src/node.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,11 +189,15 @@ impl fmt::Display for InvalidNodeDecoding {
189189

190190
#[cfg(test)]
191191
mod tests {
192-
use super::{Item, Links, Node, NodeCodec};
193-
use crate::{distance::Cosine, internals::UnalignedVector, Distance};
192+
use std::borrow::Cow;
193+
194194
use heed::{BytesDecode, BytesEncode};
195195
use roaring::RoaringBitmap;
196-
use std::borrow::Cow;
196+
197+
use super::{Item, Links, Node, NodeCodec};
198+
use crate::distance::Cosine;
199+
use crate::internals::UnalignedVector;
200+
use crate::Distance;
197201

198202
#[test]
199203
fn check_bytes_encode_decode() {

src/python.rs

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
//! Python bindings for hannoy.
2+
use std::path::PathBuf;
3+
use std::sync::LazyLock;
4+
25
use heed::{RoTxn, RwTxn, WithoutTls};
36
use once_cell::sync::OnceCell;
47
use parking_lot::{MappedMutexGuard, Mutex, MutexGuard};
5-
use pyo3::{
6-
exceptions::{PyIOError, PyRuntimeError},
7-
prelude::*,
8-
types::PyType,
9-
};
10-
use pyo3_stub_gen::{
11-
define_stub_info_gatherer,
12-
derive::{gen_stub_pyclass, gen_stub_pyclass_enum, gen_stub_pymethods},
13-
};
14-
use std::{path::PathBuf, sync::LazyLock};
8+
use pyo3::exceptions::{PyIOError, PyRuntimeError};
9+
use pyo3::prelude::*;
10+
use pyo3::types::PyType;
11+
use pyo3_stub_gen::define_stub_info_gatherer;
12+
use pyo3_stub_gen::derive::{gen_stub_pyclass, gen_stub_pyclass_enum, gen_stub_pymethods};
1513

1614
use crate::{distance, Database, ItemId, Reader, Writer};
1715
static DEFAULT_ENV_SIZE: usize = 1024 * 1024 * 1024; // 1GiB
@@ -257,7 +255,8 @@ pub(super) struct PyWriter {
257255

258256
impl PyWriter {
259257
fn build(&self) -> PyResult<()> {
260-
use rand::{rngs::StdRng, SeedableRng};
258+
use rand::rngs::StdRng;
259+
use rand::SeedableRng;
261260

262261
let mut rng = StdRng::seed_from_u64(42);
263262
let mut wtxn = get_rw_txn()?;

src/reader.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -410,14 +410,15 @@ impl<D: Distance> Reader<D> {
410410
index: u16,
411411
metadata: &Metadata,
412412
) -> Result<()> {
413-
use crate::unaligned_vector::UnalignedVectorCodec;
413+
use std::collections::VecDeque;
414+
use std::sync::atomic::{AtomicUsize, Ordering};
414415

415416
use heed::types::Bytes;
416417
use madvise::AccessPattern;
417-
use std::collections::VecDeque;
418-
use std::sync::atomic::{AtomicUsize, Ordering};
419418
use tracing::warn;
420419

420+
use crate::unaligned_vector::UnalignedVectorCodec;
421+
421422
let page_size = page_size::get();
422423
let mut available_memory: usize = std::env::var(READER_AVAILABLE_MEMORY)
423424
.ok()

src/spaces/simple_neon.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
#[cfg(target_feature = "neon")]
2-
use crate::unaligned_vector::UnalignedVector;
31
use std::arch::aarch64::*;
42
use std::ptr::read_unaligned;
53

4+
#[cfg(target_feature = "neon")]
5+
use crate::unaligned_vector::UnalignedVector;
6+
67
#[cfg(target_feature = "neon")]
78
pub(crate) unsafe fn euclid_similarity_neon(
89
v1: &UnalignedVector<f32>,

src/tests/fuzz.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
use crate::{
2-
distance::Cosine,
3-
tests::{create_database_indices_with_items, DatabaseHandle},
4-
Database, Reader, Writer,
5-
};
61
use arbitrary::{Arbitrary, Unstructured};
72
use heed::RoTxn;
8-
use rand::{self, rngs::StdRng, Rng, SeedableRng};
3+
use rand::rngs::StdRng;
4+
use rand::{self, Rng, SeedableRng};
95
use roaring::RoaringBitmap;
106
use tracing::info;
117

8+
use crate::distance::Cosine;
9+
use crate::tests::{create_database_indices_with_items, DatabaseHandle};
10+
use crate::{Database, Reader, Writer};
11+
1212
#[derive(Debug)]
1313
struct Item<const M: usize> {
1414
id: u32,

0 commit comments

Comments
 (0)