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 25 pull requests #138114

Merged
merged 62 commits into from
Mar 7, 2025
Merged

Conversation

compiler-errors
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

arlosi and others added 30 commits February 20, 2025 11:47
Instead, we adopt the position that introducing an `unsafe` field
itself carries a safety invariant: that if you assign an invariant
to that field weaker than what the field's destructor requires,
you must ensure that field is in a droppable state in your
destructor.

See:
- rust-lang/rfcs#3458 (comment)
- https://rust-lang.zulipchat.com/#narrow/channel/213817-t-lang/topic/unsafe.20fields.20RFC/near/502113897
This is an attempt to fix rust-lang#135087 together with rust-lang#135886, but I am not sure if I've succeeded in adding much clarity here, so don't be shy with your comments.
…s doc(hidden)

Signed-off-by: xizheyin <xizheyin@smail.nju.edu.cn>
When encountering a resolve E0575 error for an associated method (when a type was expected), see if it could have been an intended return type notation bound.

```
error[E0575]: expected associated type, found associated function `Trait::method`
  --> $DIR/bad-inputs-and-output.rs:31:36
   |
LL | fn foo_qualified<T: Trait>() where <T as Trait>::method(i32): Send {}
   |                                    ^^^^^^^^^^^^^^^^^^^^^^^^^ not a associated type
   |
help: you might have meant to use the return type notation syntax
   |
LL - fn foo_qualified<T: Trait>() where <T as Trait>::method(i32): Send {}
LL + fn foo_qualified<T: Trait>() where T::method(..): Send {}
   |
```
At first glance, the extra casework seems pointless and needlessly
error-prone. Clarify that there is a reason for it being there.
This is error-prone. Explicitly write down which cases don't need
anything substituted. Turn the `OpaqueType` case, which currently
seems to be unreachable, into a `bug!`.
This enables `f16` builtins for loongarch [1] and adds support for
Cygwin [2].

[1]: rust-lang/compiler-builtins#770
[2]: rust-lang/compiler-builtins#774
@compiler-errors
Copy link
Member Author

@bors r+ rollup=never p=9

@bors
Copy link
Contributor

bors commented Mar 6, 2025

📌 Commit 071bc46 has been approved by compiler-errors

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 Mar 6, 2025
@bors
Copy link
Contributor

bors commented Mar 6, 2025

⌛ Testing commit 071bc46 with merge 0e18167...

bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 6, 2025
…mpiler-errors

Rollup of 25 pull requests

Successful merges:

 - rust-lang#135733 (Implement `&pin const self` and `&pin mut self` sugars)
 - rust-lang#135895 (Document workings of successors more clearly)
 - rust-lang#136922 (Pattern types: Avoid having to handle an Option for range ends in the type system or the HIR)
 - rust-lang#137303 (Remove `MaybeForgetReturn` suggestion)
 - rust-lang#137327 (Undeprecate env::home_dir)
 - rust-lang#137358 (Match Ergonomics 2024: add context and examples to the unstable book)
 - rust-lang#137534 ([rustdoc] hide item that is not marked as doc(inline) and whose src is doc(hidden))
 - rust-lang#137565 (Try to point of macro expansion from resolver and method errors if it involves macro var)
 - rust-lang#137637 (Check dyn flavor before registering upcast goal on wide pointer cast in MIR typeck)
 - rust-lang#137643 (Add DWARF test case for non-C-like `repr128` enums)
 - rust-lang#137744 (Re-add `Clone`-derive on `Thir`)
 - rust-lang#137758 (fix usage of ty decl macro fragments in attributes)
 - rust-lang#137764 (Ensure that negative auto impls are always applicable)
 - rust-lang#137772 (Fix char count in `Display` for `ByteStr`)
 - rust-lang#137798 (ci: use ubuntu 24 on arm large runner)
 - rust-lang#137802 (miri native-call support: all previously exposed provenance is accessible to the callee)
 - rust-lang#137805 (adjust Layout debug printing to match the internal field name)
 - rust-lang#137808 (Do not require that unsafe fields lack drop glue)
 - rust-lang#137820 (Clarify why InhabitedPredicate::instantiate_opt exists)
 - rust-lang#137825 (Provide more context on resolve error caused from incorrect RTN)
 - rust-lang#137834 (rustc_fluent_macro: use CARGO_CRATE_NAME instead of CARGO_PKG_NAME)
 - rust-lang#137868 (Add minimal platform support documentation for powerpc-unknown-linux-gnuspe)
 - rust-lang#137910 (Improve error message for `AsyncFn` trait failure for RPIT)
 - rust-lang#137920 (interpret/provenance_map: consistently use range_is_empty)
 - rust-lang#138038 (Update `compiler-builtins` to 0.1.151)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Contributor

bors commented Mar 6, 2025

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 6, 2025
@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
3d66659d305e: Pushed
548a79621a42: Pushed
29eb5d1d95e4: Pushed
8dd0a5bf4e18: Pushed
Put "https://ghcr.io/v2/rust-lang-ci/rust-ci/manifests/8d482ba103f9f9e755a6ef5e749557a42b8746049b4243b9e3c7c4f245556928ceee5b08703b7aadb2865d412c6238156ed2a30427cbf7ec25f1bc7a26f85500": EOF
##[error]Process completed with exit code 1.

@compiler-errors
Copy link
Member Author

@bors retry

@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 Mar 6, 2025
@compiler-errors
Copy link
Member Author

Spurious failure 🤔

@bors
Copy link
Contributor

