Skip to content
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

Rollup of 9 pull requests #139390

Merged
merged 21 commits into from
Apr 5, 2025
Merged

Rollup of 9 pull requests #139390

merged 21 commits into from
Apr 5, 2025

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

nnethercote and others added 21 commits March 28, 2025 14:15
It's an old (2017 or earlier) type that describes a `self` receiver.
It's only used in `rustc_hir_analysis` for two error messages, and much
of the complexity isn't used. I suspect it used to be used for more
things.

This commit removes it, and moves a greatly simplified version of the
`determine` method into `rustc_hir_analysis`, renamed as
`get_self_string`. The big comment on the method is removed because it
no longer seems relevant.
The future and ctor fields aren't actually used, and the way they are
extracted is obviously wrong – swapping the order of the items in the
source code will give wrong results.

Instead, store just the LocalDefId of the impl, which is enough for the
only use of this data.
It uses `Br` prefixes which are inappropriate and appear to have been
incorrectly copy/pasted from the `Debug` impl for `BoundRegionKind`.
…l-ExplicitSelf, r=BoxyUwU

Remove `rustc_middle::ty::util::ExplicitSelf`.

It's an old (2017 or earlier) type that describes a `self` receiver. It's only used in `rustc_hir_analysis` for two error messages, and much of the complexity isn't used. I suspect it used to be used for more things.

This commit removes it, and moves a greatly simplified version of the `determine` method into `rustc_hir_analysis`, renamed as `get_self_string`. The big comment on the method is removed because it no longer seems relevant.

r? `@BoxyUwU`
…7970, r=fmease

Fix 2024 edition doctest panic output

Fixes rust-lang#137970.

The problem was that the output was actually displayed by rustc itself because we're exiting with `Result<(), String>`, and the display is really not great. So instead, we get the output, we print it and then we return an `ExitCode`.

r? ````@aDotInTheVoid````
unstable book: document tait

Documents the type alias impl trait feature.

