emo/thin-provisioning-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #163 from mingnus/rust-cache-tools

Browse Source 
[cache (rust)] Fix merge conflicts
This commit is contained in:
Joe Thornber 2021-02-24 12:33:50 +00:00 committed by GitHub
commit 441a000c52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pdata/array_walker.rs
View File

@ -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(())
} }