[cache (rust)] Fix merge conflicts
This commit is contained in:
parent
a4ba01cacd
commit
a7ecfba2b4
@ -55,7 +55,7 @@ impl<V: Unpack + Copy> NodeVisitor<ArrayBlockEntry> for BlockValueVisitor<V> {
|
|||||||
// FIXME: return errors
|
// FIXME: return errors
|
||||||
fn visit(
|
fn visit(
|
||||||
&self,
|
&self,
|
||||||
path: &Vec<u64>,
|
path: &[u64],
|
||||||
_kr: &KeyRange,
|
_kr: &KeyRange,
|
||||||
_h: &NodeHeader,
|
_h: &NodeHeader,
|
||||||
keys: &[u64],
|
keys: &[u64],
|
||||||
@ -71,7 +71,7 @@ impl<V: Unpack + Copy> NodeVisitor<ArrayBlockEntry> for BlockValueVisitor<V> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// FIXME: stub
|
// FIXME: stub
|
||||||
fn visit_again(&self, _path: &Vec<u64>, _b: u64) -> Result<()> {
|
fn visit_again(&self, _path: &[u64], _b: u64) -> Result<()> {
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user