Skip to content
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

Rollup of 8 pull requests #138841

Merged
merged 19 commits into from
Mar 23, 2025
Merged

Rollup of 8 pull requests #138841

merged 19 commits into from
Mar 23, 2025

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

paulmenage and others added 19 commits March 10, 2025 08:31
This allows these test modules to pass on builds/targets without
unwinding support, where `panic = "abort"` - the ignored tests are for
functionality that's not supported on those targets.
`--emit mir`, `#[rustc_symbol_name]` and `#[rustc_def_path]` now run
before codegen and thus work even if codegen fails. This can help with
debugging.
This reverts commit 82af73d.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
…, r=aDotInTheVoid

rustdoc: Use own logic to print `#[repr(..)]` attributes in JSON output.

Switch away from `Debug`-like representation of `#[repr(..)]` attributes, and start using rustdoc's own logic for pretty-printing `#[repr(..)]` in rustdoc JSON.

Part of addressing rust-lang#137645 but not a complete solution for it.

r? `@aDotInTheVoid`

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
…orn3

Mark some std tests as requiring `panic = "unwind"`

This allows these test modules to pass on builds/targets without unwinding support, where `panic = "abort"` - the ignored tests are for functionality that's not supported on those targets.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
…t-error-part3, r=notriddle

rustdoc js: add nonnull helper and typecheck src-script.js

this removes ``@ts-nocheck`` from `src-script.js` and adds a `nonnull` helper function that assists in adding null checks to places where null values should be impossible.

r? `@notriddle`

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Add release notes for 1.85.1

Closes rust-lang#138819.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
…boet

Fix Thread::set_name on cygwin

Just like Linux, Cygwin also sets a limitation to thread name.

https://github.com/cygwin/cygwin/blob/8e50c7af7c49819245739d6f626f6fecc394ef7f/winsup/cygwin/thread.cc#L3175

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
…r-errors

Move some driver code around

`--emit mir`, `#[rustc_symbol_name]` and `#[rustc_def_path]` now run before codegen and thus work even if codegen fails. This can help with debugging.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
target spec check: better error when llvm-floatabi is missing

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
De-Stabilize `file_lock`

This reverts rust-lang#136794

