Skip to content

Conversation

Zalathar
Copy link
Contributor

@Zalathar Zalathar commented Aug 28, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

hkBst and others added 23 commits June 19, 2025 15:56
Signed-off-by: Jonathan Brouwer <[email protected]>
…enton

wasm: rm static mut

More rust-lang#125035. I'm not sure this is correct, but it compiles.
…nszelmann

Port `#[link]` to the new attribute parsing infrastructure

Ports `link` to the new attribute parsing infrastructure for rust-lang#131229 (comment)
No source fixes

This PR started as a fix for a rendering bug that [got noticed in rust-lang#143661](rust-lang#143661 (comment)), but turned into a fix for any rendering bugs related to files with no source.
- Don't add an end column separator after a file with no source
- Add column separator before secondary messages with no source
- Render continuation between no source labels

Before
```
error[E0423]: expected function, tuple struct or tuple variant, found struct `std::collections::HashMap`
   ╭▸ $DIR/multi-suggestion.rs:17:13
   │
LL │     let _ = std::collections::HashMap();
   │             ━━━━━━━━━━━━━━━━━━━━━━━━━━━
   ╭▸ $SRC_DIR/std/src/collections/hash/map.rs:LL:COL
   │
   ╰ note: `std::collections::HashMap` defined here
   ╰╴
note: constructor is not visible here due to private fields
   ╭▸ $SRC_DIR/alloc/src/boxed.rs:LL:COL
   │
   ╰ note: private field
   │
   ╰ note: private field
```

After
```
error[E0423]: expected function, tuple struct or tuple variant, found struct `std::collections::HashMap`
   ╭▸ $DIR/multi-suggestion.rs:17:13
   │
LL │     let _ = std::collections::HashMap();
   │             ━━━━━━━━━━━━━━━━━━━━━━━━━━━
   ╰╴
   ╭▸ $SRC_DIR/std/src/collections/hash/map.rs:LL:COL
   │
   ╰ note: `std::collections::HashMap` defined here
note: constructor is not visible here due to private fields
   ╭▸ $SRC_DIR/alloc/src/boxed.rs:LL:COL
   │
   ├ note: private field
   │
   ╰ note: private field
```

Note: This PR also makes it so `rustc` and `annotate-snippets` match in these cases
compiletest: Remove several remnants of the old libtest-based executor

I noticed a few bits of low-hanging cleanup that are possible now that the non-libtest executor is well and truly established.
…lett

Rename `Location::file_with_nul` to `file_as_c_str`

This renames the method to be consistent with the ongoing T-libs-api FCP found at rust-lang#141727 (comment).

I did not rename the unstable feature as we are going to be stabilizing it soon anyway. This will probably break RfL, so it will require an updated commit hash for the Linux Kernel that I will add here soon.

r? `@Amanieu`
…oshtriplett

`const`ify (the unstable) `str::as_str`

Tracking issue: rust-lang#130366

The method was not initially marked `const` presumably because it is only useful with `Deref`. But now that const traits seem to be a thing that can actually become real, why not make it `const`?

PR `const`ifying `Deref`: rust-lang#145279
…d, r=lcnr

Disable `integer_to_ptr_transmutes` suggestion for unsized types

This PR disables the machine-applicable `integer_to_ptr_transmutes` lint suggestion for unsized types, as [`std::ptr::with_exposed_provenance`](https://doc.rust-lang.org/std/ptr/fn.with_exposed_provenance.html) requires sized types.

We should probably mention [`std::ptr::from_raw_parts`](https://doc.rust-lang.org/std/ptr/fn.from_raw_parts.html) when it becomes stable.

Related to rust-lang#145935
Update `icu_list` to 2.0

This updates the `icu_list` crate, which is used for error formatting, from 1.5 to 2.0.
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc A-tidy Area: The tidy tool A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic 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 Aug 28, 2025
@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Aug 28, 2025
@Zalathar
Copy link
Contributor Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Aug 28, 2025

📌 Commit 556d2fa has been approved by Zalathar

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 Aug 28, 2025
@bors
Copy link
Collaborator

bors commented Aug 28, 2025

⌛ Testing commit 556d2fa with merge 1f7dcc8...

@bors
Copy link
Collaborator

bors commented Aug 28, 2025

☀️ Test successful - checks-actions
Approved by: Zalathar
Pushing 1f7dcc8 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 28, 2025
@bors bors merged commit 1f7dcc8 into rust-lang:master Aug 28, 2025
11 checks passed
@rustbot rustbot added this to the 1.91.0 milestone Aug 28, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#142727 wasm: rm static mut 2978da736bf1d37437c94af1573725a5e8dc3309 (link)
#143193 Port #[link] to the new attribute parsing infrastructure 506bd7d7875e227732e821442611d736efe90d3d (link)
#144864 No source fixes 6059cc6fe9637a2537cf3fadfe3c21e41a481a5c (link)
#145913 Add spin_loop hint for LoongArch 8e736b0c3f2b22837643518f24332eb57aafc42f (link)
#145926 compiletest: Remove several remnants of the old libtest-bas… 2ae7f0fbcaf40e00979d7c1fe9e75b43d1b9248f (link)
#145928 Rename Location::file_with_nul to file_as_c_str acfefbbc5351e6feb1ab2965e00c118d50164813 (link)
#145930 constify (the unstable) str::as_str a7f07700b1c4ab7c5a8a6cae1898237d9aa1067b (link)
#145941 Disable integer_to_ptr_transmutes suggestion for unsized … a6db48618a0655605ee890de8823330a39f1a6c4 (link)
#145953 Update icu_list to 2.0 5e4c6d363ba0c314d664f9ae14006406516b5c50 (link)

previous master: b41634205b

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

Copy link
Contributor

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 b416342 (parent) -> 1f7dcc8 (this PR)

Test differences

Show 185 test diffs

Stage 1

  • errors::verify_metadata_as_needed_compatibility_27: pass -> [missing] (J0)
  • errors::verify_metadata_async_drop_types_in_dependency_80: pass -> [missing] (J0)
  • errors::verify_metadata_binary_output_to_tty_28: [missing] -> pass (J0)
  • errors::verify_metadata_binary_output_to_tty_53: pass -> [missing] (J0)
  • errors::verify_metadata_bundle_needs_static_25: pass -> [missing] (J0)
  • errors::verify_metadata_conflicting_alloc_error_handler_23: [missing] -> pass (J0)
  • errors::verify_metadata_conflicting_alloc_error_handler_48: pass -> [missing] (J0)
  • errors::verify_metadata_conflicting_global_alloc_47: pass -> [missing] (J0)
  • errors::verify_metadata_crate_location_unknown_type_68: pass -> [missing] (J0)
  • errors::verify_metadata_crate_not_compiler_builtins_42: pass -> [missing] (J0)
  • errors::verify_metadata_crate_not_panic_runtime_16: [missing] -> pass (J0)
  • errors::verify_metadata_crate_not_panic_runtime_41: pass -> [missing] (J0)
  • errors::verify_metadata_dl_error_38: [missing] -> pass (J0)
  • errors::verify_metadata_dl_error_63: pass -> [missing] (J0)
  • errors::verify_metadata_empty_renaming_target_34: pass -> [missing] (J0)
  • errors::verify_metadata_empty_renaming_target_9: [missing] -> pass (J0)
  • errors::verify_metadata_extern_location_not_exist_58: pass -> [missing] (J0)
  • errors::verify_metadata_extern_location_not_file_34: [missing] -> pass (J0)
  • errors::verify_metadata_extern_location_not_file_59: pass -> [missing] (J0)
  • errors::verify_metadata_fail_create_file_encoder_14: [missing] -> pass (J0)
  • errors::verify_metadata_fail_write_file_40: pass -> [missing] (J0)
  • errors::verify_metadata_failed_copy_to_stdout_27: [missing] -> pass (J0)
  • errors::verify_metadata_failed_copy_to_stdout_52: pass -> [missing] (J0)
  • errors::verify_metadata_failed_create_encoded_metadata_31: [missing] -> pass (J0)
  • errors::verify_metadata_failed_create_file_30: [missing] -> pass (J0)
  • errors::verify_metadata_failed_create_file_55: pass -> [missing] (J0)
  • errors::verify_metadata_failed_create_tempdir_29: [missing] -> pass (J0)
  • errors::verify_metadata_failed_create_tempdir_54: pass -> [missing] (J0)
  • errors::verify_metadata_failed_write_error_26: [missing] -> pass (J0)
  • errors::verify_metadata_failed_write_error_51: pass -> [missing] (J0)
  • errors::verify_metadata_found_staticlib_66: pass -> [missing] (J0)
  • errors::verify_metadata_full_metadata_not_found_35: [missing] -> pass (J0)
  • errors::verify_metadata_full_metadata_not_found_60: pass -> [missing] (J0)
  • errors::verify_metadata_global_alloc_required_24: [missing] -> pass (J0)
  • errors::verify_metadata_import_name_type_form_71: pass -> [missing] (J0)
  • errors::verify_metadata_import_name_type_raw_74: pass -> [missing] (J0)
  • errors::verify_metadata_incompatible_rustc_42: [missing] -> pass (J0)
  • errors::verify_metadata_incompatible_target_modifiers_46: [missing] -> pass (J0)
  • errors::verify_metadata_incompatible_target_modifiers_76: pass -> [missing] (J0)
  • errors::verify_metadata_incompatible_target_modifiers_r_missed_48: [missing] -> pass (J0)
  • errors::verify_metadata_incompatible_target_modifiers_r_missed_78: pass -> [missing] (J0)
  • errors::verify_metadata_invalid_link_modifier_23: pass -> [missing] (J0)
  • errors::verify_metadata_lib_framework_apple_33: pass -> [missing] (J0)
  • errors::verify_metadata_lib_framework_apple_8: [missing] -> pass (J0)
  • errors::verify_metadata_link_cfg_form_12: pass -> [missing] (J0)
  • errors::verify_metadata_link_cfg_single_predicate_20: pass -> [missing] (J0)
  • errors::verify_metadata_link_kind_form_10: pass -> [missing] (J0)
  • errors::verify_metadata_link_modifiers_form_11: pass -> [missing] (J0)
  • errors::verify_metadata_link_name_form_9: pass -> [missing] (J0)
  • errors::verify_metadata_link_ordinal_raw_dylib_32: pass -> [missing] (J0)
  • errors::verify_metadata_link_requires_name_30: pass -> [missing] (J0)
  • errors::verify_metadata_multiple_import_name_type_70: pass -> [missing] (J0)
  • errors::verify_metadata_multiple_kinds_in_link_8: pass -> [missing] (J0)
  • errors::verify_metadata_multiple_link_modifiers_18: pass -> [missing] (J0)
  • errors::verify_metadata_multiple_modifiers_24: pass -> [missing] (J0)
  • errors::verify_metadata_multiple_wasm_import_21: pass -> [missing] (J0)
  • errors::verify_metadata_newer_crate_version_64: pass -> [missing] (J0)
  • errors::verify_metadata_no_link_mod_override_12: [missing] -> pass (J0)
  • errors::verify_metadata_no_link_mod_override_37: pass -> [missing] (J0)
  • errors::verify_metadata_no_multiple_alloc_error_handler_21: [missing] -> pass (J0)
  • errors::verify_metadata_no_multiple_alloc_error_handler_46: pass -> [missing] (J0)
  • errors::verify_metadata_no_panic_strategy_18: [missing] -> pass (J0)
  • errors::verify_metadata_no_panic_strategy_43: pass -> [missing] (J0)
  • errors::verify_metadata_no_transitive_needs_dep_25: [missing] -> pass (J0)
  • errors::verify_metadata_no_transitive_needs_dep_50: pass -> [missing] (J0)
  • errors::verify_metadata_non_ascii_name_32: [missing] -> pass (J0)
  • errors::verify_metadata_not_profiler_runtime_19: [missing] -> pass (J0)
  • errors::verify_metadata_raw_dylib_malformed_51: [missing] -> pass (J0)
  • errors::verify_metadata_raw_dylib_malformed_81: pass -> [missing] (J0)
  • errors::verify_metadata_raw_dylib_no_nul_31: pass -> [missing] (J0)
  • errors::verify_metadata_raw_dylib_only_windows_16: pass -> [missing] (J0)
  • errors::verify_metadata_raw_dylib_unsupported_abi_38: pass -> [missing] (J0)
  • errors::verify_metadata_renaming_no_link_10: [missing] -> pass (J0)
  • errors::verify_metadata_renaming_no_link_35: pass -> [missing] (J0)
  • errors::verify_metadata_stable_crate_id_collision_62: pass -> [missing] (J0)
  • errors::verify_metadata_symbol_conflicts_current_61: pass -> [missing] (J0)
  • errors::verify_metadata_unknown_import_name_type_73: pass -> [missing] (J0)
  • errors::verify_metadata_unknown_link_modifier_28: pass -> [missing] (J0)
  • errors::verify_metadata_wasm_c_abi_45: [missing] -> pass (J0)
  • errors::verify_metadata_wasm_c_abi_75: pass -> [missing] (J0)
  • errors::verify_metadata_wasm_import_form_13: pass -> [missing] (J0)
  • session_diagnostics::verify_attr_parsing_bundle_needs_static_56: [missing] -> pass (J0)
  • session_diagnostics::verify_attr_parsing_empty_link_name_47: [missing] -> pass (J0)
  • session_diagnostics::verify_attr_parsing_import_name_type_x86_55: [missing] -> pass (J0)
  • session_diagnostics::verify_attr_parsing_incompatible_wasm_link_49: [missing] -> pass (J0)
  • session_diagnostics::verify_attr_parsing_link_framework_apple_48: [missing] -> pass (J0)
  • session_diagnostics::verify_attr_parsing_raw_dylib_no_nul_51: [missing] -> pass (J0)
  • session_diagnostics::verify_attr_parsing_whole_archive_needs_static_57: [missing] -> pass (J0)
  • [ui] tests/ui/linkage-attr/raw-dylib/windows/import-name-type-invalid-format.rs: ignore (only executed when the architecture is x86) -> pass (J1)
  • [ui] tests/ui/linkage-attr/raw-dylib/windows/import-name-type-multiple.rs: ignore (only executed when the architecture is x86) -> pass (J1)
  • [ui] tests/ui/linkage-attr/raw-dylib/windows/import-name-type-unknown-value.rs: ignore (only executed when the architecture is x86) -> pass (J1)
  • [ui] tests/ui/linkage-attr/raw-dylib/windows/import-name-type-unsupported-link-kind.rs: ignore (only executed when the architecture is x86) -> pass (J1)
  • [ui] tests/ui/lint/int_to_ptr-unsized.rs: [missing] -> pass (J1)

Stage 2

  • [ui] tests/ui/linkage-attr/raw-dylib/windows/import-name-type-multiple.rs: ignore (only executed when the architecture is x86) -> pass (J2)
  • [ui] tests/ui/linkage-attr/raw-dylib/windows/import-name-type-unknown-value.rs: ignore (only executed when the architecture is x86) -> pass (J2)
  • [ui] tests/ui/lint/int_to_ptr-unsized.rs: [missing] -> pass (J3)
  • [ui] tests/ui/linkage-attr/raw-dylib/windows/import-name-type-multiple.rs: ignore (only executed when the operating system is windows) -> pass (J4)
  • [ui] tests/ui/linkage-attr/raw-dylib/windows/import-name-type-unknown-value.rs: ignore (only executed when the operating system is windows) -> pass (J4)
  • [ui] tests/ui/linkage-attr/raw-dylib/windows/import-name-type-unsupported-link-kind.rs: ignore (only executed when the operating system is windows) -> pass (J4)
  • [run-make] tests/run-make/compressed-debuginfo-zstd: ignore (ignored if LLVM wasn't build with zstd for ELF section compression (we want LLVM/LLD to be built with zstd support)) -> pass (J5)

(and 53 additional test diffs)

Additionally, 32 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 1f7dcc878d73c45cc40018aac6e5c767446df110 --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. dist-x86_64-solaris: 13588.2s -> 5162.7s (-62.0%)
  2. dist-arm-linux-musl: 15163.8s -> 5782.3s (-61.9%)
  3. dist-sparcv9-solaris: 12602.3s -> 4962.8s (-60.6%)
  4. dist-x86_64-illumos: 14738.4s -> 6049.6s (-59.0%)
  5. pr-check-1: 4006.5s -> 1665.3s (-58.4%)
  6. dist-ohos-armv7: 8974.0s -> 4034.0s (-55.0%)
  7. dist-ohos-aarch64: 8647.8s -> 4216.5s (-51.2%)
  8. dist-ohos-x86_64: 8542.1s -> 4213.2s (-50.7%)
  9. dist-x86_64-freebsd: 10182.1s -> 5037.6s (-50.5%)
  10. pr-check-2: 4460.5s -> 2209.6s (-50.5%)
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 (1f7dcc8): comparison URL.

Overall result: ❌✅ regressions and improvements - please read the text below

Our benchmarks found a performance regression caused by this PR.
This might be an actual regression, but it can also be just noise.

Next Steps:

  • If the regression was expected or you think it can be justified,
    please write a comment with sufficient written justification, and add
    @rustbot label: +perf-regression-triaged to it, to mark the regression as triaged.
  • If you think that you know of a way to resolve the regression, try to create
    a new PR with a fix for the regression.
  • If you do not understand the regression or you think that it is just noise,
    you can ask the @rust-lang/wg-compiler-performance working group for help (members of this group
    were already notified of this PR).

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

mean range count
Regressions ❌
(primary)
0.2% [0.2%, 0.2%] 3
Regressions ❌
(secondary)
2.4% [0.2%, 3.0%] 7
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.8% [-1.4%, -0.0%] 11
All ❌✅ (primary) 0.2% [0.2%, 0.2%] 3

Max RSS (memory usage)

Results (primary -1.3%, secondary -3.6%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
1.1% [1.1%, 1.1%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-1.7% [-2.2%, -0.8%] 7
Improvements ✅
(secondary)
-3.6% [-7.2%, -0.5%] 22
All ❌✅ (primary) -1.3% [-2.2%, 1.1%] 8

Cycles

Results (secondary -0.2%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
3.1% [2.4%, 3.9%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-3.6% [-3.8%, -3.4%] 2
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 468.353s -> 465.563s (-0.60%)
Artifact size: 390.65 MiB -> 388.46 MiB (-0.56%)

@rustbot rustbot added the perf-regression Performance regression. label Aug 28, 2025
@lqd
Copy link
Member

lqd commented Aug 28, 2025

match-stress is being noisy again

@Zalathar Zalathar deleted the rollup-ii9z77c branch August 29, 2025 01:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-attributes Area: Attributes (`#[…]`, `#![…]`) A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc A-tidy Area: The tidy tool A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. rollup A PR which is a rollup 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. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.