Rendered:
![image](https://github.com/user-attachments/assets/1d904ff9-e1e1-4ef0-a62d-cbe2d480dce0)
![image](https://github.com/user-attachments/assets/9e877ad1-0f73-4ead-a4ac-0e106512cef8)
![image](https://github.com/user-attachments/assets/86663a23-9824-406d-a5e1-1e0c1662b5f5)

because you are deeply involved in this I'll r you but feel free to reroll
r? `@oli-obk`
…y, r=petrochenkov

AsyncDestructor: replace fields with impl_did

The future and ctor fields aren't actually used, and the way they are extracted is obviously wrong – swapping the order of the items in the source code will give wrong results.

Instead, store just the LocalDefId of the impl, which is enough for the only use of this data.
…rrors

Fix `Debug` impl for `LateParamRegionKind`.

It uses `Br` prefixes which are inappropriate and appear to have been incorrectly copy/pasted from the `Debug` impl for `BoundRegionKind`.

r? `@BoxyUwU`
ToSocketAddrs: fix typo

It's "a function", never "an function".

I noticed the same typo somewhere in the compiler sources so figured I'd fix it there as well.
…ler-errors

Use the span of the whole bound when the diagnostic talks about a bound

While it makes sense that the host predicate only points to the `~const` part, as whether the actual trait bound is satisfied is checked separately, the user facing diagnostic is talking about the entire trait bound, at which point it makes more sense to just highlight the entire bound

r? `@compiler-errors` or `@fee1-dead`
…trochenkov

Use target-agnostic LLD flags in bootstrap for `use-lld`

[Before](rust-lang#135001), I hardcoded LLD flags that pretty much only worked on GNU. The right way is to use `-Zlinker-features` instead though.

I *think* that this should also make this work on Windows mingw, and thus `@petrochenkov's` workaround is no longer necessary.

Fixes: rust-lang#139372
Closes: rust-lang#139375

r? `@lqd`
…Kobzol

Add `compiletest` adhoc_group for `r? compiletest`

r? `@Kobzol` (or bootstrap/compiler)
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Apr 4, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Apr 4, 2025

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

bors commented Apr 4, 2025

⌛ Testing commit a612ee7 with merge bad13a9...

@bors
Copy link
Collaborator

bors commented Apr 5, 2025

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 5, 2025
@bors bors merged commit bad13a9 into rust-lang:master Apr 5, 2025
7 checks passed
@rustbot rustbot added this to the 1.88.0 milestone Apr 5, 2025
Copy link

github-actions bot commented Apr 5, 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 17ffbc8 (parent) -> bad13a9 (this PR)

Test differences

Show 5 test diffs

Stage 1

  • [ui] tests/rustdoc-ui/doctest/edition-2024-error-output.rs: [missing] -> pass (J0)

Stage 2

  • [ui] tests/rustdoc-ui/doctest/edition-2024-error-output.rs: [missing] -> pass (J1)

Additionally, 3 doctest diffs were found. These are ignored, as they are noisy.

Job group index

  • J0: x86_64-gnu-llvm-18-3, x86_64-gnu-llvm-19-3
  • J1: aarch64-apple, aarch64-gnu, i686-gnu-1, i686-gnu-nopt-1, i686-msvc-1, x86_64-apple-1, x86_64-gnu, x86_64-gnu-llvm-18-1, x86_64-gnu-llvm-18-2, x86_64-gnu-llvm-19-1, x86_64-gnu-llvm-19-2, x86_64-gnu-nopt, x86_64-gnu-stable, x86_64-mingw-1, x86_64-msvc-1

Job duration changes

  1. x86_64-apple-1: 7140.3s -> 8002.9s (12.1%)
  2. dist-loongarch64-linux: 6027.6s -> 6410.4s (6.4%)
  3. dist-i686-mingw: 7880.6s -> 8259.9s (4.8%)
  4. dist-arm-linux: 5146.9s -> 5354.6s (4.0%)
  5. dist-i586-gnu-i586-i686-musl: 5139.1s -> 5330.6s (3.7%)
  6. i686-msvc-1: 9358.3s -> 9618.7s (2.8%)
  7. x86_64-msvc-ext1: 7274.3s -> 7457.9s (2.5%)
  8. dist-x86_64-freebsd: 4842.1s -> 4961.0s (2.5%)
  9. x86_64-msvc-ext2: 5728.1s -> 5845.6s (2.1%)
  10. aarch64-gnu: 6351.4s -> 6470.6s (1.9%)
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
#139041 Remove rustc_middle::ty::util::ExplicitSelf. 361bbf2ce9b161c9bdbbb76a66b638c8a02cde93 (link)
#139328 Fix 2024 edition doctest panic output de822202415e83672e3af7f8afbcb9c26538aafa (link)
#139339 unstable book: document tait ecad1441f51d410403ed8bf32c8eec7f2e9fb974 (link)
#139348 AsyncDestructor: replace fields with impl_did 91bdd1f35253e9b9e0b37dce9e230c8f911f31f0 (link)
#139353 Fix Debug impl for LateParamRegionKind. d5a4ff7aac5229c0b90d692575c1191881d7c449 (link)
#139366 ToSocketAddrs: fix typo 2ac892fec4e7356b9c2ce9300dd7b3f68fcf6e34 (link)
#139374 Use the span of the whole bound when the diagnostic talks a… 4a97a451a2d926e7f6cd499694b285059f271378 (link)
#139378 Use target-agnostic LLD flags in bootstrap for use-lld fac689c606637b33ff5ca6b907a1552eb897caa2 (link)
#139384 Add compiletest adhoc_group for r? compiletest 950089bdc66c316e689689ec17d7385c5e509d18 (link)

previous master: 17ffbc81a3

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 (bad13a9): 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 1.6%)

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

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: 780.342s -> 777.657s (-0.34%)
Artifact size: 366.00 MiB -> 365.99 MiB (-0.00%)

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 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-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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.