diff --git a/delorean_tsm/src/mapper.rs b/delorean_tsm/src/mapper.rs index 3b7acd1e6d..ee58dd6a8f 100644 --- a/delorean_tsm/src/mapper.rs +++ b/delorean_tsm/src/mapper.rs @@ -8,7 +8,7 @@ use tracing::warn; use std::collections::{BTreeMap, BTreeSet}; use std::fmt::{Display, Formatter}; use std::i64; -use std::io::{BufRead, Seek}; +use std::io::{Read, Seek}; use std::iter::Peekable; /// `TSMMeasurementMapper` takes a TSM reader and produces an iterator that @@ -21,7 +21,7 @@ use std::iter::Peekable; #[derive(Debug)] pub struct TSMMeasurementMapper where - R: BufRead + Seek, + R: Read + Seek, { iter: Peekable>, reader_idx: usize, @@ -29,7 +29,7 @@ where impl TSMMeasurementMapper where - R: BufRead + Seek, + R: Read + Seek, { pub fn new(iter: Peekable>, reader_idx: usize) -> Self { Self { iter, reader_idx } @@ -46,7 +46,7 @@ macro_rules! try_or_some { }; } -impl Iterator for TSMMeasurementMapper { +impl Iterator for TSMMeasurementMapper { type Item = Result; fn next(&mut self) -> Option { diff --git a/delorean_tsm/src/reader.rs b/delorean_tsm/src/reader.rs index 2b7eebe0fa..b9e03824cc 100644 --- a/delorean_tsm/src/reader.rs +++ b/delorean_tsm/src/reader.rs @@ -3,7 +3,7 @@ use super::*; use integer_encoding::VarInt; use std::collections::BTreeMap; -use std::io::{BufRead, Seek, SeekFrom}; +use std::io::{Read, Seek, SeekFrom}; use std::u64; /// `TSMIndexReader` allows you to read index data within a TSM file. @@ -48,7 +48,7 @@ use std::u64; #[derive(Debug)] pub struct TSMIndexReader where - R: BufRead + Seek, + R: Read + Seek, { r: R, @@ -61,7 +61,7 @@ where impl TSMIndexReader where - R: BufRead + Seek, + R: Read + Seek, { pub fn try_new(mut r: R, len: usize) -> Result { // determine offset to index, which is held in last 8 bytes of file. @@ -153,7 +153,7 @@ where } } -impl Iterator for TSMIndexReader { +impl Iterator for TSMIndexReader { type Item = Result; fn next(&mut self) -> Option { @@ -556,14 +556,14 @@ impl ValuePair { #[derive(Debug)] pub struct TSMBlockReader where - R: BufRead + Seek, + R: Read + Seek, { readers: Vec, } impl TSMBlockReader where - R: BufRead + Seek, + R: Read + Seek, { pub fn new(r: R) -> Self { Self { readers: vec![r] } @@ -576,7 +576,7 @@ where impl BlockDecoder for TSMBlockReader where - R: BufRead + Seek, + R: Read + Seek, { /// decode a block whose location is described by the provided /// `Block`.