Skip to content

Rollup of 7 pull requests #143762

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

Merged
merged 39 commits into from
Jul 11, 2025
Merged

Rollup of 7 pull requests #143762

merged 39 commits into from
Jul 11, 2025

Conversation

tgross35
Copy link
Contributor

@tgross35 tgross35 commented Jul 11, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

dpaoliello and others added 30 commits June 13, 2025 15:27
We don't need to put the length of the `riscv_hwprobe` array into a
variable.  This commit removes that variable and gives the length
of the output slice to the `__riscv_hwprobe` directly.
These were left as `CURRENT_RUSTC_VERSION` in the submodule.
- Update ui.md
- Update type-alias-impl-trait.md
- Update README.md
This updates the rust-version file to 1b61d43.
Originally, we used an array of `riscv_hwprobe` directly and indexed
using raw numbers, making correspondence between the index and the query
key less obvious.

We also frequently used `out[idx].key != -1` to test whether the key is
supported by the `riscv_hwprobe` system call (on the Linux kernel
version we are testing) but we'd better to integrate with an operation
to retrieve the value.

This commit improves the ergonomics of feature querying by:

1.  Utilizing macros to
    a.  enable indexing by identifier names and
    b.  encapsulate accesses to the `riscv_hwprobe` array to query and
2.  New method `riscv_hwprobe::get()` returning `Option<u64>`,
    integrating availability checking and value retrieval.

It also removes `has_ima` for now because it's redundant if we only need
to test for single base behavior.
This updates the rust-version file to 040e2f8.
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: 040e2f8
Filtered ref: cf4d00a666607e356e410a820ae07eeba28a9b53

This merge was created using https://github.com/rust-lang/josh-sync.
Perform the first rustc pull.. for the second time
Since rust-lang#143048, we now explicitly set the build compiler for `check::Std`, which caused it to be built before we checked `--skip-std-check-if-no-download-rustc`. So I moved the check earlier to `make_run`, which resolves it.

I also added a regression test for this. Sadly we can't really test for the positive case easily (when download-ci-rustc is enabled), but we can test the negative cases, where it is disabled.
In the suggestion machinery for borrowing expressions and types, always use the available obligation `Span` to find the appropriate `Expr` to perform appropriateness checks no the `ExprKind` instead of on the textual snippet corresponding to the `Span`.

Unify the logic for the case where `&` *and* `&mut` are appropriate with the logic for only one of those cases.

Handle the case when `S::foo()` should have been `<&S>::foo()` (instead of suggesting the prior `&S::foo()`.
tgross35 added 2 commits July 10, 2025 20:20
…iler-errors

Rework borrowing suggestions to use `Expr` instead of just `Span`

In the suggestion machinery for borrowing expressions and types, always use the available obligation `Span` to find the appropriate `Expr` to perform appropriateness checks no the `ExprKind` instead of on the textual snippet corresponding to the `Span`. (We were already doing this, but only for a subset of cases.) This now better handles situations where parentheses and `<>` are needed for correct syntax (`&(foo + bar)`, `(&foo).bar()`, `<&Foo>::bar()`, etc.).

Unify the logic for the case where `&` *and* `&mut` are appropriate with the logic for only one of those cases. (Instead of having two branches for emitting the suggestion, we now have a single one, using `Diag::multipart_suggestions` always.)

Handle the case when `S::foo()` should have been `<&S>::foo()` (instead of suggesting the prior `&S::foo()`. Fix rust-lang#143393.

Make `Diag::multipart_suggestions` always verbose. CC rust-lang#141973.
…compiler-errors

Properly track the depth when expanding free alias types

Decrease the depth after the fold so as not to affect the depth for unrelated same-level constituent types. My bad.

Fixes rust-lang#142419.
@rustbot rustbot added A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-testsuite Area: The testsuite used to check the correctness of rustc F-autodiff `#![feature(autodiff)]` 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) 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 Jul 11, 2025
@tgross35
Copy link
Contributor Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Jul 11, 2025

📌 Commit 3a1bb04 has been approved by tgross35

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

bors commented Jul 11, 2025

⌛ Testing commit 3a1bb04 with merge cdac44e...

@bors
Copy link
Collaborator

bors commented Jul 11, 2025

☀️ Test successful - checks-actions
Approved by: tgross35
Pushing cdac44e to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 11, 2025
@bors bors merged commit cdac44e into rust-lang:master Jul 11, 2025
12 checks passed
@rustbot rustbot added this to the 1.90.0 milestone Jul 11, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#140136 Add an aarch64-msvc build running on ARM64 Windows 90ed755a7a5e6fca765d4f28a210f25b92647997 (link)
#143642 stdarch subtree update 6b6718a360ebf676bb1a94804730e1170617bc1a (link)
#143707 Fix --skip-std-check-if-no-download-rustc 8b49e5c5350eae31b8c9e3504bcf389bfaab03c4 (link)
#143722 Make some "safe" llvm ops actually sound 2990f728da106a9840dac6a3cf4fecb910a55452 (link)
#143728 Resolve refactor: extraction of finalize_module_binding a… 9a189e33e4c74bc8fc0e56f3f93b4a4416e5278e (link)
#143742 Rework borrowing suggestions to use Expr instead of just … b5c43f0505fa8cc2f8e07dba940774c2d9d65499 (link)
#143744 Properly track the depth when expanding free alias types 2a8d367d6d2a1ec54067dc547f9b1862edbeb317 (link)

previous master: 2a023bf80a

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 2a023bf (parent) -> cdac44e (this PR)

Test differences

Show 7 test diffs

Stage 0

  • core::builder::tests::snapshot::check_library_skip_without_download_rustc: [missing] -> pass (J1)

Stage 1

  • [ui] tests/ui/lazy-type-alias/deep-expansion.rs: [missing] -> pass (J0)

Stage 2

  • [ui] tests/ui/lazy-type-alias/deep-expansion.rs: [missing] -> pass (J2)

Additionally, 4 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 cdac44e608c3df9a241e0a1b53b3f62af250dbf1 --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. x86_64-apple-2: 3970.3s -> 6111.4s (53.9%)
  2. dist-aarch64-linux: 6076.9s -> 8380.7s (37.9%)
  3. dist-aarch64-msvc: 8275.5s -> 5371.1s (-35.1%)
  4. x86_64-apple-1: 7973.5s -> 6454.6s (-19.0%)
  5. aarch64-apple: 5539.1s -> 4749.7s (-14.3%)
  6. dist-x86_64-apple: 8509.0s -> 9535.3s (12.1%)
  7. pr-check-1: 1699.5s -> 1544.4s (-9.1%)
  8. dist-riscv64-linux: 4706.8s -> 5114.8s (8.7%)
  9. pr-check-2: 2409.3s -> 2618.2s (8.7%)
  10. dist-apple-various: 7454.0s -> 6820.5s (-8.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 (cdac44e): comparison URL.

Overall result: ❌ regressions - 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.3% [0.3%, 0.3%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (secondary 4.3%)

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)
5.1% [1.8%, 7.1%] 8
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.0% [-2.0%, -2.0%] 1
All ❌✅ (primary) - - 0

Cycles

Results (secondary 2.5%)

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.5% [2.4%, 2.6%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 464.256s -> 464.73s (0.10%)
Artifact size: 374.58 MiB -> 374.55 MiB (-0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-testsuite Area: The testsuite used to check the correctness of rustc F-autodiff `#![feature(autodiff)]` 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-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-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.