diff --git a/src/shrink/copier.rs b/src/shrink/copier.rs index 83e3c51..ef04a02 100644 --- a/src/shrink/copier.rs +++ b/src/shrink/copier.rs @@ -43,7 +43,7 @@ where Ok(()) } -pub fn copy(path: &str, regions: &Vec) -> Result<()> { +pub fn copy(path: &str, regions: &[Region]) -> Result<()> { let mut input = OpenOptions::new() .read(true) .write(true) diff --git a/src/shrink/toplevel.rs b/src/shrink/toplevel.rs index 796110e..2717631 100644 --- a/src/shrink/toplevel.rs +++ b/src/shrink/toplevel.rs @@ -1,5 +1,5 @@ use anyhow::Result; -use fixedbitset::{FixedBitSet}; +use fixedbitset::FixedBitSet; use std::fs::OpenOptions; use std::io::Write; use std::os::unix::fs::OpenOptionsExt; @@ -163,7 +163,7 @@ fn bits_to_ranges(bits: &FixedBitSet) -> Vec { // Splits the ranges into those below threshold, and those equal or // above threshold below threshold, and those equal or above threshold -fn ranges_split(ranges: &Vec, threshold: u64) -> (Vec, Vec) { +fn ranges_split(ranges: &[BlockRange], threshold: u64) -> (Vec, Vec) { use std::ops::Range; let mut below = Vec::new(); @@ -181,7 +181,7 @@ fn ranges_split(ranges: &Vec, threshold: u64) -> (Vec, V (below, above) } -fn negate_ranges(ranges: &Vec) -> Vec { +fn negate_ranges(ranges: &[BlockRange]) -> Vec { use std::ops::Range; let mut result = Vec::new(); @@ -206,8 +206,8 @@ fn range_len(r: &BlockRange) -> u64 { r.end - r.start } -fn ranges_total(rs: &Vec) -> u64 { - rs.into_iter().fold(0, |sum, r| sum + range_len(r)) +fn ranges_total(rs: &[BlockRange]) -> u64 { + rs.iter().fold(0, |sum, r| sum + range_len(r)) } // Assumes there is enough space to remap. @@ -261,8 +261,8 @@ fn overlaps(r1: &BlockRange, r2: &BlockRange, index: usize) -> Option { } // Finds the index of the first entry that overlaps r. -fn find_first(r: &BlockRange, remaps: &Vec<(BlockRange, BlockRange)>) -> Option { - if remaps.len() == 0 { +fn find_first(r: &BlockRange, remaps: &[(BlockRange, BlockRange)]) -> Option { + if remaps.is_empty() { return None; } @@ -292,7 +292,7 @@ fn is_empty(r: &BlockRange) -> bool { } // remaps must be in sorted order by from.start. -fn remap(r: &BlockRange, remaps: &Vec<(BlockRange, BlockRange)>) -> Vec { +fn remap(r: &BlockRange, remaps: &[(BlockRange, BlockRange)]) -> Vec { let mut remap = Vec::new(); let mut r = r.start..r.end; @@ -408,7 +408,7 @@ mod tests { } } -fn build_copy_regions(remaps: &Vec<(BlockRange, BlockRange)>, block_size: u64) -> Vec { +fn build_copy_regions(remaps: &[(BlockRange, BlockRange)], block_size: u64) -> Vec { let mut rs = Vec::new(); for (from, to) in remaps { diff --git a/src/shrink/xml.rs b/src/shrink/xml.rs index 46c3f3b..5c4999d 100644 --- a/src/shrink/xml.rs +++ b/src/shrink/xml.rs @@ -66,7 +66,7 @@ fn mk_attr_<'a, T: Display>(n: T) -> Cow<'a, [u8]> { Cow::Owned(str.into_bytes()) } -fn mk_attr<'a, T: Display>(key: &[u8], value: T) -> Attribute { +fn mk_attr(key: &[u8], value: T) -> Attribute { Attribute { key, value: mk_attr_(value),