@@ -22,7 +22,7 @@ pub(crate) mod util;
22
22
pub ( crate ) enum Compressor {
23
23
Deflate ( DeflateEncoder ) ,
24
24
Gzip ( GzipEncoder ) ,
25
- Brotli ( BrotliEncoder ) ,
25
+ Brotli ( Box < BrotliEncoder > ) ,
26
26
Zstd ( ZstdEncoder ) ,
27
27
}
28
28
@@ -41,9 +41,9 @@ impl Compressor {
41
41
}
42
42
// FIXME: find the "fast" brotli encoder params
43
43
"br" => {
44
- return Some ( Compressor :: Brotli ( BrotliEncoder :: new (
44
+ return Some ( Compressor :: Brotli ( Box :: new ( BrotliEncoder :: new (
45
45
BrotliEncoderParams :: default ( ) ,
46
- ) ) )
46
+ ) ) ) )
47
47
}
48
48
"zstd" => {
49
49
return Some ( Compressor :: Zstd ( ZstdEncoder :: new ( zstd_safe:: min_c_level ( ) ) ) )
@@ -74,7 +74,7 @@ where {
74
74
while let Some ( data) = stream. next ( ) . await {
75
75
match data {
76
76
Err ( e) => {
77
- if let Err ( _ ) = tx. send ( Err ( e. into ( ) ) ) . await {
77
+ if ( tx. send ( Err ( e. into ( ) ) ) . await ) . is_err ( ) {
78
78
return ;
79
79
}
80
80
}
@@ -87,12 +87,9 @@ where {
87
87
let mut partial_output = PartialBuffer :: new ( & mut buf) ;
88
88
partial_output. advance ( written) ;
89
89
90
- match self . encode ( & mut partial_input, & mut partial_output) {
91
- Err ( e) => {
92
- let _ = tx. send ( Err ( e. into ( ) ) ) . await ;
93
- return ;
94
- }
95
- Ok ( ( ) ) => { }
90
+ if let Err ( e) = self . encode ( & mut partial_input, & mut partial_output) {
91
+ let _ = tx. send ( Err ( e. into ( ) ) ) . await ;
92
+ return ;
96
93
}
97
94
98
95
written += partial_output. written ( ) . len ( ) ;
@@ -114,7 +111,7 @@ where {
114
111
let len = partial_output. written ( ) . len ( ) ;
115
112
let _ = partial_output. into_inner ( ) ;
116
113
buf. resize ( len, 0 ) ;
117
- if let Err ( _ ) = tx. send ( Ok ( buf. freeze ( ) ) ) . await {
114
+ if ( tx. send ( Ok ( buf. freeze ( ) ) ) . await ) . is_err ( ) {
118
115
return ;
119
116
}
120
117
break ;
@@ -132,16 +129,13 @@ where {
132
129
match self . finish ( & mut partial_output) {
133
130
Err ( e) => {
134
131
let _ = tx. send ( Err ( e. into ( ) ) ) . await ;
135
- return ;
136
132
}
137
133
Ok ( _) => {
138
134
let len = partial_output. written ( ) . len ( ) ;
139
135
140
136
let mut buf = partial_output. into_inner ( ) ;
141
137
buf. resize ( len, 0 ) ;
142
- if let Err ( _) = tx. send ( Ok ( buf. freeze ( ) ) ) . await {
143
- return ;
144
- }
138
+ let _ = tx. send ( Ok ( buf. freeze ( ) ) ) . await ;
145
139
}
146
140
}
147
141
} ) ;
0 commit comments