arnekeller/ripgrep-all
1
0
Fork 0
mirror of https://github.com/FliegendeWurst/ripgrep-all.git synced 2024-11-24 12:24:56 +00:00
Code Issues Projects Releases Wiki Activity

lol, i'm stupid

Browse Source
This commit is contained in:
phiresky 2019-06-07 00:41:41 +02:00
parent 2d20563e2c
commit 12383b0c21
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/adapters/tar.rs
View File

@ -33,16 +33,6 @@ impl GetMetadata for TarAdapter {
} }
} }
// make a &mut Read into a owned Read because the streaming decompressors want to take ownership of their base Reads
struct WrapRead<'a> {
inner: &'a mut dyn Read,
}
impl<'a> Read for WrapRead<'a> {
fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
self.inner.read(buf)
}
}
// feeling a little stupid here. why is this needed at all // feeling a little stupid here. why is this needed at all
enum SpecRead<R: Read> { enum SpecRead<R: Read> {
Gz(flate2::read::MultiGzDecoder<R>), Gz(flate2::read::MultiGzDecoder<R>),
@ -64,11 +54,10 @@ impl<R: Read> Read for SpecRead<R> {
} }
} }
// why do I need to wrap the output here in a specific type? is it possible with just a Box<Read> for every type? // why do I need to wrap the output here in a specific type? is it possible with just a Box<Read> for every type?
fn decompress_any<'a, R>(filename: &Path, inp: &'a mut R) -> Fallible<SpecRead<WrapRead<'a>>> fn decompress_any<'a, R>(filename: &Path, inp: &'a mut R) -> Fallible<SpecRead<&'a mut R>>
where where
R: Read, R: Read,
{ {
let inp = WrapRead { inner: inp };
let extension = filename.extension().map(|e| e.to_string_lossy().to_owned()); let extension = filename.extension().map(|e| e.to_string_lossy().to_owned());
match extension { match extension {
Some(e) => Ok(match e.to_owned().as_ref() { Some(e) => Ok(match e.to_owned().as_ref() {