Skip to content

Rollup of 8 pull requests #140282

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 25 commits into from
Apr 25, 2025
Merged

Rollup of 8 pull requests #140282

merged 25 commits into from
Apr 25, 2025

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Natural-selection1 and others added 25 commits March 26, 2025 08:23
Although `Env` (as `Vars`), `Args`, path functions, and OS constants are
publicly exposed via `std::env`, their implementations are each
self-contained. Keep them separate in `std::sys` and make a new module,
`sys::env`, for `Env`.
These have grown out of sync with the platforms.
Also, update the same pattern of reuse in `sys::args` to match.
This commit picks up a few odd ends discovered during the work on rust-lang#130227.
It adds some documentation and renames a few methods with too generic names
to describe what they actually do. It also adds some debug output that was
helpful during bug hunting.
`concat_idents` has been around unstably for a long time, but there is
now a better (but still unstable) way to join identifiers using
`${concat(...)}` syntax with `macro_metavar_expr_concat`. This resolves
a lot of the problems with `concat_idents` and is on a better track
toward stabilization, so there is no need to keep both versions around.
`concat_idents!` still has a lot of use in the ecosystem so deprecate it
before removing, as discussed in [1].

Link: rust-lang#124225
[1]: https://rust-lang.zulipchat.com/#narrow/channel/219381-t-libs/topic/Removing.20.60concat_idents.60
…r=workingjubilee

Deprecate the unstable `concat_idents!`

`concat_idents` has been around unstably for a long time, but there is now a better (but still unstable) way to join identifiers using `${concat(...)}` syntax with `macro_metavar_expr_concat`. This resolves a lot of the problems with `concat_idents` and is on a better track toward stabilization, so there is no need to keep both versions around. `concat_idents!` still has a lot of use in the ecosystem so deprecate it before removing, as discussed in [1].

Link: rust-lang#124225

[1]: https://rust-lang.zulipchat.com/#narrow/channel/219381-t-libs/topic/Removing.20.60concat_idents.60
…oc, r=Amanieu

Update the index of Option to make the summary more comprehensive

fix: rust-lang#138955

This PR and rust-lang#138968 are twin PR

By the way, this is my first time contributing to rust, and I'm not a native English speaker, so any suggestions—whether about the wording in the docs or the contribution process itself—would be greatly appreciated!
ensure compiler existance of tools on the dist step

Fixes rust-lang#138778 with a coverage on rust-lang#138123 and rust-lang#138004.

try-job: dist-powerpc64le-linux
Move `sys::pal::os::Env` into `sys::env`

Although `Env` (as `Vars`), `Args`, path functions, and OS constants are publicly exposed via `std::env`, their implementations are each self-contained. Keep them separate in `std::sys` and make a new module, `sys::env`, for `Env`.

Also fix `unsafe_op_in_unsafe_fn` for Unix and update the `!DynSend` and `!DynSync` impls which had grown out of sync with the platforms (see rust-lang#48005 for discussion on that).

r? joboet

Tracked in rust-lang#117276.
… r=lcnr

Make #![feature(let_chains)] bootstrap conditional in compiler/

Let chains have been stabilized recently in rust-lang#132833, so we can remove the gating from our uses in the compiler (as the compiler uses edition 2024).
…er-errors

norm nested aliases before evaluating the parent goal

see the explanation of the underlying issue in tests/ui/traits/next-solver/normalize/eager-norm-pre-normalizes-to.rs.

This is also the cause of rust-lang/trait-system-refactor-initiative#184, fixing the overflow errors with the new solver. I did not add any tests based on it directly as relying on that behavior to cause recursion limit shenanigans feels fragile. Thanks `@Nadrieril` for minimizing the issue [on zulip](https://rust-lang.zulipchat.com/#narrow/channel/364551-t-types.2Ftrait-system-refactor/topic/typenum.20.602.20.2F.201.60.20overflow.20error/with/513993621).

r? `@compiler-errors`
…leywiser

Some drive-by housecleaning in `rustc_borrowck`

This commit picks up a few odd ends discovered during the work on rust-lang#130227. It adds some documentation and renames a few methods with too generic names to describe what they actually do. It also adds some debug output that was helpful during bug hunting and generally cleans up a few things (for my values of "clean").

r? lcnr
…son, r=nnethercote

Don't use item name to look up associated item from trait item

This fix should be self-justifying b/c the fact that we were using identifiers here was kinda sus anyways, esp b/c we have a failproof way of doing the comparison :) I'll leave some info about why this repro needs a macro.

Fixes rust-lang#140259