FCP on the tracking issue (rust-lang#130994) passsed successfully rust-lang#130994 (comment) but there are now concerns about the suitability of the proposed API (rust-lang#130994 (comment))

On zullip it was [suggested](https://rust-lang.zulipchat.com/#narrow/channel/219381-t-libs/topic/File.3A.3Atry_lock.20API.3A.20Result.3Cbool.3E/near/506823067) that it would be better to temporarily(?) destabilize the feature ASAP to buy us some more time reflecting on the API.

This PR implements the revert.

The feature is not currently on beta (https://github.com/rust-lang/rust/blob/beta/library/std/src/fs.rs#L672) so a beta backport is not yet neccessary.

If this revert is accepted, the tracking issue (rust-lang#130994) should be reopened
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-rustdoc-json Area: Rustdoc JSON backend O-unix Operating system: Unix-like S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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. T-release Relevant to the release subteam, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. rollup A PR which is a rollup labels Mar 22, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Mar 22, 2025

📌 Commit 3f59916 has been approved by matthiaskrgr

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 Mar 22, 2025
@bors
Copy link
Contributor

bors commented Mar 22, 2025

⌛ Testing commit 3f59916 with merge 756bff9...

@bors
Copy link
Contributor

bors commented Mar 23, 2025

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 756bff9 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 23, 2025
@bors bors merged commit 756bff9 into rust-lang:master Mar 23, 2025
7 checks passed
@rustbot rustbot added this to the 1.87.0 milestone Mar 23, 2025
Copy link

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 b48576b (parent) -> 756bff9 (this PR)

Test differences

Show 352 test diffs
  • errors::verify_interface_abi_required_feature_19 (stage 1): [missing] -> pass (J0)
  • errors::verify_interface_abi_required_feature_20 (stage 1): pass -> [missing] (J0)
  • errors::verify_interface_cant_emit_mir_11 (stage 1): pass -> [missing] (J0)
  • errors::verify_interface_failed_writing_file_13 (stage 1): [missing] -> pass (J0)
  • errors::verify_interface_failed_writing_file_14 (stage 1): pass -> [missing] (J0)
  • errors::verify_interface_ignoring_extra_filename_16 (stage 1): [missing] -> pass (J0)
  • errors::verify_interface_ignoring_extra_filename_17 (stage 1): pass -> [missing] (J0)
  • errors::verify_interface_ignoring_out_dir_17 (stage 1): [missing] -> pass (J0)
  • errors::verify_interface_ignoring_out_dir_18 (stage 1): pass -> [missing] (J0)
  • errors::verify_interface_limit_invalid_20 (stage 1): [missing] -> pass (J0)
  • errors::verify_interface_limit_invalid_21 (stage 1): pass -> [missing] (J0)
  • errors::verify_interface_multiple_output_types_adaption_15 (stage 1): [missing] -> pass (J0)
  • errors::verify_interface_multiple_output_types_adaption_16 (stage 1): pass -> [missing] (J0)
  • errors::verify_interface_multiple_output_types_to_stdout_18 (stage 1): [missing] -> pass (J0)
  • errors::verify_interface_multiple_output_types_to_stdout_19 (stage 1): pass -> [missing] (J0)
  • errors::verify_interface_proc_macro_crate_panic_abort_14 (stage 1): [missing] -> pass (J0)
  • errors::verify_interface_proc_macro_crate_panic_abort_15 (stage 1): pass -> [missing] (J0)
  • errors::verify_interface_rustc_error_fatal_11 (stage 1): [missing] -> pass (J0)
  • errors::verify_interface_rustc_error_fatal_12 (stage 1): pass -> [missing] (J0)
  • errors::verify_interface_rustc_error_unexpected_annotation_12 (stage 1): [missing] -> pass (J0)
  • errors::verify_interface_rustc_error_unexpected_annotation_13 (stage 1): pass -> [missing] (J0)
  • session_diagnostics::verify_driver_impl_cant_emit_mir_0 (stage 1): [missing] -> pass (J0)
  • session_diagnostics::verify_driver_impl_ice_7 (stage 1): pass -> [missing] (J0)
  • session_diagnostics::verify_driver_impl_ice_8 (stage 1): [missing] -> pass (J0)
  • session_diagnostics::verify_driver_impl_ice_bug_report_8 (stage 1): pass -> [missing] (J0)
  • session_diagnostics::verify_driver_impl_ice_bug_report_9 (stage 1): [missing] -> pass (J0)
  • session_diagnostics::verify_driver_impl_ice_bug_report_internal_feature_10 (stage 1): pass -> [missing] (J0)
  • session_diagnostics::verify_driver_impl_ice_bug_report_internal_feature_11 (stage 1): [missing] -> pass (J0)
  • session_diagnostics::verify_driver_impl_ice_bug_report_update_note_10 (stage 1): [missing] -> pass (J0)
  • session_diagnostics::verify_driver_impl_ice_bug_report_update_note_9 (stage 1): pass -> [missing] (J0)
  • session_diagnostics::verify_driver_impl_ice_exclude_cargo_defaults_14 (stage 1): pass -> [missing] (J0)
  • session_diagnostics::verify_driver_impl_ice_exclude_cargo_defaults_15 (stage 1): [missing] -> pass (J0)
  • session_diagnostics::verify_driver_impl_ice_flags_13 (stage 1): pass -> [missing] (J0)
  • session_diagnostics::verify_driver_impl_ice_flags_14 (stage 1): [missing] -> pass (J0)
  • session_diagnostics::verify_driver_impl_ice_path_12 (stage 1): pass -> [missing] (J0)
  • session_diagnostics::verify_driver_impl_ice_path_13 (stage 1): [missing] -> pass (J0)
  • session_diagnostics::verify_driver_impl_ice_version_11 (stage 1): pass -> [missing] (J0)
  • session_diagnostics::verify_driver_impl_ice_version_12 (stage 1): [missing] -> pass (J0)
  • session_diagnostics::verify_driver_impl_rlink_corrupt_file_6 (stage 1): pass -> [missing] (J0)
  • session_diagnostics::verify_driver_impl_rlink_corrupt_file_7 (stage 1): [missing] -> pass (J0)
  • session_diagnostics::verify_driver_impl_rlink_empty_version_number_2 (stage 1): pass -> [missing] (J0)
  • session_diagnostics::verify_driver_impl_rlink_empty_version_number_3 (stage 1): [missing] -> pass (J0)
  • session_diagnostics::verify_driver_impl_rlink_encoding_version_mismatch_3 (stage 1): pass -> [missing] (J0)
  • session_diagnostics::verify_driver_impl_rlink_encoding_version_mismatch_4 (stage 1): [missing] -> pass (J0)
  • session_diagnostics::verify_driver_impl_rlink_no_a_file_5 (stage 1): pass -> [missing] (J0)
  • session_diagnostics::verify_driver_impl_rlink_no_a_file_6 (stage 1): [missing] -> pass (J0)
  • session_diagnostics::verify_driver_impl_rlink_rustc_version_mismatch_4 (stage 1): pass -> [missing] (J0)
  • session_diagnostics::verify_driver_impl_rlink_rustc_version_mismatch_5 (stage 1): [missing] -> pass (J0)
  • session_diagnostics::verify_driver_impl_rlink_unable_to_read_0 (stage 1): pass -> [missing] (J0)
  • session_diagnostics::verify_driver_impl_rlink_unable_to_read_1 (stage 1): [missing] -> pass (J0)
  • session_diagnostics::verify_driver_impl_rlink_wrong_file_type_1 (stage 1): pass -> [missing] (J0)
  • session_diagnostics::verify_driver_impl_rlink_wrong_file_type_2 (stage 1): [missing] -> pass (J0)
  • session_diagnostics::verify_driver_impl_unstable_feature_usage_15 (stage 1): pass -> [missing] (J0)
  • session_diagnostics::verify_driver_impl_unstable_feature_usage_16 (stage 1): [missing] -> pass (J0)

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

Job group index

  • J0: aarch64-apple, aarch64-gnu, i686-gnu-2, i686-gnu-nopt-2, i686-mingw-2, i686-mingw-3, i686-msvc-2, x86_64-apple-1, x86_64-gnu, x86_64-gnu-llvm-18-3, x86_64-gnu-llvm-19-3, x86_64-gnu-nopt, x86_64-gnu-stable, x86_64-mingw-2, x86_64-msvc-2

@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#138018 rustdoc: Use own logic to print #[repr(..)] attributes in… 668ac4bb61a48cdf114ad75e74cee6cb162e9bc6 (link)
#138294 Mark some std tests as requiring panic = "unwind" 296a9af9bc6bf50da13629857a6df9344036fd28 (link)
#138468 rustdoc js: add nonnull helper and typecheck src-script.js 65d7d7b44b305ad2ed7d63f7ec1dddd9451ad660 (link)
#138675 Add release notes for 1.85.1 edd4853e280e467ddbf8ca172e244a0bec794b6d (link)
#138765 Fix Thread::set_name on cygwin 927cc54042f0448cae094518b97046d76ebd2787 (link)
#138786 Move some driver code around 19121e8692309b5a19d80a19d85de44b4fe9b7a5 (link)
#138793 target spec check: better error when llvm-floatabi is missi… 28417ba1f62ff9d8c4246ed45c61562a43d7551f (link)
#138822 De-Stabilize file_lock c3c7c2f6fc4a74f9cab17159c1416859bad1466e (link)

previous master: b48576b4db

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

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (756bff9): 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)

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

Cycles

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

Binary size

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

Bootstrap: 775.46s -> 774.407s (-0.14%)
Artifact size: 365.52 MiB -> 365.55 MiB (0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-attributes Area: Attributes (`#[…]`, `#![…]`) A-rustdoc-json Area: Rustdoc JSON backend merged-by-bors This PR was explicitly merged by bors. O-unix Operating system: Unix-like 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-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. T-release Relevant to the release subteam, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet