1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
|
Description: Replace libflate with flate2
due to some errors in updating libflate.
Forwarded: not-needed
Last-Update: 2024-10-13
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -569,8 +569,8 @@
"tokio",
]
-[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies.libflate]
-version = "2.1"
+[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies.flate2]
+version = "1"
[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies.rustls]
version = "0.23"
--- a/tests/gzip.rs
+++ b/tests/gzip.rs
@@ -94,13 +94,13 @@
.into_iter()
.map(|i| format!("test {i}"))
.collect();
- let mut encoder = libflate::gzip::Encoder::new(Vec::new()).unwrap();
+ let mut encoder = flate2::write::GzEncoder::new(Vec::new(), flate2::Compression::default());
match encoder.write(content.as_bytes()) {
Ok(n) => assert!(n > 0, "Failed to write to encoder."),
_ => panic!("Failed to gzip encode string."),
};
- let gzipped_content = encoder.finish().into_result().unwrap();
+ let gzipped_content = encoder.finish().unwrap();
let mut response = format!(
"\
@@ -160,12 +160,12 @@
const RESPONSE_CONTENT: &str = "some message here";
fn gzip_compress(input: &[u8]) -> Vec<u8> {
- let mut encoder = libflate::gzip::Encoder::new(Vec::new()).unwrap();
+ let mut encoder = flate2::write::GzEncoder::new(Vec::new(), flate2::Compression::default());
match encoder.write(input) {
Ok(n) => assert!(n > 0, "Failed to write to encoder."),
_ => panic!("Failed to gzip encode string."),
};
- encoder.finish().into_result().unwrap()
+ encoder.finish().unwrap()
}
#[tokio::test]
--- a/tests/deflate.rs
+++ b/tests/deflate.rs
@@ -92,13 +92,13 @@
.into_iter()
.map(|i| format!("test {i}"))
.collect();
- let mut encoder = libflate::zlib::Encoder::new(Vec::new()).unwrap();
+ let mut encoder = flate2::write::ZlibEncoder::new(Vec::new(), flate2::Compression::default());
match encoder.write(content.as_bytes()) {
Ok(n) => assert!(n > 0, "Failed to write to encoder."),
_ => panic!("Failed to deflate encode string."),
};
- let deflated_content = encoder.finish().into_result().unwrap();
+ let deflated_content = encoder.finish().unwrap();
let mut response = format!(
"\
@@ -158,12 +158,12 @@
const RESPONSE_CONTENT: &str = "some message here";
fn deflate_compress(input: &[u8]) -> Vec<u8> {
- let mut encoder = libflate::zlib::Encoder::new(Vec::new()).unwrap();
+ let mut encoder = flate2::write::ZlibEncoder::new(Vec::new(), flate2::Compression::default());
match encoder.write(input) {
Ok(n) => assert!(n > 0, "Failed to write to encoder."),
_ => panic!("Failed to deflate encode string."),
};
- encoder.finish().into_result().unwrap()
+ encoder.finish().unwrap()
}
#[tokio::test]
|
