Skip to content

Commit

Permalink
Merge pull request #50 from RazrFalcon/rm-byteorder
Browse files Browse the repository at this point in the history
Remove byteorder dependency.
  • Loading branch information
oyvindln authored Jan 11, 2021
2 parents 97caaf2 + d289ab1 commit d217fbd
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 13 deletions.
1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ exclude = [

[dependencies]
adler32 = "1.0.4"
byteorder = "1"
gzip-header = { version = "0.3", optional = true }

[dev-dependencies]
Expand Down
7 changes: 1 addition & 6 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ extern crate test as test_std;
extern crate miniz_oxide;

extern crate adler32;
extern crate byteorder;
#[cfg(feature = "gzip")]
extern crate gzip_header;

Expand Down Expand Up @@ -87,9 +86,6 @@ mod zlib;
use std::io;
use std::io::Write;

use byteorder::BigEndian;
#[cfg(feature = "gzip")]
use byteorder::LittleEndian;
#[cfg(feature = "gzip")]
use gzip_header::Crc;
#[cfg(feature = "gzip")]
Expand Down Expand Up @@ -184,7 +180,6 @@ pub fn deflate_bytes(input: &[u8]) -> Vec<u8> {
/// # let _ = compressed_data;
/// ```
pub fn deflate_bytes_zlib_conf<O: Into<CompressionOptions>>(input: &[u8], options: O) -> Vec<u8> {
use byteorder::WriteBytesExt;
let mut writer = Vec::with_capacity(input.len() / 3);
// Write header
zlib::write_zlib_header(&mut writer, zlib::CompressionLevel::Default)
Expand All @@ -197,7 +192,7 @@ pub fn deflate_bytes_zlib_conf<O: Into<CompressionOptions>>(input: &[u8], option
let hash = checksum.current_hash();

writer
.write_u32::<BigEndian>(hash)
.write(&hash.to_be_bytes())
.expect("Write error when writing checksum!");
writer
}
Expand Down
5 changes: 2 additions & 3 deletions src/stored_block.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
use crate::bitstream::LsbWriter;
use byteorder::{LittleEndian, WriteBytesExt};
use std::io;
use std::io::Write;
use std::u16;
Expand Down Expand Up @@ -33,9 +32,9 @@ pub fn compress_block_stored<W: Write>(input: &[u8], writer: &mut W) -> io::Resu
};
// The header is written before this function.
// The next two bytes indicates the length
writer.write_u16::<LittleEndian>(input.len() as u16)?;
writer.write(&(input.len() as u16).to_le_bytes())?;
// the next two after the length is the ones complement of the length
writer.write_u16::<LittleEndian>(!input.len() as u16)?;
writer.write(&(!input.len() as u16).to_le_bytes())?;
// After this the data is written directly with no compression
writer.write(input)
}
Expand Down
6 changes: 3 additions & 3 deletions src/writer.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
use std::io::Write;
use std::{io, thread};

use byteorder::{BigEndian, WriteBytesExt};

use crate::checksum::{Adler32Checksum, RollingChecksum};
use crate::compress::compress_data_dynamic_n;
use crate::compress::Flush;
Expand Down Expand Up @@ -241,7 +239,9 @@ impl<W: Write> ZlibEncoder<W> {
.inner
.as_mut()
.expect(ERR_STR)
.write_u32::<BigEndian>(hash)
.write(&hash.to_be_bytes())?;

Ok(())
}

/// Return the adler32 checksum of the currently consumed data.
Expand Down

0 comments on commit d217fbd

Please sign in to comment.