Skip to content

Commit

Permalink
Fix warnings and spurious import (causing the code compiling only on …
Browse files Browse the repository at this point in the history
…linux).
  • Loading branch information
fxpineau committed Oct 14, 2024
1 parent c4f57bb commit 5ab172b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions src/nested/map/mom/impls/zvec.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use std::os::linux::raw::stat;
use std::{iter::Map, slice::Iter, vec::IntoIter};

use super::super::{
Expand Down Expand Up @@ -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>,
Expand Down Expand Up @@ -233,7 +233,7 @@ where
),
>,
{
struct DHZV<ZZ, VV> {
/*struct DHZV<ZZ, VV> {
d: u8,
h: ZZ,
z: ZZ,
Expand All @@ -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!()
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/nested/map/mom/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ use std::{
cmp::Ordering,
fmt::{Debug, Display},
mem,
ops::AddAssign,
};
use std::ops::AddAssign;

use num::PrimInt;

Expand Down
6 changes: 3 additions & 3 deletions src/nested/map/skymap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit 5ab172b

Please sign in to comment.