Skip to content

compiletest: Do not require annotations on empty labels and suggestions #140616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 4, 2025

Conversation

petrochenkov
Copy link
Contributor

@petrochenkov petrochenkov commented May 3, 2025

Unlike other empty diagnostics, empty labels (only underlining spans) and empty suggestions (suggestions to remove something) are quite usual and do not require any special attention and annotations.

This effectively reverts a part of #139485.

r? @jieyouxu

@rustbot rustbot added A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc 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) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels May 3, 2025
@rustbot
Copy link
Collaborator

rustbot commented May 3, 2025

Some changes occurred in src/tools/compiletest

cc @jieyouxu

Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, yeah that makes sense, I didn't consider this when reviewing the stricter PR. Two comment nits, but otherwise r=me.

@jieyouxu
Copy link
Member

jieyouxu commented May 3, 2025

@rustbot author

@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 3, 2025
@rustbot
Copy link
Collaborator

rustbot commented May 3, 2025

Reminder, once the PR becomes ready for a review, use @rustbot ready.

@rustbot rustbot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label May 3, 2025
@petrochenkov
Copy link
Contributor Author

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 3, 2025
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

@jieyouxu
Copy link
Member

jieyouxu commented May 4, 2025

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented May 4, 2025

📌 Commit 879b12e has been approved by jieyouxu

It is now in the queue for this repository.

@bors 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 May 4, 2025
@jieyouxu
Copy link
Member

jieyouxu commented May 4, 2025

New/modified tests in a rollup might conflict, so
@bors rollup=never

@bors
Copy link
Collaborator

bors commented May 4, 2025

⌛ Testing commit 879b12e with merge 62c5f58...

@bors
Copy link
Collaborator

bors commented May 4, 2025

☀️ Test successful - checks-actions
Approved by: jieyouxu
Pushing 62c5f58 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 4, 2025
@bors bors merged commit 62c5f58 into rust-lang:master May 4, 2025
7 checks passed
@rustbot rustbot added this to the 1.88.0 milestone May 4, 2025
Copy link

github-actions bot commented May 4, 2025

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 622ac04 (parent) -> 62c5f58 (this PR)

Test differences

Show 33082 test diffs

