Update cargo #139926

weihanglo · 2025-04-16T14:51:57Z

4 commits in 864f74d4eadcaea3eeda37a2e7f4d34de233d51e..d811228b14ae2707323f37346aee3f4147e247e6
2025-04-11 20:37:27 +0000 to 2025-04-15 15:18:42 +0000

use zlib-rs for gzip compression in rust code (use zlib-rs for gzip compression in rust code cargo#15417)
test(rustfix): Use snapbox for snapshot testing (test(rustfix): Use snapbox for snapshot testing cargo#15429)
chore(deps): update rust crate gix to 0.71.0 [security] (chore(deps): update rust crate gix to 0.71.0 [security] cargo#15391)
Make sure search paths inside OUT_DIR precede external paths (Make sure search paths inside OUT_DIR precede external paths cargo#15221)

Also,

The license exception of sha1_smol with BSD-3-Clause is no longer needed, as gix-* doesn't depend on it.
Cargo depends on zlib-rs, which is distributed under Zlib license

r? ghost

rustbot · 2025-04-16T14:52:02Z

Some changes occurred in src/tools/cargo

cc @ehuss

The list of allowed third-party dependencies may have been modified! You must ensure that any new dependencies have compatible licenses before merging.

cc @davidtwco, @wesleywiser

rustbot · 2025-04-16T14:52:05Z

⚠️ Warning ⚠️

Some commits in this PR modify submodules.

weihanglo · 2025-04-16T19:57:30Z

I am assuming that Zlib license is fine, as we already have it. cc @joshtriplett is that correct?

* The license exception of sha1_smol with BSD-3-Clause is no longer needed, as `gix-*` doesn't depend on it. * Cargo depends on zlib-rs, which is distributed under Zlib license

weihanglo · 2025-04-16T22:39:21Z

Zlib should be fine, and we don't need to add it to global license exception.

#t-cargo > Enable zlib-rs feature on flate2 for Cargo @ 💬

@bors r+ rollup=never p=1

bors · 2025-04-16T22:39:24Z

📌 Commit 8b09cbb has been approved by weihanglo

It is now in the queue for this repository.

bors · 2025-04-17T08:07:32Z

⌛ Testing commit 8b09cbb with merge 94015d3...

bors · 2025-04-17T11:20:46Z

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing 94015d3 to master...

github-actions · 2025-04-17T11:22:37Z

What is this?

This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 15c4cce (parent) -> 94015d3 (this PR)

Test differences

Show 33023 test diffs

Stage 1

btree::map::iter_0: pass -> [missing] (J0)
iter::bench_next_chunk_filter_map_predictably_true: pass -> [missing] (J0)
iter::bench_zip_add: pass -> [missing] (J0)
num::int_sqrt::u64_sqrt_random: pass -> [missing] (J0)
num::midpoint::midpoint_order_expectation_u8: pass -> [missing] (J0)
slice::sort_unstable_by_key_lexicographic: pass -> [missing] (J0)
sort::tests::unstable::panic_retain_orig_set_string_random_s95: pass -> [missing] (J0)
sort::tests::unstable::stability_cell_i32_random_d2: pass -> [missing] (J0)
str::char_count::en_medium::case01_filter_count_cont_bytes: pass -> [missing] (J0)
arc::float_nan_ne: pass -> [missing] (J1)
ascii::ascii_ctype_const: pass -> [missing] (J1)
async_iter::into_async_iter: pass -> [missing] (J1)
collections::hash::map::tests::test_keys: pass -> [missing] (J1)
lazy::clone: pass -> [missing] (J1)
mem::offset_of_union: pass -> [missing] (J1)
mem::test_replace: pass -> [missing] (J1)
mpsc_sync::stream_send_recv_stress: pass -> [missing] (J1)
net::ip_addr::test_ipv4_to_int: pass -> [missing] (J1)
num::i32::test_leading_trailing_ones: pass -> [missing] (J1)
num::u128::test_carrying_mul_add: pass -> [missing] (J1)
num::u16::test_be: pass -> [missing] (J1)
num::u8::test_widening_mul: pass -> [missing] (J1)
rc::test_into_from_raw_unsized: pass -> [missing] (J1)
rc::test_new_weak: pass -> [missing] (J1)
slice::test_align_to_empty_mid: pass -> [missing] (J1)
slice::test_slice_from_raw_parts_in_const: pass -> [missing] (J1)
str::strslice_issue_104726: pass -> [missing] (J1)
str::test_to_lowercase_rev_iterator: pass -> [missing] (J1)
sync::manually_share_arc: pass -> [missing] (J1)
sys_common::wtf8::tests::wtf8_from_str: pass -> [missing] (J1)
thread::tests::test_thread_id_not_equal: pass -> [missing] (J1)
vec::test_splice_unbounded: pass -> [missing] (J1)
vec_deque::test_as_slices: pass -> [missing] (J1)
bit_set::tests::grow: pass -> [missing] (J2)
deriving::coerce_pointee::verify_builtin_macros_coerce_pointee_requires_one_pointee_3: pass -> [missing] (J2)
errors::verify_codegen_ssa_invalid_monomorphization_simd_index_out_of_bounds_109: pass -> [missing] (J2)
errors::verify_parse_nonterminal_expected_item_keyword_89: pass -> [missing] (J2)
errors::verify_passes_coroutine_on_non_closure_89: pass -> [missing] (J2)
errors::verify_passes_unused_var_maybe_capture_ref_165: pass -> [missing] (J2)
errors::verify_resolve_cannot_be_reexported_private_32: pass -> [missing] (J2)
errors::verify_session_unstable_virtual_function_elimination_20: pass -> [missing] (J2)
graph::scc::tests::test_simple_cycle_max: pass -> [missing] (J2)
html::length_limit::tests::close_too_many: pass -> [missing] (J2)
lints::verify_lint_reserved_string_150: pass -> [missing] (J2)
spec::tests::aarch64_be_unknown_linux_gnu_ilp32: pass -> [missing] (J2)
spec::tests::aarch64_unknown_none_softfloat: pass -> [missing] (J2)
spec::tests::i686_win7_windows_gnu: pass -> [missing] (J2)
tests::test_fn_like_macro_noop: pass -> [missing] (J2)
sort::tests::stable::violate_ord_retain_orig_set_i32_random: ignore -> [missing] (J3)
sort::tests::unstable::correct_f128_saw_mixed: ignore -> [missing] (J3)

Stage 2

btree::map::iter_0: [missing] -> pass (J0)
num::midpoint::midpoint_obvious_impl_i8: [missing] -> pass (J0)
sort::tests::stable::correct_1k_saw_mixed: [missing] -> pass (J0)
sort::tests::stable::self_cmp_i32_random_s95: [missing] -> pass (J0)
sort::tests::stable::violate_ord_retain_orig_set_string_random: [missing] -> pass (J0)
sort::tests::unstable::correct_1k_descending: [missing] -> pass (J0)
sort::tests::unstable::correct_i32_random_d1024: [missing] -> pass (J0)
sort::tests::unstable::self_cmp_string_random_s95: [missing] -> pass (J0)
tests::test_bench_no_iter: [missing] -> pass (J0)
vec::bench_from_fn_0000: [missing] -> pass (J0)
c_str2::simple: [missing] -> pass (J1)
collections::linked_list::tests::test_ord: [missing] -> pass (J1)
cow_str::check_cow_clone_from: [missing] -> pass (J1)
f32::test_mul_add: [missing] -> pass (J1)
io::tests::chain_empty_size_hint: [missing] -> pass (J1)
iter::test_monad_laws_left_identity: [missing] -> pass (J1)
iter::traits::accum::test_iterator_sum: [missing] -> pass (J1)
net::ip_addr::ipv6_to_ipv4_mapped: [missing] -> pass (J1)
num::i64::test_rotate: [missing] -> pass (J1)
num::int_log::ilog10_of_0_panic: [missing] -> pass (J1)
num::u128::test_count_zeros: [missing] -> pass (J1)
num::u8::test_widening_mul: [missing] -> pass (J1)
num::wrapping::wrapping_const: [missing] -> pass (J1)
slice::split_off_oob_range_from: [missing] -> pass (J1)
slice::test_from_elem: [missing] -> pass (J1)
str::pattern::str_searcher_empty_needle_ascii_haystack::fwd: [missing] -> pass (J1)
sync::drop_arc: [missing] -> pass (J1)
test_is_power_of_two_u16: [missing] -> pass (J1)
test_is_power_of_two_u32: [missing] -> pass (J1)
error::verify_middle_erroneous_constant_15: [missing] -> pass (J2)
errors::verify_ast_passes_negative_bound_with_parenthetical_notation_57: [missing] -> pass (J2)
errors::verify_incremental_session_gc_failed_31: [missing] -> pass (J2)
errors::verify_passes_cannot_stabilize_deprecated_153: [missing] -> pass (J2)
errors::verify_passes_debug_visualizer_placement_79: [missing] -> pass (J2)
errors::verify_passes_doc_keyword_not_keyword_30: [missing] -> pass (J2)
errors::verify_passes_lang_item_fn_with_track_caller_110: [missing] -> pass (J2)
errors::verify_passes_linkage_90: [missing] -> pass (J2)
errors::verify_session_target_small_data_threshold_not_supported_25: [missing] -> pass (J2)
interval::tests::last_set_before_adjacent: [missing] -> pass (J2)
opaque::tests::test_i64: [missing] -> pass (J2)
parser::tests::different_note_spanned_6: [missing] -> pass (J2)
spec::tests::riscv32emc_unknown_none_elf: [missing] -> pass (J2)
spec::tests::wasm32_unknown_emscripten: [missing] -> pass (J2)
tests::invalid_width: [missing] -> pass (J2)
tests::single_node: [missing] -> pass (J2)
tests::test_typed_arena_drop_count: [missing] -> pass (J2)
sort::tests::stable::violate_ord_retain_orig_set_cell_i32_random: [missing] -> ignore (J3)
sort::tests::unstable::self_cmp_cell_i32_saw_mixed: [missing] -> ignore (J3)
vec_deque::test_try_reserve_exact: [missing] -> ignore (J3)
f16::test_gamma: [missing] -> pass (J4)

(and 16419 additional test diffs)

Additionally, 16504 doctest diffs were found. These are ignored, as they are noisy.

Job group index

J0: aarch64-apple, test-various, x86_64-apple-1
J1: aarch64-apple, test-various, x86_64-apple-1, x86_64-gnu-aux
J2: aarch64-apple, x86_64-apple-1
J3: x86_64-gnu-aux
J4: aarch64-apple

Job duration changes

x86_64-apple-2: 5693.8s -> 1338.0s (-76.5%)
test-various: 4218.4s -> 2196.8s (-47.9%)
dist-x86_64-apple: 7274.2s -> 10693.8s (47.0%)
x86_64-gnu-aux: 6105.8s -> 4176.2s (-31.6%)
aarch64-apple: 3988.7s -> 2962.1s (-25.7%)
x86_64-apple-1: 7851.2s -> 6502.5s (-17.2%)
dist-apple-various: 6928.9s -> 7955.6s (14.8%)
x86_64-msvc-1: 9514.9s -> 8910.0s (-6.4%)
dist-x86_64-netbsd: 5335.0s -> 4999.8s (-6.3%)
dist-x86_64-freebsd: 4964.4s -> 4668.4s (-6.0%)

How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

rust-timer · 2025-04-17T13:32:51Z

Finished benchmarking commit (94015d3): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (primary 0.6%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	1.6%	[0.5%, 2.8%]	2
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.4%	[-0.5%, -0.4%]	2
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.6%	[-0.5%, 2.8%]	4

Cycles

Results (primary 0.1%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	0.4%	[0.4%, 0.5%]	4
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.5%	[-0.6%, -0.4%]	2
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.1%	[-0.6%, 0.5%]	6

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 775.789s -> 775.495s (-0.04%)
Artifact size: 364.79 MiB -> 365.05 MiB (0.07%)

rustbot added A-tidy Area: The tidy tool S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Apr 16, 2025

Update cargo

8b09cbb

* The license exception of sha1_smol with BSD-3-Clause is no longer needed, as `gix-*` doesn't depend on it. * Cargo depends on zlib-rs, which is distributed under Zlib license

weihanglo force-pushed the update-cargo branch from 499bdd2 to 8b09cbb Compare April 16, 2025 22:38

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 16, 2025

bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 17, 2025

bors merged commit 94015d3 into rust-lang:master Apr 17, 2025
7 checks passed

rustbot added this to the 1.88.0 milestone Apr 17, 2025

weihanglo deleted the update-cargo branch April 17, 2025 11:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update cargo #139926

Update cargo #139926

weihanglo commented Apr 16, 2025

rustbot commented Apr 16, 2025

rustbot commented Apr 16, 2025

weihanglo commented Apr 16, 2025

weihanglo commented Apr 16, 2025

bors commented Apr 16, 2025

bors commented Apr 17, 2025

bors commented Apr 17, 2025

github-actions bot commented Apr 17, 2025

Stage 1

Stage 2

rust-timer commented Apr 17, 2025

Update cargo #139926

Update cargo #139926

Conversation

weihanglo commented Apr 16, 2025

rustbot commented Apr 16, 2025

rustbot commented Apr 16, 2025

weihanglo commented Apr 16, 2025

weihanglo commented Apr 16, 2025

bors commented Apr 16, 2025

bors commented Apr 17, 2025

bors commented Apr 17, 2025

github-actions bot commented Apr 17, 2025

Test differences

Stage 1

Stage 2

Job duration changes

rust-timer commented Apr 17, 2025

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size