r? `@nnethercote`
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) O-hermit Operating System: Hermit O-SGX Target: SGX O-solid Operating System: SOLID labels Apr 25, 2025
@rustbot rustbot added O-unix Operating system: Unix-like O-wasi Operating system: Wasi, Webassembly System Interface O-windows Operating system: Windows PG-exploit-mitigations Project group: Exploit mitigations 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-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 Apr 25, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Apr 25, 2025

📌 Commit 3c08a50 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 Apr 25, 2025
@bors
Copy link
Collaborator

bors commented Apr 25, 2025

⌛ Testing commit 3c08a50 with merge 8f43b85...

@bors
Copy link
Collaborator

bors commented Apr 25, 2025

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 8f43b85 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 25, 2025
@bors bors merged commit 8f43b85 into rust-lang:master Apr 25, 2025
7 checks passed
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 5c54aa7 (parent) -> 8f43b85 (this PR)

Test differences

Show 353 test diffs

Stage 0

  • core::builder::tests::dist::dist_all_cross: [missing] -> pass (J2)

Stage 1

  • [ui] tests/ui/impl-trait/in-trait/dont-probe-missing-item-name-4.rs: [missing] -> pass (J1)
  • [ui] tests/ui/traits/next-solver/normalize/eager-norm-pre-normalizes-to.rs: [missing] -> pass (J1)

Stage 2

  • [ui] tests/ui/impl-trait/in-trait/dont-probe-missing-item-name-4.rs: [missing] -> pass (J0)
  • [ui] tests/ui/traits/next-solver/normalize/eager-norm-pre-normalizes-to.rs: [missing] -> pass (J0)

Additionally, 348 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 8f43b85954d2f3d8fc00a7504c603e5ca9eb0695 --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-aarch64-linux: 5264.5s -> 7533.4s (43.1%)
  2. x86_64-apple-2: 5685.9s -> 7042.4s (23.9%)
  3. aarch64-gnu-debug: 3947.9s -> 4238.9s (7.4%)
  4. mingw-check: 1311.4s -> 1217.1s (-7.2%)
  5. dist-i686-linux: 5828.4s -> 6237.4s (7.0%)
  6. dist-x86_64-msvc-alt: 7813.1s -> 7349.1s (-5.9%)
  7. dist-x86_64-linux-alt: 7832.5s -> 7408.4s (-5.4%)
  8. x86_64-mingw-2: 7428.2s -> 7036.8s (-5.3%)
  9. x86_64-apple-1: 7418.8s -> 7803.1s (5.2%)
  10. dist-powerpc-linux: 5237.1s -> 5474.1s (4.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

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#137653 Deprecate the unstable concat_idents! 07b72e10404e2049087865891aad8662181c5ef2 (link)
#138957 Update the index of Option to make the summary more compreh… c5c039281818f1325c7c0d32a602b7721d323531 (link)
#140006 ensure compiler existance of tools on the dist step 08db2fa5e80fb59e74d72bf2f8282d529243eb90 (link)
#140143 Move sys::pal::os::Env into sys::env b2afc4114c9c467607f46e2f717966b2b0f44d4b (link)
#140202 Make #![feature(let_chains)] bootstrap conditional in compi… 789e320b2a7fe34936f297ada7ecaf2254ced73f (link)
#140236 norm nested aliases before evaluating the parent goal 87b18c02649a91b86bfb3863b1a08edfcf5921b1 (link)
#140257 Some drive-by housecleaning in rustc_borrowck d3d56f9ee60d138d1a3c3d6a4341fc468a094ae2 (link)
#140278 Don't use item name to look up associated item from trait i… c39eb086ea9674c65ce7811873a68e9c67a967e1 (link)

previous master: 5c54aa781f

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 (8f43b85): 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 0.4%, secondary -2.5%)

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.8% [0.7%, 1.0%] 2
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.4% [-0.4%, -0.4%] 1
Improvements ✅
(secondary)
-2.5% [-2.5%, -2.5%] 1
All ❌✅ (primary) 0.4% [-0.4%, 1.0%] 3

Cycles

Results (primary -1.1%)

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

Binary size

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

Bootstrap: 776.42s -> 775.267s (-0.15%)
Artifact size: 365.20 MiB -> 365.20 MiB (-0.00%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-attributes Area: Attributes (`#[…]`, `#![…]`) A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) merged-by-bors This PR was explicitly merged by bors. O-hermit Operating System: Hermit O-SGX Target: SGX O-solid Operating System: SOLID O-unix Operating system: Unix-like O-wasi Operating system: Wasi, Webassembly System Interface O-windows Operating system: Windows PG-exploit-mitigations Project group: Exploit mitigations 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-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)
Projects
None yet
Development

Successfully merging this pull request may close these issues.