Skip to content

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

klensy and others added 18 commits January 28, 2025 17:38
This reverts commit cf34545.

That commit led to a regression of
rust-lang#132185 .  So my analysis that
the problem lay in FreeBSD 13.2's specific LLVM version was clearly
wrong.  Revert that commit until we can figure out the real root cause.

Fixes rust-lang#132185
rustc_target has had a lot of weird reexports for various reasons, but
now we're at a point where we can actually start reducing their number.
We remove weird shadowing-dependent behavior and import directly from
rustc_abi instead of doing weird renaming imports.

This is only incremental progress and does not entirely fix the crate.
General housekeeping:
- Use less reexports from its rustc_target era
- Unify some imports as a result
- Split the Reg(ister) types into their own files

Generally moving stuff around because it makes the crate more consistent.
only check the caller + disallow caller having the attr.
…, r=compiler-errors

fix tail call checks wrt `#[track_caller]`

Only check the caller + disallow caller having the attribute.

fixes rust-lang#134336

r? `@compiler-errors`

<sub>apparently there were no tests for `#[track_caller]` before... ooops</sub>
compiler: replace few consts arrays with statics to remove const dupes

Locally on `x86_64-pc-windows-msvc` -100kb for `rustc_driver.dll`
…, r=compiler-errors

compiler: Clean up weird `rustc_abi` reexports

Just general cleanup in `rustc_target` and `rustc_abi`. I was originally going to make a PR with a larger change that also fixed the last few crates and in doing so removed some clutter from `rustc_abi`, but wound up slightly stuck on it, then figured out how to fix it, and then got distracted by other things... so now I'm trying to figure out what I had figured out earlier.
Revert "CI: build FreeBSD artifacts on FreeBSD 13.4"

This reverts commit cf34545.

That commit led to a regression of
rust-lang#132185 .  So my analysis that the problem lay in FreeBSD 13.2's specific LLVM version was clearly wrong.  Revert that commit until we can figure out the real root cause.

Fixes rust-lang#132185

try-job: dist-x86_64-freebsd
try-job: dist-various-2
…r, r=compiler-errors

MIR validation: add comment explaining the limitations of CfgChecker

I hope this right but I am not sure.^^
Cc `@compiler-errors` `@lcnr` `@cjgillot` `@oli-obk`
…u-se

Stabilise `Cursor::{get_mut, set_position}` in `const` scenarios.

Closes: rust-lang#130801

This PR stabilises the `const_mut_cursor` feature gate.
…r=fmease

ping me for attribute-related changes

r? `@fmease`
…rgau

Add `rustc_hir_pretty::item_to_string` function

Another one needed for rustdoc. :)

r? `@Urgau`
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure 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 Feb 7, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=8

@bors
Copy link
Collaborator

bors commented Feb 7, 2025

📌 Commit 0047263 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 Feb 7, 2025
@bors
Copy link
Collaborator

bors commented Feb 7, 2025

⌛ Testing commit 0047263 with merge 64e06c0...

@bors
Copy link
Collaborator

bors commented Feb 7, 2025

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 64e06c0 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 7, 2025
@bors bors merged commit 64e06c0 into rust-lang:master Feb 7, 2025
7 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Feb 7, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#135973 fix tail call checks wrt #[track_caller] 333d25fe7f47d7d9ccd6445f74b7ab935b90b48a (link)
#136191 compiler: replace few consts arrays with statics to remove … d7c834a6fe1ce6a0ad7e020e2fb7cb5ed52b2673 (link)
#136565 compiler: Clean up weird rustc_abi reexports c8f98561139d4f2088335def6a82b8d5989aac5a (link)
#136582 Revert "CI: build FreeBSD artifacts on FreeBSD 13.4" c46c027ab72687721014dc6eb07cb1002830d5d8 (link)
#136627 MIR validation: add comment explaining the limitations of C… e8c827687ab7459d6c629712cf981aa676293c96 (link)
#136634 Stabilise Cursor::{get_mut, set_position} in const scen… 7337f0edac3a939cda5f14a7ea13e07ecb4ad7d4 (link)
#136643 ping me for attribute-related changes a9221f3ae1f7897d711cfe51a1fae0953607185b (link)
#136644 Add rustc_hir_pretty::item_to_string function 2df6eee3f29ba405c072382e9f63c209aa1e28f4 (link)

previous master: 5ff18d0eae

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 (64e06c0): 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 -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
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-2.2% [-2.2%, -2.2%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -2.2% [-2.2%, -2.2%] 1

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: 777.403s -> 779.143s (0.22%)
Artifact size: 329.02 MiB -> 329.04 MiB (0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. 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-infra Relevant to the infrastructure 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.