Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit7145603

Browse files
authored
Merge pull request#492 from Shnatsel/simd-adler32
Switch from adler2 to simd-adler32 crate when using miniz_oxide backend
2 parentsa9d220a +1ce62d7 commit7145603

File tree

11 files changed

+30
-30
lines changed

11 files changed

+30
-30
lines changed

‎Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ libz-ng-sys = { version = "1.1.16", optional = true }
2424
# this matches the default features, but we don't want to depend on the default features staying the same
2525
libz-rs-sys = {version ="0.5.1",optional =true,default-features =false,features = ["std","rust-allocator"] }
2626
cloudflare-zlib-sys = {version ="0.3.5",optional =true }
27-
miniz_oxide = {version ="0.8.5",optional =true,default-features =false,features = ["with-alloc"] }
27+
miniz_oxide = {version ="0.8.5",optional =true,default-features =false,features = ["with-alloc","simd"] }
2828
crc32fast ="1.2.0"
2929

3030
[target.'cfg(all(target_arch="wasm32",not(target_os="emscripten")))'.dependencies]
31-
miniz_oxide = {version ="0.8.5",default-features =false,features = ["with-alloc"] }
31+
miniz_oxide = {version ="0.8.5",default-features =false,features = ["with-alloc","simd"] }
3232

3333
[dev-dependencies]
3434
rand ="0.9"

‎examples/decompress_file.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ fn main() {
1717
let start =Instant::now();
1818
letmut decoder = bufread::GzDecoder::new(input);
1919
copy(&mut decoder,&mut output).unwrap();
20-
println!("Source len: {:?}", source_len);
20+
println!("Source len: {source_len:?}");
2121
println!("Target len: {:?}", output.metadata().unwrap().len());
2222
println!("Elapsed: {:?}", start.elapsed());
2323
}

