Skip to content

Rollup of 9 pull requests - #137231

Merged
bors merged 19 commits into
rust-lang:masterfrom
Urgau:rollup-heiq934
Feb 18, 2025
Merged

Rollup of 9 pull requests#137231
bors merged 19 commits into
rust-lang:masterfrom
Urgau:rollup-heiq934

Conversation

@Urgau

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

kornelskiand others added 19 commits February 16, 2025 00:56
In 136324 the doctest for `f16::erf()` was gated with
`reliable_f16_math`. Add the same gate on `f16::erfc()` to
avoid:
rust_out.71e2e529d20ea47d-cgu.0:\
(.text._ZN8rust_out4main43_doctest_main_library_std_src_f16_rs_1321_017h485f3ffe6bf2a981E+0x38): \
undefined reference to `__gnu_h2f_ieee'
on MIPS (and maybe other architectures).
This adds panicking Hash impls for several resolver types that don't
actually satisfy this condition. It's not obvious to me that
rustc_resolve actually upholds the Interned guarantees but fixing that
seems pretty hard (the structures have at minimum some interior
mutability, so it's not really recursively hashable in place...).
Following rust-lang#137165 (Use `tell` for `<File as Seek>::stream_position`),
`tell` is now directly exposed via `stream_position`, making
`<File as FileExt>::tell` redundant. Remove it.
Co-authored-by: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Make ub_check message clear that it's not an assert
I've seen a user assume that their unsound code was *safe*, because ub_check prevented the program from performing the unsafe operation.
This PR makes the panic message clearer that ub_check is a bug detector, not run-time safety protection.
…kingjubilee
Install more signal stack trace handlers
This PR install the signal stack handler to more signals (`SIGILL`, ~~`SIGTRAP`~~, ~~`SIGABRT`~~, ~~`SIGFPE`~~, `SIGBUS`, ~~`SIGQUIT`~~).
Noticed in rust-lang#137138 that we didn't print anything for `SIGILL`, so I though we could just handle more signals.
r? `````@workingjubilee````` since you last touched it
… r=tgross35
tests: Also gate `f16::erfc()` doctest with `reliable_f16_math` cfg
In rust-lang#136324 the doctest for `f16::erf()` was gated with `reliable_f16_math`. Add the same gate on `f16::erfc()` to avoid:
rust_out.71e2e529d20ea47d-cgu.0:\
(.text._ZN8rust_out4main43_doctest_main_library_std_src_f16_rs_1321_017h485f3ffe6bf2a981E+0x38): \
undefined reference to `__gnu_h2f_ieee'
on MIPS (and maybe other architectures).
r? tgross35
…rom-cg-clif, r=bjorn3
cg_clif: use exclusively ABI alignment
This will minimize possible conflict with future updates to AbiAndPrefAlign that may remove some fields. It is also almost a bug to consider them.
r? ``@bjorn3``
…r=saethlin
Enforce T: Hash for Interned<...>
This adds panicking Hash impls for several resolver types that don't actually satisfy this condition. It's not obvious to me that rustc_resolve actually upholds the Interned guarantees but fixing that seems pretty hard (the structures have at minimum some interior mutability, so it's not really recursively hashable in place...). FIXME comments as such on those impls.
cc rust-lang#137196 (comment)
r? ``@saethlin``
…ll, r=alexcrichton
Remove `std::os::wasi::fs::FileExt::tell`
Following rust-lang#137165 (Use `tell` for `<File as Seek>::stream_position`), `tell` is now directly exposed via `stream_position`, making `<File as FileExt>::tell` redundant. Remove it.
`std::os::wasi::fs::FileExt::tell` is currently unstable and tracked in rust-lang#71213.
``@rustbot`` ping wasi
…compiler-errors
don't ICE for alias-relate goals with error term
see comment, fixesrust-lang/trait-system-refactor-initiative#165
r? ``@compiler-errors``
…=compiler-errors
add last std diagnostic items for clippy
Part of rust-lang/rust-clippy#5393.
Add diagnostic item attributes to the items in `std` and `core` where clippy currently uses hardcoded paths (https://github.com/rust-lang/rust-clippy/blob/master/clippy_utils/src/paths.rs).
…iler-errors
Remove scrutinee_hir_id from ExprKind::Match
It is unused.
@rustbotrustbot added O-wasi Operating system: Wasi, Webassembly System Interface 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels Feb 18, 2025
@Urgau

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=5 rollup=never

@bors

bors commented Feb 18, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit 3ebe11b has been approved by Urgau

It is now in the queue for this repository.

@borsbors 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 Feb 18, 2025
@bors

bors commented Feb 18, 2025

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 3ebe11b with merge 827a0d6...

@bors

bors commented Feb 18, 2025

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: Urgau
Pushing 827a0d6 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Feb 18, 2025
@bors
bors merged commit 827a0d6 into rust-lang:masterFeb 18, 2025
@rustbotrustbot added this to the 1.87.0 milestone Feb 18, 2025
@rust-timer

Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR#MessagePerf Build Sha
#136750Make ub_check message clear that it's not an assert46c02878f6ec655a25a58421210f6d5cdc86b5cc (link)
#137151Install more signal stack trace handlersf012a563feb745bce0e7059e9ebd2b4b276ca140 (link)
#137167tests: Also gate f16::erfc() doctest with `reliable_f16_m…eb6995749d37ebe15482f75f9efc7807fc620be9 (link)
#137195cg_clif: use exclusively ABI alignmentd82eec0852b5860295f785cb39e46ec3773e4752 (link)
#137202Enforce T: Hash for Interned<...>ec80db66311030179ad6c72b814215a23e8ed666 (link)
#137205Remove std::os::wasi::fs::FileExt::tell5c2a6bfb7aa2095a79923e45cdef5d8dc8df6409 (link)
#137211don't ICE for alias-relate goals with error term955effbac89043b869c3becb1be03604c76629ca (link)
#137214add last std diagnostic items for clippy166c28bbcab3cff0ac17a8e1e50b14e2126bb6cd (link)
#137221Remove scrutinee_hir_id from ExprKind::Match5dbcf433a9903aa81c7488982bf019ef8387a85c (link)

previous master: 3b022d8cee

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
Copy Markdown
Collaborator

Finished benchmarking commit (827a0d6): 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 (secondary -2.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.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
-2.9%[-4.4%, -2.1%]3
All ❌✅ (primary)--0

Cycles

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

Binary size

Results (primary 0.1%, secondary 0.0%)

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.

meanrangecount
Regressions ❌
(primary)
0.1%[0.0%, 0.6%]30
Regressions ❌
(secondary)
0.0%[0.0%, 0.1%]22
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
--0
All ❌✅ (primary)0.1%[0.0%, 0.6%]30

Bootstrap: 775.584s -> 774.535s (-0.14%)
Artifact size: 360.27 MiB -> 360.28 MiB (0.00%)

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.O-wasiOperating system: Wasi, Webassembly System InterfacerollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-libsRelevant to the library team, which will review and decide on the PR/issue.WG-trait-system-refactorThe Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

11 participants

@Urgau@bors@rust-timer@rustbot@kornelski@workingjubilee@Mark-Simulacrum@thaliaarchi@lcnr@cyrgani@bjorn3