bors commented Mar 6, 2025

⌛ Testing commit 071bc46 with merge 98a4878...

@bors
Copy link
Contributor

bors commented Mar 7, 2025

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing 98a4878 to master...

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

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#135733 Implement &pin const self and &pin mut self sugars fb3e66a09f8201660ffb98fb544db1c2de7dbc54 (link)
#135895 Document workings of successors more clearly 46b7581550836c50907c42f4468c105db75254cb (link)
#136922 Pattern types: Avoid having to handle an Option for range e… ee892ba52bb8f5bd5f6e31b41108924b5f109c88 (link)
#137303 Remove MaybeForgetReturn suggestion e956159ac5cf9e3da4f1b00c10382b9df9428d36 (link)
#137327 Undeprecate env::home_dir ad25fe7392b663baae992355b5338cdb2e9a7c41 (link)
#137358 Match Ergonomics 2024: add context and examples to the unst… bb64bcbac812e33aa199357a5c36606385edfb4a (link)
#137534 [rustdoc] hide item that is not marked as doc(inline) and w… 20f8c190f38f1aed347eae3d27e0f27bbc9508ff (link)
#137565 Try to point of macro expansion from resolver and method er… 1a52e5e9394477bf851e3fc6613a24cd87decb34 (link)
#137637 Check dyn flavor before registering upcast goal on wide poi… ca01368075506b734cf4d4ecf5c58a2abd9bd9ad (link)
#137643 Add DWARF test case for non-C-like repr128 enums 1f69429ea1f4e07615d53c2003a292f05d9b54f8 (link)
#137744 Re-add Clone-derive on Thir d80eafeca73fec0582fc6cfc0c192f0ad556ecf8 (link)
#137758 fix usage of ty decl macro fragments in attributes 7d8f2b896d9e4ce4bcb8ff0cd57858551c0276db (link)
#137764 Ensure that negative auto impls are always applicable 5f56e5e1a5147140945991d9889aa3782f7a1923 (link)
#137772 Fix char count in Display for ByteStr f15fe20c5c09590646096725bca8201ad78b6a1d (link)
#137798 ci: use ubuntu 24 on arm large runner b19660b81ce20f09b7ba5783ad51451630a2c929 (link)
#137802 miri native-call support: all previously exposed provenance… b1a1194ba07b7ab9262de0289adb87c4a284c2af (link)
#137805 adjust Layout debug printing to match the internal field na… fd1df701208da7652f3c62193f7aea201e38988b (link)
#137808 Do not require that unsafe fields lack drop glue fd43552d131d7609983120575f6423ff2dfef09c (link)
#137820 Clarify why InhabitedPredicate::instantiate_opt exists 01ca4c910d76426af23df9c56cfb1993d574ed59 (link)
#137825 Provide more context on resolve error caused from incorrect… 9a3f4f2641cae89dc4b0f46deaceb9662d2b52c0 (link)
#137834 rustc_fluent_macro: use CARGO_CRATE_NAME instead of CARGO_P… e5717090475422eb04145944abb91eb413659e92 (link)
#137868 Add minimal platform support documentation for powerpc-unkn… 8a8483663fb3dd710e7da9f9ab6315a776fc8be6 (link)
#137910 Improve error message for AsyncFn trait failure for RPIT 2be022fc404da2093c31f3f2ad9928fd1fd63cf6 (link)
#137920 interpret/provenance_map: consistently use range_is_empty 245b0a0ea8c6f6708f28bc1e16d44c40d3f2e2a7 (link)
#138038 Update compiler-builtins to 0.1.151 4315046616b90a71516679fdb5e9387c81d513c9 (link)

previous master: b74da9613a

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 (98a4878): comparison URL.

Overall result: ❌✅ regressions and improvements - please read the text below

Our benchmarks found a performance regression caused by this PR.
This might be an actual regression, but it can also be just noise.

Next Steps:

  • If the regression was expected or you think it can be justified,
    please write a comment with sufficient written justification, and add
    @rustbot label: +perf-regression-triaged to it, to mark the regression as triaged.
  • If you think that you know of a way to resolve the regression, try to create
    a new PR with a fix for the regression.
  • If you do not understand the regression or you think that it is just noise,
    you can ask the @rust-lang/wg-compiler-performance working group for help (members of this group
    were already notified of this PR).

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
42.1% [0.2%, 167.8%] 4
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.4% [-0.5%, -0.3%] 8
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary -0.4%, secondary 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.5% [0.5%, 0.5%] 1
Regressions ❌
(secondary)
2.1% [1.0%, 3.0%] 3
Improvements ✅
(primary)
-1.2% [-1.2%, -1.2%] 1
Improvements ✅
(secondary)
-2.1% [-2.1%, -2.1%] 1
All ❌✅ (primary) -0.4% [-1.2%, 0.5%] 2

Cycles

Results (secondary 42.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
Regressions ❌
(secondary)
42.5% [1.7%, 83.3%] 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: 773.144s -> 773.206s (0.01%)
Artifact size: 362.14 MiB -> 362.10 MiB (-0.01%)

@rustbot rustbot added the perf-regression Performance regression. label Mar 7, 2025
@compiler-errors
Copy link
Member Author

who rolled up a perf regression lol

@compiler-errors
Copy link
Member Author

compiler-errors commented Mar 7, 2025

Probably #137534

#137534 (comment) testing...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-attributes Area: Attributes (`#[…]`, `#![…]`) A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.
Projects
None yet
Development

Successfully merging this pull request may close these issues.