From 5ab172b4d1d206c973f9f170b14509f4982e0090 Mon Sep 17 00:00:00 2001 From: fxpineau Date: Mon, 14 Oct 2024 09:12:07 +0200 Subject: [PATCH] Fix warnings and spurious import (causing the code compiling only on linux). --- src/nested/map/mom/impls/zvec.rs | 8 ++++---- src/nested/map/mom/mod.rs | 2 +- src/nested/map/skymap.rs | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/nested/map/mom/impls/zvec.rs b/src/nested/map/mom/impls/zvec.rs index 105f7ff..a6352be 100644 --- a/src/nested/map/mom/impls/zvec.rs +++ b/src/nested/map/mom/impls/zvec.rs @@ -1,4 +1,3 @@ -use std::os::linux::raw::stat; use std::{iter::Map, slice::Iter, vec::IntoIter}; use super::super::{ @@ -205,7 +204,8 @@ where Self { depth, entries } } - fn merge<'s, L, R, S, O, M>(lhs: L, rhs: R, split: S, op: O, merge: M) -> Self + ///! WARNING: No yet implemented! + fn merge<'s, L, R, S, O, M>(_lhs: L, _rhs: R, _split: S, _op: O, _merge: M) -> Self where L: Mom<'s, ZUniqHType = Z, ValueType = V>, R: Mom<'s, ZUniqHType = Z, ValueType = V>, @@ -233,7 +233,7 @@ where ), >, { - struct DHZV { + /*struct DHZV { d: u8, h: ZZ, z: ZZ, @@ -247,7 +247,7 @@ where let mut it_left = lhs.owned_entries(); let mut it_right = rhs.owned_entries(); let mut left = it_left.next().map(zv_to_dhzv); - let mut right = it_right.next().map(zv_to_dhzv); + let mut right = it_right.next().map(zv_to_dhzv);*/ todo!() } } diff --git a/src/nested/map/mom/mod.rs b/src/nested/map/mom/mod.rs index fe8c645..032c324 100644 --- a/src/nested/map/mom/mod.rs +++ b/src/nested/map/mom/mod.rs @@ -8,8 +8,8 @@ use std::{ cmp::Ordering, fmt::{Debug, Display}, mem, + ops::AddAssign, }; -use std::ops::AddAssign; use num::PrimInt; diff --git a/src/nested/map/skymap.rs b/src/nested/map/skymap.rs index c37f619..b47a130 100644 --- a/src/nested/map/skymap.rs +++ b/src/nested/map/skymap.rs @@ -218,7 +218,7 @@ impl<'a, H: HHash, V: SkyMapValue + 'a> ImplicitSkyMapArrayRef<'a, H, V> { pub fn new(depth: u8, values: &'a [V]) -> Self { assert_eq!( n_hash(depth) as usize, - values.deref().len(), + values.len(), "Wrong implicit skymap size. Epecgted: {}. Actual: {}.", n_hash(depth), values.len() @@ -250,11 +250,11 @@ impl<'a, H: HHash, V: SkyMapValue + Clone + 'a> SkyMap<'a> for ImplicitSkyMapArr } fn get(&self, hash: Self::HashType) -> &Self::ValueType { - &self.values.deref()[hash.as_()] + &self.values[hash.as_()] } fn values(&'a self) -> Self::ValuesIt { - self.values.deref().iter() + self.values.iter() } fn entries(&'a self) -> Self::EntriesIt {