[beta] backports #81774
Merged
[beta] backports #81774
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…u-se CI: only copy python.exe to python3.exe if the latter does not exist We're copying the binary to make sure we can call `python3.exe` around, but it seems like the base image of GitHub Actions changed, copying the file before we do so. This PR changes the CI script to only copy the file if it doesn't already exist. r? `@m-ou-se` cc `@Mark-Simulacrum`
…ikomatsakis Make hitting the recursion limit in projection non-fatal This change was originally made in rust-lang#80246 to avoid future (effectively) infinite loop bugs in projections, but wundergraph relies on rustc recovering here. cc rust-lang#80953 r? `@nikomatsakis`
Remove incorrect `delay_span_bug`
The following code is supposed to compile
```rust
use std::ops::BitOr;
pub trait IntWrapper {
type InternalStorage;
}
impl<T> BitOr for dyn IntWrapper<InternalStorage = T>
where
Self: Sized,
T: BitOr + BitOr<Output = T>,
{
type Output = Self;
fn bitor(self, _other: Self) -> Self {
todo!()
}
}
```
Before this change it would ICE. In rust-lang#70998 the removed logic was added
to provide better suggestions, and the `delay_span_bug` guard was added
to protect against a potential logic error when returning traits. As it
happens, there are cases, like the one above, where traits can indeed be
returned, so valid code was being rejected.
Fix (but not close) rust-lang#80207.
|
rust-highfive
added
the
S-waiting-on-review
|
@bors r+ p=1 rollup=never |
|
📌 Commit 8592c024e5ee19c71602eaaa652828098e1feaf8 has been approved by |
bors
added
S-waiting-on-bors
…lint, r=pnkfelix introduce future-compatibility warning for forbidden lint groups We used to ignore `forbid(group)` scenarios completely. This changed in rust-lang#78864, but that led to a number of regressions (rust-lang#80988, rust-lang#81218). This PR introduces a future compatibility warning for the case where a group is forbidden but then an individual lint within that group is allowed. We now issue a FCW when we see the "allow", but permit it to take effect. r? ``@Mark-Simulacrum``
rustdoc: Fix visibility of trait and impl items Fixes rust-lang#81274. r? `@jyn514`
This comment has been minimized.
This comment has been minimized.
|
@bors r+ |
|
📌 Commit 7906dc0 has been approved by |
|
⌛ Testing commit 7906dc0 with merge 3ca5fe55d5a97ed109a8d44eb4b7e7c151b439fd... |
|
💔 Test failed - checks-actions |
bors
added
S-waiting-on-review
…lbini Work around missing -dev packages in solaris docker image. This should hopefully make the `dist-various-2` docker build work again on CI, which is now blocking everything from getting merged. r? `@pietroalbini`
|
📌 Commit e364d4a has been approved by |
bors
added
S-waiting-on-bors
bors
removed
the
S-waiting-on-bors
bors
added
the
S-waiting-on-author
…rk-Simulacrum Update LayoutError/LayoutErr stability attributes `LayoutError` ended up not making it into 1.49.0, updating the stability attributes to reflect that. I also pushed `LayoutErr` deprecation back a release to allow 2 releases before the deprecation comes into effect. This change should be backported to beta.
|
@bors r+ p=2 |
|
📌 Commit e24fee5d0360ea8086fef3f76b70ffc270091523 has been approved by |
bors
added
S-waiting-on-bors
|
⌛ Testing commit e24fee5d0360ea8086fef3f76b70ffc270091523 with merge e9415d4515c241a05a87870cf86d41ff48013aac... |
|
The job Click to see the possible cause of the failure (guessed by this bot) |
|
💔 Test failed - checks-actions |
bors
added
S-waiting-on-review
…ution-via-revert-of-pr-78373, r=matthewjasper
Revert 78373 ("dont leak return value after panic in drop")
Short term resolution for issue rust-lang#80949.
Reopen rust-lang#47949 after this lands.
(We plan to fine-tune PR rust-lang#78373 to not run into this problem.)
|
@bors r+ p=10 |
|
📌 Commit eba5432 has been approved by |
bors
added
S-waiting-on-bors
|
@bors r+ |
|
📌 Commit fc81b7c has been approved by |
|
The job Click to see the possible cause of the failure (guessed by this bot) |
|
☀️ Test successful - checks-actions |
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This backports:
delay_span_bugRemove incorrectdelay_span_bug#81532panic_fmtlint tonon_fmt_panic[beta] Renamepanic_fmtlint tonon_fmt_panic#81729