diff options
| author | Justus Winter <justus@sequoia-pgp.org> | 2020-10-14 13:22:06 +0200 |
|---|---|---|
| committer | Justus Winter <justus@sequoia-pgp.org> | 2020-10-14 15:31:01 +0200 |
| commit | a831f22e56c0f77611a66a950a3c94478bd3ed3c (patch) | |
| tree | 3ced720d13f73a14ca4f79806024298ed55eeb7b | |
| parent | ea77642fe43c87b110f225b2d0b439d85d848658 (diff) | |
buffered-reader, openpgp: Port to bzip2 0.4.
| -rw-r--r-- | Cargo.lock | 4 | ||||
| -rw-r--r-- | buffered-reader/Cargo.toml | 2 | ||||
| -rw-r--r-- | openpgp/Cargo.toml | 2 | ||||
| -rw-r--r-- | openpgp/src/types/compression_level.rs | 8 |
4 files changed, 5 insertions, 11 deletions
@@ -244,9 +244,9 @@ dependencies = [ [[package]] name = "bzip2" -version = "0.3.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b" +checksum = "275d84fe348b838dc49477d39770682839b3e73e21a3eadc07b12924f1a9fcbe" dependencies = [ "bzip2-sys", "libc", diff --git a/buffered-reader/Cargo.toml b/buffered-reader/Cargo.toml index 6fe921af..629b85ee 100644 --- a/buffered-reader/Cargo.toml +++ b/buffered-reader/Cargo.toml @@ -19,7 +19,7 @@ gitlab = { repository = "sequoia-pgp/sequoia" } maintenance = { status = "actively-developed" } [dependencies] -bzip2 = { version = "0.3.2", optional = true } +bzip2 = { version = "0.4", optional = true } flate2 = { version = "1.0.1", optional = true } libc = "0.2.33" diff --git a/openpgp/Cargo.toml b/openpgp/Cargo.toml index 3108b034..5ddeba75 100644 --- a/openpgp/Cargo.toml +++ b/openpgp/Cargo.toml @@ -28,7 +28,7 @@ maintenance = { status = "actively-developed" } anyhow = "1" buffered-reader = { path = "../buffered-reader", version = "0.18", default-features = false } base64 = "0.12" -bzip2 = { version = "0.3.2", optional = true } +bzip2 = { version = "0.4", optional = true } dyn-clone = "1" flate2 = { version = "1.0.1", optional = true } idna = "0.2" diff --git a/openpgp/src/types/compression_level.rs b/openpgp/src/types/compression_level.rs index f7ab0b62..695919ed 100644 --- a/openpgp/src/types/compression_level.rs +++ b/openpgp/src/types/compression_level.rs @@ -106,13 +106,7 @@ mod into_bzip2_compression { impl From<CompressionLevel> for Compression { fn from(l: CompressionLevel) -> Self { - if l <= CompressionLevel::fastest() { - Compression::Fastest - } else if l <= CompressionLevel::default() { - Compression::Default - } else { - Compression::Best - } + Compression::new(l.0 as u32) } } } |