‎src/deflate/bufread.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ mod test {
264264

265265
let compressed ={
266266
letmut e = write::DeflateEncoder::new(Vec::new(),Compression::default());
267-
e.write(expected.as_ref()).unwrap();
267+
e.write_all(expected.as_ref()).unwrap();
268268
letmut b = e.finish().unwrap();
269269
b.push(b'x');
270270
b

‎src/deflate/write.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ mod tests {
342342
fndecode_extra_data(){
343343
let compressed ={
344344
letmut e =DeflateEncoder::new(Vec::new(),Compression::default());
345-
e.write(STR.as_ref()).unwrap();
345+
e.write_all(STR.as_ref()).unwrap();
346346
letmut b = e.finish().unwrap();
347347
b.push(b'x');
348348
b

‎src/gz/bufread.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ mod test {
449449

450450
let compressed ={
451451
letmut e = write::GzEncoder::new(Vec::new(),Compression::default());
452-
e.write(expected.as_ref()).unwrap();
452+
e.write_all(expected.as_ref()).unwrap();
453453
letmut b = e.finish().unwrap();
454454
b.push(b'x');
455455
b

‎src/gz/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ mod tests {
512512
if c&1 !=0{
513513
c =0xedb88320 ^(c >>1);
514514
}else{
515-
c= c >>1;
515+
c>>=1;
516516
}
517517
}
518518
crc.crc_table[n] = c;
@@ -551,7 +551,7 @@ mod tests {
551551
.into_header(Compression::fast());
552552

553553
// Add a CRC to the header
554-
header[3]= header[3] ^super::FHCRC;
554+
header[3]^=super::FHCRC;
555555
let rfc1952_crc =Rfc1952Crc::new();
556556
let crc32 = rfc1952_crc.crc(&header);
557557
let crc16 = crc32asu16;
@@ -574,7 +574,7 @@ mod tests {
574574

575575
#[test]
576576
fnfields(){
577-
let r =vec![0,2,4,6];
577+
let r =[0,2,4,6];
578578
let e =GzBuilder::new()
579579
.filename("foo.rs")
580580
.comment("bar")

‎src/gz/read.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -316,16 +316,16 @@ mod tests {
316316
}
317317

318318
pubfnset_position(&mutself,pos:u64){
319-
returnself.cursor.set_position(pos);
319+
self.cursor.set_position(pos)
320320
}
321321
}
322322

323323
implWriteforBlockingCursor{
324324
fnwrite(&mutself,buf:&[u8]) ->Result<usize>{
325-
returnself.cursor.write(buf);
325+
self.cursor.write(buf)
326326
}
327327
fnflush(&mutself) ->Result<()>{
328-
returnself.cursor.flush();
328+
self.cursor.flush()
329329
}
330330
}
331331

@@ -345,7 +345,7 @@ mod tests {
345345
}
346346
Ok(_n) =>{}
347347
}
348-
return r;
348+
r
349349
}
350350
}
351351

‎src/gz/write.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -477,13 +477,13 @@ mod tests {
477477
#[test]
478478
fndecode_writer_one_chunk(){
479479
letmut e =GzEncoder::new(Vec::new(),Compression::default());
480-
e.write(STR.as_ref()).unwrap();
480+
e.write_all(STR.as_ref()).unwrap();
481481
let bytes = e.finish().unwrap();
482482

483483
letmut writer =Vec::new();
484484
letmut decoder =GzDecoder::new(writer);
485485
let n = decoder.write(&bytes[..]).unwrap();
486-
decoder.write(&bytes[n..]).unwrap();
486+
decoder.write_all(&bytes[n..]).unwrap();
487487
decoder.try_finish().unwrap();
488488
writer = decoder.finish().unwrap();
489489
let return_string =String::from_utf8(writer).expect("String parsing error");
@@ -493,15 +493,15 @@ mod tests {
493493
#[test]
494494
fndecode_writer_partial_header(){
495495
letmut e =GzEncoder::new(Vec::new(),Compression::default());
496-
e.write(STR.as_ref()).unwrap();
496+
e.write_all(STR.as_ref()).unwrap();
497497
let bytes = e.finish().unwrap();
498498

499499
letmut writer =Vec::new();
500500
letmut decoder =GzDecoder::new(writer);
501501
assert_eq!(decoder.write(&bytes[..5]).unwrap(),5);
502502
let n = decoder.write(&bytes[5..]).unwrap();
503503
if n < bytes.len() -5{
504-
decoder.write(&bytes[n +5..]).unwrap();
504+
decoder.write_all(&bytes[n +5..]).unwrap();
505505
}
506506
writer = decoder.finish().unwrap();
507507
let return_string =String::from_utf8(writer).expect("String parsing error");
@@ -522,7 +522,7 @@ mod tests {
522522
assert_eq!(decoder.write(&bytes[..12]).unwrap(),12);
523523
let n = decoder.write(&bytes[12..]).unwrap();
524524
if n < bytes.len() -12{
525-
decoder.write(&bytes[n +12..]).unwrap();
525+
decoder.write_all(&bytes[n +12..]).unwrap();
526526
}
527527
assert_eq!(
528528
decoder.header().unwrap().filename().unwrap(),
@@ -547,7 +547,7 @@ mod tests {
547547
assert_eq!(decoder.write(&bytes[..12]).unwrap(),12);
548548
let n = decoder.write(&bytes[12..]).unwrap();
549549
if n < bytes.len() -12{
550-
decoder.write(&bytes[n +12..]).unwrap();
550+
decoder.write_all(&bytes[n +12..]).unwrap();
551551
}
552552
assert_eq!(
553553
decoder.header().unwrap().comment().unwrap(),
@@ -561,13 +561,13 @@ mod tests {
561561
#[test]
562562
fndecode_writer_exact_header(){
563563
letmut e =GzEncoder::new(Vec::new(),Compression::default());
564-
e.write(STR.as_ref()).unwrap();
564+
e.write_all(STR.as_ref()).unwrap();
565565
let bytes = e.finish().unwrap();
566566

567567
letmut writer =Vec::new();
568568
letmut decoder =GzDecoder::new(writer);
569569
assert_eq!(decoder.write(&bytes[..10]).unwrap(),10);
570-
decoder.write(&bytes[10..]).unwrap();
570+
decoder.write_all(&bytes[10..]).unwrap();
571571
writer = decoder.finish().unwrap();
572572
let return_string =String::from_utf8(writer).expect("String parsing error");
573573
assert_eq!(return_string,STR);
@@ -576,14 +576,14 @@ mod tests {
576576
#[test]
577577
fndecode_writer_partial_crc(){
578578
letmut e =GzEncoder::new(Vec::new(),Compression::default());
579-
e.write(STR.as_ref()).unwrap();
579+
e.write_all(STR.as_ref()).unwrap();
580580
let bytes = e.finish().unwrap();
581581

582582
letmut writer =Vec::new();
583583
letmut decoder =GzDecoder::new(writer);
584584
let l = bytes.len() -5;
585585
let n = decoder.write(&bytes[..l]).unwrap();
586-
decoder.write(&bytes[n..]).unwrap();
586+
decoder.write_all(&bytes[n..]).unwrap();
587587
writer = decoder.finish().unwrap();
588588
let return_string =String::from_utf8(writer).expect("String parsing error");
589589
assert_eq!(return_string,STR);
@@ -594,7 +594,7 @@ mod tests {
594594
#[test]
595595
fndecode_multi_writer(){
596596
letmut e =GzEncoder::new(Vec::new(),Compression::default());
597-
e.write(STR.as_ref()).unwrap();
597+
e.write_all(STR.as_ref()).unwrap();
598598
let bytes = e.finish().unwrap().repeat(2);
599599

600600
letmut writer =Vec::new();
@@ -617,7 +617,7 @@ mod tests {
617617
fndecode_extra_data(){
618618
let compressed ={
619619
letmut e =GzEncoder::new(Vec::new(),Compression::default());
620-
e.write(STR.as_ref()).unwrap();
620+
e.write_all(STR.as_ref()).unwrap();
621621
letmut b = e.finish().unwrap();
622622
b.push(b'x');
623623
b

‎src/mem.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ impl fmt::Display for DecompressError {
543543
DecompressErrorInner::NeedsDictionary{ ..} =>Some("requires a dictionary"),
544544
};
545545
match msg{
546-
Some(msg) =>write!(f,"deflate decompression error: {}", msg),
546+
Some(msg) =>write!(f,"deflate decompression error: {msg}"),
547547
None =>write!(f,"deflate decompression error"),
548548
}
549549
}
@@ -567,7 +567,7 @@ impl From<CompressError> for io::Error {
567567
impl fmt::DisplayforCompressError{
568568
fnfmt(&self,f:&mut fmt::Formatter) -> fmt::Result{
569569
matchself.msg.get(){
570-
Some(msg) =>write!(f,"deflate compression error: {}", msg),
570+
Some(msg) =>write!(f,"deflate compression error: {msg}"),
571571
None =>write!(f,"deflate compression error"),
572572
}
573573
}
@@ -608,7 +608,7 @@ mod tests {
608608

609609
#[test]
610610
fnissue51(){
611-
let data =vec![
611+
let data =[
612612
0x1f,0x8b,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0xb3,0xc9,0x28,0xc9,
613613
0xcd,0xb1,0xe3,0xe5,0xb2,0xc9,0x48,0x4d,0x4c,0xb1,0xb3,0x29,0xc9,0x2c,
614614
0xc9,0x49,0xb5,0x33,0x31,0x30,0x51,0xf0,0xcb,0x2f,0x51,0x70,0xcb,0x2f,

‎src/zlib/bufread.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ mod test {
272272

273273
let compressed ={
274274
letmut e = write::ZlibEncoder::new(Vec::new(),Compression::default());
275-
e.write(expected.as_ref()).unwrap();
275+
e.write_all(expected.as_ref()).unwrap();
276276
letmut b = e.finish().unwrap();
277277
b.push(b'x');
278278
b

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp