Skip to content

Commit 7e31f62

Browse files
committed
Auto merge of #13744 - cuviper:ci-uncompressed, r=weihanglo
test: don't compress test registry crates They are still nominally gzipped, but using `Compression::none()` makes them consistent even across zlib and zlib-ng, and this fixes checksum differences in the testsuite. There is a one-time update of all those checksums to catch up with this change though. r? `@weihanglo`
2 parents c375398 + a70f23c commit 7e31f62

File tree

7 files changed

+20
-20
lines changed

7 files changed

+20
-20
lines changed

crates/cargo-test-support/src/registry.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1469,7 +1469,7 @@ impl Package {
14691469
let dst = self.archive_dst();
14701470
t!(fs::create_dir_all(dst.parent().unwrap()));
14711471
let f = t!(File::create(&dst));
1472-
let mut a = Builder::new(GzEncoder::new(f, Compression::default()));
1472+
let mut a = Builder::new(GzEncoder::new(f, Compression::none()));
14731473

14741474
if !self
14751475
.files

tests/testsuite/alt_registry.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1493,7 +1493,7 @@ dependencies = [
14931493
name = "foo"
14941494
version = "0.1.0"
14951495
source = "sparse+http://[..]/"
1496-
checksum = "f6a200a9339fef960979d94d5c99cbbfd899b6f5a396a55d9775089119050203""#,
1496+
checksum = "458c1addb23fde7dfbca0410afdbcc0086f96197281ec304d9e0e10def3cb899""#,
14971497
);
14981498
}
14991499

tests/testsuite/cargo_add/locked_unchanged/in/Cargo.lock

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

tests/testsuite/cargo_add/lockfile_updated/in/Cargo.lock

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

tests/testsuite/cargo_add/lockfile_updated/out/Cargo.lock

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

tests/testsuite/cargo_remove/update_lock_file/in/Cargo.lock

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

tests/testsuite/cargo_remove/update_lock_file/out/Cargo.lock

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

0 commit comments

Comments
 (0)