Skip to content

Rollup of 7 pull requests #143434

New issue

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

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

Already on GitHub? # to your account

Merged
merged 50 commits into from
Jul 4, 2025
Merged

Rollup of 7 pull requests #143434

merged 50 commits into from
Jul 4, 2025

Conversation

matthiaskrgr
Copy link
Member

@matthiaskrgr matthiaskrgr commented Jul 4, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

The rustc-dev-guide Cronjob Bot and others added 30 commits June 26, 2025 04:07
…of rdg

Signed-off-by: xizheyin <xizheyin@smail.nju.edu.cn>
Signed-off-by: xizheyin <xizheyin@smail.nju.edu.cn>
…isolation

Add `arguments sharing and isolation` section in `diagnostic-struct` of rdg
…tted

Signed-off-by: xizheyin <xizheyin@smail.nju.edu.cn>
Explain where rdg changes should be submitted
Add temporary broken `./x test library/std` advisory
The last part of the paragraph did not fit
- `for` loops now use two `match`es for all of their bindings. I'm not
sure this is the most helpful way of conveying that, but it's about as
informative as before while staying brief.

- `while let` and `if let` don't use `match`; they use `let` expressions
in their conditions. Since `if let` no longer has significantly
different desugaring and having a whole bullet point for `while` would
feel redundant with `for`, I've removed those examples.
…ring

update AST-to-HIR lowering examples for conditionals and loops
adjust autodiff docs, after splitting up autodiff into two macros
- rewrite all `SmirInterface` apis.
- add `BridgeTys` to impl those associated types in `Bridge`.
- move `**_def()` stuffs living in `impl Tables` from `rustc_internal` to `stable_mir`.
The previous `rustc_smir::alloc` had many direct calls to rustc queries.

This commit splits it into two parts: `rustc_smir::alloc` and `stable_mir::alloc`.

Following the same pattern as `SmirCtxt` and `SmirInterface`, the `rustc_smir::alloc` handles all direct interactions with rustc queries and performs the actual memory allocations, while the `stable_mir::alloc` is responsible for constructing stable components.
This commit removes the `Tables` field from `SmirCtxt`, since borrows of `tables` should only be managed by `SmirInterface`.

This change prevents `SmirCtxt` from holding separate borrows and requires passing `tables` explicitly when needed.

We use the `traits.rs` file to define traits that are used for encapsulating the associated functions in the rustc's internals. This is much easier to use and maintain than directly cramming everything into `SmirCtxt`.
note that this commit delete `convert/error.rs`, we would use `SmirError::from_internal` instead.

**Unresolved questions:**
- There are still a few direct calls to rustc's internals scattered across `impl Stable`s, but most of them appear to be relatively stable, e.g., `mir::interpret::ConstAllocation::inner(self)` and `mir::syntax::SwitchTargets::otherwise(self)`.
the only functionality of `Tables` is caching results. this commit moves calls to rustc queries from `Tables` to `SmirCtxt`.
bump termize dep

Bumps termize to drop one more winapi dep. Only change is really moving from winapi: https://github.com/JohnTitor/termize/releases/tag/v0.2.0

Clippy depends on termize 0.1.1, rust-lang/rust-clippy#15207
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-rustc-dev-guide Area: rustc-dev-guide 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-rustdoc Relevant to the rustdoc 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 Jul 4, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Jul 4, 2025

📌 Commit 3a5da6c 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 Jul 4, 2025
@bors
Copy link
Collaborator

bors commented Jul 4, 2025

⌛ Testing commit 3a5da6c with merge 0c4fa26...

@bors
Copy link
Collaborator

bors commented Jul 4, 2025

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 0c4fa26 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 4, 2025
@bors bors merged commit 0c4fa26 into rust-lang:master Jul 4, 2025
1 check passed
@rustbot rustbot added this to the 1.90.0 milestone Jul 4, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#140643 Refactor StableMIR f540359f704e7568850b07e46240eab30e81ceab (link)
#143286 Make -Ztrack-diagnostics emit like a note 9a3c5bcc06a7e72505f5eb1ebe0c5e4cb3d86dae (link)
#143308 Remove PointerLike trait 3cfac9d7fc50f361738d75ea102d5b243de1f7aa (link)
#143387 Make __rust_alloc_error_handler_should_panic a function cac8b65db1abc7e2c943863a866bf8642dfa7f99 (link)
#143400 Port #[rustc_pass_by_value] to the new attribute system 034dcc60c3472ef5f46108bf46b5287cf312d37c (link)
#143417 bump termize dep 38c7e3a42b2c7d717c2dbc13c6baec5846224a6e (link)
#143420 rustc-dev-guide subtree update 0585ea669cbb24cfb1e994fd6bac4daa3c04473e (link)

previous master: 556d20a834

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

github-actions bot commented Jul 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 556d20a (parent) -> 0c4fa26 (this PR)

Test differences

Show 98 test diffs

Stage 1

  • [ui] tests/ui/traits/next-solver/pointer-like.rs: pass -> [missing] (J1)

Stage 2

  • [ui] tests/ui/traits/next-solver/pointer-like.rs: pass -> [missing] (J0)

Additionally, 96 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 0c4fa2690de945f062668acfc36b3f8cfbd013e2 --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-apple: 8467.6s -> 11672.3s (37.8%)
  2. x86_64-apple-2: 7528.2s -> 5507.1s (-26.8%)
  3. dist-apple-various: 7112.6s -> 8451.4s (18.8%)
  4. pr-check-2: 1925.8s -> 2135.3s (10.9%)
  5. aarch64-apple: 4692.4s -> 4207.3s (-10.3%)
  6. x86_64-apple-1: 7414.1s -> 8177.7s (10.3%)
  7. dist-x86_64-msvc-alt: 8973.4s -> 8294.2s (-7.6%)
  8. dist-x86_64-netbsd: 4663.4s -> 4332.2s (-7.1%)
  9. x86_64-gnu-llvm-19-1: 3670.3s -> 3421.1s (-6.8%)
  10. aarch64-gnu-debug: 4316.6s -> 4039.8s (-6.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 (0c4fa26): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

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
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.9% [-0.9%, -0.9%] 2
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary -1.4%, secondary 4.0%)

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)
12.7% [12.5%, 12.8%] 3
Improvements ✅
(primary)
-1.4% [-1.4%, -1.4%] 1
Improvements ✅
(secondary)
-2.6% [-4.0%, -0.9%] 4
All ❌✅ (primary) -1.4% [-1.4%, -1.4%] 1

Cycles

Results (secondary 2.1%)

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)
2.9% [2.2%, 3.5%] 3
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.5% [-0.5%, -0.5%] 1
All ❌✅ (primary) - - 0

Binary size

Results (primary 0.0%, secondary 0.0%)

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

mean range count
Regressions ❌
(primary)
0.0% [0.0%, 0.0%] 1
Regressions ❌
(secondary)
0.0% [0.0%, 0.0%] 3
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.0% [0.0%, 0.0%] 1

Bootstrap: 461.146s -> 460.42s (-0.16%)
Artifact size: 372.20 MiB -> 372.16 MiB (-0.01%)

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
A-attributes Area: Attributes (`#[…]`, `#![…]`) A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-rustc-dev-guide Area: rustc-dev-guide 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-libs Relevant to the library team, 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Development

Successfully merging this pull request may close these issues.