Merge branch 'master' into xz
This commit is contained in:
commit
5b749c4ed9
1 changed files with 3 additions and 3 deletions
|
@ -785,9 +785,9 @@ impl<R: Read + Seek> ZipArchive<R> {
|
||||||
let Some((footer, shared)) = best_result else {
|
let Some((footer, shared)) = best_result else {
|
||||||
return Err(unsupported_errors_32
|
return Err(unsupported_errors_32
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.chain(unsupported_errors_64.into_iter())
|
.chain(unsupported_errors_64)
|
||||||
.chain(invalid_errors_32.into_iter())
|
.chain(invalid_errors_32)
|
||||||
.chain(invalid_errors_64.into_iter())
|
.chain(invalid_errors_64)
|
||||||
.next()
|
.next()
|
||||||
.unwrap());
|
.unwrap());
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Reference in a new issue