Use generic types

src/scripts/bgi/archive/dsc.rs

@@ -51,7 +51,7 @@ struct HuffmanNode {
 }
 
 pub struct DscDecoder<'a> {
-    stream: MsbBitStream<'a>,
+    stream: MsbBitStream<MemReaderRef<'a>>,
     key: u32,
     magic: u32,
     output_size: u32,

src/scripts/bgi/image/cbg.rs

@@ -166,7 +166,7 @@ impl Script for BgiCBG {
 }
 
 struct CbgDecoder<'a> {
-    stream: MsbBitStream<'a>,
+    stream: MsbBitStream<MemReaderRef<'a>>,
     info: &'a BgiCBGHeader,
     color_type: CbgColorType,
     key: u32,
@@ -568,7 +568,7 @@ impl HuffmanTree {
         Self { nodes }
     }
 
-    fn decode_token(&self, stream: &mut MsbBitStream<'_>) -> Result<usize> {
+    fn decode_token(&self, stream: &mut MsbBitStream<MemReaderRef<'_>>) -> Result<usize> {
         let mut node_index = self.nodes.len() - 1;
         loop {
             let bit = stream.get_next_bit()?;

src/scripts/escude/lzw.rs

@@ -4,7 +4,7 @@ use anyhow::Result;
 use std::io::Write;
 
 pub struct LZWDecoder<'a> {
-    m_input: MsbBitStream<'a>,
+    m_input: MsbBitStream<MemReaderRef<'a>>,
     m_output_size: u32,
 }
 

src/utils/bit_stream.rs

@@ -1,15 +1,15 @@
 use crate::ext::io::*;
 use anyhow::Result;
-use std::io::Write;
+use std::io::{Read, Write};
 
-pub struct MsbBitStream<'a> {
+pub struct MsbBitStream<T: Read> {
-    pub m_input: MemReaderRef<'a>,
+    pub m_input: T,
     m_bits: u32,
     pub m_cached_bits: u32,
 }
 
-impl<'a> MsbBitStream<'a> {
+impl<T: Read> MsbBitStream<T> {
-    pub fn new(input: MemReaderRef<'a>) -> Self {
+    pub fn new(input: T) -> Self {
         MsbBitStream {
             m_input: input,
             m_bits: 0,