[Rust tools] squash lots of warnings

This commit is contained in:
Joe Thornber 2020-12-01 11:50:32 +00:00
parent 327fc80fb0
commit 0e4622f337
5 changed files with 16 additions and 27 deletions

View File

@ -141,6 +141,7 @@ impl<V> Entries<V> {
//------------------------------------------
#[allow(dead_code)]
pub struct NodeSummary {
block: u64,
nr_entries: usize,
@ -251,7 +252,7 @@ impl<V: Unpack + Pack> Builder<V> {
// Add the entries individually
todo!();
},
n => {
_n => {
let actions = self.entries.complete();
for a in actions {
self.perform_action(a)?;

View File

@ -1,5 +1,5 @@
use fixedbitset::FixedBitSet;
use std::sync::{Arc, Mutex};
use std::sync::Arc;
use crate::checksum;
use crate::io_engine::*;
@ -23,11 +23,11 @@ pub trait LeafVisitor<V: Unpack> {
pub struct NoopLeafVisitor {}
impl<V: Unpack> LeafVisitor<V> for NoopLeafVisitor {
fn visit(&mut self, kr: &KeyRange, b: u64) -> Result<()> {
fn visit(&mut self, _kr: &KeyRange, _b: u64) -> Result<()> {
Ok(())
}
fn visit_again(&mut self, b: u64) -> Result<()> {
fn visit_again(&mut self, _b: u64) -> Result<()> {
Ok(())
}

View File

@ -1,10 +1,6 @@
use anyhow::{anyhow, Result};
use byteorder::{LittleEndian, WriteBytesExt};
use std::collections::VecDeque;
use std::io::Cursor;
use anyhow::Result;
use std::sync::{Arc, Mutex};
use crate::checksum;
use crate::io_engine::*;
use crate::pdata::btree;
use crate::pdata::btree::*;
@ -21,6 +17,7 @@ use crate::write_batcher::*;
// ii) Merge leaf nodes where they can be packed more efficiently (non destructively to original subtrees).
// iii) Build higher levels from scratch. There are very few of these internal nodes compared to leaves anyway.
#[allow(dead_code)]
struct NodeSummary {
block: u64,
nr_entries: usize,
@ -28,6 +25,7 @@ struct NodeSummary {
key_high: u64, // inclusive
}
#[allow(dead_code)]
struct LVInner {
last_key: Option<u64>,
leaves: Vec<NodeSummary>,
@ -52,10 +50,10 @@ impl<V: Unpack> NodeVisitor<V> for LeafVisitor {
fn visit(
&self,
path: &Vec<u64>,
kr: &KeyRange,
header: &NodeHeader,
_kr: &KeyRange,
_header: &NodeHeader,
keys: &[u64],
values: &[V],
_values: &[V],
) -> btree::Result<()> {
// ignore empty nodes
if keys.len() == 0 {
@ -85,7 +83,7 @@ impl<V: Unpack> NodeVisitor<V> for LeafVisitor {
Ok(())
}
fn visit_again(&self, path: &Vec<u64>, b: u64) -> btree::Result<()> {
fn visit_again(&self, _path: &Vec<u64>, _b: u64) -> btree::Result<()> {
Ok(())
}
@ -111,7 +109,7 @@ fn collect_leaves<V: Unpack>(engine: AEngine, roots: &[u64]) -> Result<Vec<NodeS
//------------------------------------------
fn optimise_leaves<V: Unpack + Pack>(
batcher: &mut WriteBatcher,
_batcher: &mut WriteBatcher,
lvs: Vec<NodeSummary>,
) -> Result<Vec<NodeSummary>> {
// FIXME: implement
@ -128,7 +126,7 @@ pub fn merge<V: Unpack + Pack>(
let lvs = collect_leaves::<V>(engine.clone(), roots)?;
let mut batcher = WriteBatcher::new(engine, sm, 256);
let lvs = optimise_leaves::<V>(&mut batcher, lvs)?;
let _lvs = optimise_leaves::<V>(&mut batcher, lvs)?;
todo!();
}

View File

@ -1,17 +1,8 @@
use anyhow::Result;
use std::collections::{BTreeMap, BTreeSet};
use std::path::Path;
use std::sync::{Arc, Mutex};
use std::sync::Arc;
use crate::io_engine::{AsyncIoEngine, IoEngine, SyncIoEngine};
use crate::pdata::btree::{self, *};
use crate::pdata::space_map::*;
use crate::pdata::unpack::*;
use crate::report::*;
use crate::thin::block_time::*;
use crate::thin::device_detail::*;
use crate::thin::superblock::*;
use crate::thin::xml::{self, MetadataVisitor};
//------------------------------------------
@ -24,7 +15,7 @@ pub struct ThinRestoreOptions<'a> {
//------------------------------------------
pub fn restore(opts: ThinRestoreOptions) -> Result<()> {
pub fn restore(_opts: ThinRestoreOptions) -> Result<()> {
todo!();
}

View File

@ -1,4 +1,3 @@
use anyhow::{anyhow, Result};
use std::collections::{BTreeMap, BTreeSet};
use std::mem;