Stage 1

  • doctest::tests::comment_in_attrs: pass -> [missing] (J0)
  • errors::verify_ast_lowering_inline_asm_unsupported_target_9: pass -> [missing] (J0)
  • errors::verify_builtin_macros_assert_missing_comma_11: pass -> [missing] (J0)
  • errors::verify_codegen_ssa_invalid_monomorphization_simd_second_98: pass -> [missing] (J0)
  • errors::verify_expand_meta_var_dif_seq_matchers_5: pass -> [missing] (J0)
  • errors::verify_incremental_associated_value_expected_for_15: pass -> [missing] (J0)
  • errors::verify_metadata_unsupported_abi_39: pass -> [missing] (J0)
  • errors::verify_passes_deprecated_92: pass -> [missing] (J0)
  • errors::verify_passes_unlabeled_cf_in_while_condition_131: pass -> [missing] (J0)
  • html::highlight::tests::test_union_highlighting: pass -> [missing] (J0)
  • html::render::ordered_json::tests::sorted_array: pass -> [missing] (J0)
  • session_diagnostics::verify_driver_impl_ice_bug_report_9: pass -> [missing] (J0)
  • spec::tests::riscv32imc_unknown_nuttx_elf: pass -> [missing] (J0)
  • theme::tests::test_comments_in_rules: pass -> [missing] (J0)
  • array::array_mixed_equality_integers: pass -> [missing] (J1)
  • cell::double_borrow_single_release_no_borrow_mut: pass -> [missing] (J1)
  • collections::btree::map::tests::test_range: pass -> [missing] (J1)
  • collections::btree::map::tests::test_split_off_empty_right: pass -> [missing] (J1)
  • collections::hash::map::tests::test_drops: pass -> [missing] (J1)
  • collections::hash::set::tests::test_extract_if: pass -> [missing] (J1)
  • f32::test_clamp_min_is_nan: pass -> [missing] (J1)
  • ffi::os_str::tests::test_os_string_leak: pass -> [missing] (J1)
  • intrinsics::carrying_mul_add_fallback_i32: pass -> [missing] (J1)
  • io::buffered::tests::line_buffer_write0_error: pass -> [missing] (J1)
  • macros::cfg_match_two_functions: pass -> [missing] (J1)
  • misc_tests::test_owned_clone: pass -> [missing] (J1)
  • num::float_iter_sum_identity::f32_ref: pass -> [missing] (J1)
  • num::i8::test_from_str: pass -> [missing] (J1)
  • num::int_log::checked_ilog: pass -> [missing] (J1)
  • num::test_try_isizeu64: pass -> [missing] (J1)
  • num::u8::test_carrying_mul: pass -> [missing] (J1)
  • panic::location::location_const_caller: pass -> [missing] (J1)
  • rwlock::test_mapped_read_guard_covariance: pass -> [missing] (J1)
  • slice::subslice_patterns: pass -> [missing] (J1)
  • string::insert_bad1: pass -> [missing] (J1)
  • sync::drop_arc: pass -> [missing] (J1)
  • sys_common::wtf8::tests::wtf8_code_points: pass -> [missing] (J1)
  • sys_common::wtf8::tests::wtf8_valid_utf8_boundaries: pass -> [missing] (J1)
  • system_time_math: pass -> [missing] (J1)
  • thread_local_containing_const_statements: pass -> [missing] (J1)
  • ascii::medium::case11_mask_mult_bool_match_range: pass -> [missing] (J2)
  • btree::map::clone_slim_10k_and_remove_half: pass -> [missing] (J2)
  • btree::map::range_included_unbounded: pass -> [missing] (J2)
  • f16::test_total_cmp: pass -> [missing] (J2)
  • num::bench_u64_from_str_radix_10: pass -> [missing] (J2)
  • num::bench_u64_from_str_radix_2: pass -> [missing] (J2)
  • slice::sort_unstable_by_key_lexicographic: pass -> [missing] (J2)
  • sort::tests::stable::correct_u64_ascending: pass -> [missing] (J2)
  • sort::tests::stable::violate_ord_retain_orig_set_cell_i32_random_d2: pass -> [missing] (J2)
  • sort::tests::unstable::stability_cell_i32_descending: pass -> [missing] (J2)
  • str::char_count::en_small::case01_filter_count_cont_bytes: pass -> [missing] (J2)
  • str::char_count::en_small::case02_iter_increment: pass -> [missing] (J2)
  • str::char_count::ru_tiny::case03_manual_char_len: pass -> [missing] (J2)
  • str::rfind_zzz_char::short_ascii: pass -> [missing] (J2)
  • vec::bench_map_regular: pass -> [missing] (J2)
  • sort::tests::unstable::violate_ord_retain_orig_set_i32_saw_mixed: ignore -> [missing] (J3)

