From 1534be3ece2b7b9860e78a8f510b854d8108f506 Mon Sep 17 00:00:00 2001 From: Samuel Colvin Date: Mon, 9 Sep 2024 16:30:47 +0100 Subject: [PATCH] fix linting --- crates/fuzz/fuzz_targets/compare_to_serde.rs | 2 +- crates/jiter/src/lazy_index_map.rs | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/crates/fuzz/fuzz_targets/compare_to_serde.rs b/crates/fuzz/fuzz_targets/compare_to_serde.rs index 53aad19..900932e 100644 --- a/crates/fuzz/fuzz_targets/compare_to_serde.rs +++ b/crates/fuzz/fuzz_targets/compare_to_serde.rs @@ -30,7 +30,7 @@ pub fn values_equal(jiter_value: &JiterValue, serde_value: &SerdeValue) -> bool if o1.len() != o2.len() { return false; } - for (k1, v1) in o1.iter_unique() { + for (k1, v1) in o1.iter() { if let Some(v2) = o2.get::(k1.as_ref()) { if !values_equal(v1, v2) { return false; diff --git a/crates/jiter/src/lazy_index_map.rs b/crates/jiter/src/lazy_index_map.rs index 31324c7..3c439cb 100644 --- a/crates/jiter/src/lazy_index_map.rs +++ b/crates/jiter/src/lazy_index_map.rs @@ -1,13 +1,10 @@ use std::borrow::{Borrow, Cow}; -use std::cell::Cell; use std::fmt; -use std::hash::{DefaultHasher, Hash, Hasher}; -use std::mem::MaybeUninit; +use std::hash::Hash; use std::slice::Iter as SliceIter; -use std::sync::atomic::{AtomicU16, AtomicUsize, Ordering}; +use std::sync::atomic::AtomicU16; use ahash::RandomState; -use bitvec::order::Lsb0; use indexmap::IndexMap; /// Like [IndexMap](https://docs.rs/indexmap/latest/indexmap/) but only builds the lookup map when it's needed. @@ -144,9 +141,13 @@ where } mod index_map_vec { - use std::sync::atomic::AtomicU16; + use bitvec::order::Lsb0; + use std::borrow::{Borrow, Cow}; + use std::hash::{DefaultHasher, Hash, Hasher}; + use std::mem::MaybeUninit; + use std::sync::atomic::{AtomicU16, AtomicUsize, Ordering}; - use super::*; + use super::HASHMAP_THRESHOLD; pub(super) struct LazyIndexMapArray { data: Box<[MaybeUninit<(K, V)>; HASHMAP_THRESHOLD]>, @@ -334,7 +335,7 @@ impl<'a, K, V> Iterator for LazyIndexMapIter<'a, K, V> { fn next(&mut self) -> Option { match self { LazyIndexMapIter::Vec { iter, mask } => { - while let Some((k, v)) = iter.next() { + for (k, v) in iter.by_ref() { let is_not_duplicate = mask.next().expect("mask covers array length"); if is_not_duplicate { return Some((k, v));