Skip to content

Commit bd0cd6d

Browse files
committed
Update flate2 to 1.0 and address changes
1 parent 7071766 commit bd0cd6d

File tree

5 files changed

+15
-8
lines changed

5 files changed

+15
-8
lines changed

Cargo.lock

Lines changed: 11 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ rustdoc-args = [
3030
cargo-registry-s3 = { path = "src/s3", version = "0.2.0" }
3131
rand = "0.4"
3232
git2 = "0.6.4"
33-
flate2 = "0.2"
33+
flate2 = "1.0"
3434
semver = "0.5"
3535
url = "1.2.1"
3636
tar = "0.4.13"

src/bin/render-readmes.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,10 +220,7 @@ fn get_readme(config: &Config, version: &Version, krate_name: &str) -> Option<St
220220
return None;
221221
}
222222
let reader = Cursor::new(response);
223-
let reader = GzDecoder::new(reader).expect(&format!(
224-
"[{}-{}] Invalid gzip header",
225-
krate_name, version.num
226-
));
223+
let reader = GzDecoder::new(reader);
227224
let mut archive = Archive::new(reader);
228225
let mut entries = archive.entries().expect(&format!(
229226
"[{}-{}] Invalid tar archive entries",

src/tests/all.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,7 @@ fn new_crate_to_body_with_io(
684684
) -> Vec<u8> {
685685
let mut tarball = Vec::new();
686686
{
687-
let mut ar = tar::Builder::new(GzEncoder::new(&mut tarball, Compression::Default));
687+
let mut ar = tar::Builder::new(GzEncoder::new(&mut tarball, Compression::default()));
688688
for &mut (name, ref mut data, size) in files {
689689
let mut header = tar::Header::new_gnu();
690690
t!(header.set_path(name));

src/uploaders.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ fn verify_tarball(
247247
max_unpack: u64,
248248
) -> CargoResult<()> {
249249
// All our data is currently encoded with gzip
250-
let decoder = GzDecoder::new(tarball)?;
250+
let decoder = GzDecoder::new(tarball);
251251

252252
// Don't let gzip decompression go into the weeeds, apply a fixed cap after
253253
// which point we say the decompressed source is "too large".

0 commit comments

Comments
 (0)