Stage 2

  • errors::verify_parse_attr_after_generic_132: [missing] -> pass (J0)
  • errors::verify_parse_missing_const_type_79: [missing] -> pass (J0)
  • errors::verify_resolve_static_lifetime_is_reserved_48: [missing] -> pass (J0)
  • html::length_limit::tests::limit_0: [missing] -> pass (J0)
  • html::render::sorted_template::tests::blank_js: [missing] -> pass (J0)
  • obligation_forest::tests::push_pop: [missing] -> pass (J0)
  • test_nested: [missing] -> pass (J0)
  • tests::test_unstable_options_tracking_hash: [missing] -> pass (J0)
  • cell::no_imm_then_borrow_mut: [missing] -> pass (J1)
  • collections::btree::map::tests::test_borrow: [missing] -> pass (J1)
  • collections::vec_deque::tests::test_insert: [missing] -> pass (J1)
  • condvar::wait_timeout_while_wait: [missing] -> pass (J1)
  • f32::test_fract: [missing] -> pass (J1)
  • iter::range::test_range_inclusive_nth_back: [missing] -> pass (J1)
  • lazy_lock::lazy_type_inference: [missing] -> pass (J1)
  • mem::assume_init_good: [missing] -> pass (J1)
  • mpmc::oneshot_single_thread_send_then_recv: [missing] -> pass (J1)
  • net::ip_addr::test_ipv6_to_int: [missing] -> pass (J1)
  • num::dec2flt::decimal_seq::test_parse: [missing] -> pass (J1)
  • num::test_try_i16u64: [missing] -> pass (J1)
  • num::test_try_usizei32: [missing] -> pass (J1)
  • num::u32::test_carrying_mul: [missing] -> pass (J1)
  • slice::memchr::matches_past_nul: [missing] -> pass (J1)
  • slice::test_flatten_size_overflow: [missing] -> pass (J1)
  • sort::tests::stable::correct_i32_random_d2: [missing] -> pass (J1)
  • sort::tests::unstable::correct_f128_random_z1: [missing] -> pass (J1)
  • split_paths_unix: [missing] -> pass (J1)
  • str::from_utf8_error: [missing] -> pass (J1)
  • str::test_le: [missing] -> pass (J1)
  • string::test_into_boxed_str: [missing] -> pass (J1)
  • vec::test_vec_from_array_mut_ref: [missing] -> pass (J1)
  • vec_deque::test_rotate_right_parts: [missing] -> pass (J1)
  • ascii::long::case07_fake_simd_u32: [missing] -> pass (J2)
  • ascii::medium::is_ascii_alphanumeric: [missing] -> pass (J2)
  • ascii::short::case05_branchless: [missing] -> pass (J2)
  • btree::map::iter_0: [missing] -> pass (J2)
  • f16::test_max_nan: [missing] -> pass (J2)
  • slice::rotate_huge_half: [missing] -> pass (J2)
  • sort::tests::unstable::deterministic_string_random_d20: [missing] -> pass (J2)
  • tests::parse_show_output_flag: [missing] -> pass (J2)
  • vec::bench_clone_from_01_0100_0010: [missing] -> pass (J2)
  • sort::tests::stable::violate_ord_retain_orig_set_i32_random_d20: [missing] -> ignore (J3)
  • sort::tests::unstable::deterministic_string_saw_mixed: [missing] -> ignore (J3)
  • sys::process::unix::common::tests::test_process_group_posix_spawn: [missing] -> pass (J4)

(and 16440 additional test diffs)

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

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 62c5f58f57670ce65e7fec34f8c4ba00c27da2d9 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. x86_64-apple-2: 4220.9s -> 1374.5s (-67.4%)
  2. test-various: 4167.7s -> 2298.2s (-44.9%)
  3. aarch64-apple: 3920.1s -> 2841.9s (-27.5%)
  4. x86_64-gnu-aux: 5931.4s -> 4349.0s (-26.7%)
  5. x86_64-apple-1: 6868.4s -> 5588.7s (-18.6%)
  6. dist-apple-various: 5647.8s -> 6429.0s (13.8%)
  7. dist-aarch64-apple: 5641.0s -> 4919.8s (-12.8%)
  8. x86_64-msvc-ext3: 7436.5s -> 7911.6s (6.4%)
  9. x86_64-gnu-llvm-19-3: 7087.3s -> 6764.9s (-4.5%)
  10. dist-arm-linux: 5266.8s -> 5033.5s (-4.4%)
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
Copy link
Collaborator

Finished benchmarking commit (62c5f58): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

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

Max RSS (memory usage)

Results (primary -0.1%, secondary -1.9%)

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.6% [0.4%, 0.7%] 7
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.6% [-1.1%, -0.4%] 10
Improvements ✅
(secondary)
-1.9% [-1.9%, -1.9%] 1
All ❌✅ (primary) -0.1% [-1.1%, 0.7%] 17

Cycles

Results (primary -0.2%, secondary -2.2%)

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.6% [0.4%, 1.4%] 19
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-1.0% [-2.2%, -0.4%] 22
Improvements ✅
(secondary)
-2.2% [-2.5%, -1.7%] 6
All ❌✅ (primary) -0.2% [-2.2%, 1.4%] 41

Binary size

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

Bootstrap: 770.602s -> 770.413s (-0.02%)
Artifact size: 365.45 MiB -> 365.46 MiB (0.00%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants