[beta] backports #92592
Merged
[beta] backports #92592
Conversation
This file contains hidden or 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
…f not set." This reverts commit b376f56, which is the main part of rust-lang#90499, because it turns out that this causes a good amount of breakage in crates relying on the old behavior. Fixes rust-lang#91372.
Adds the minimial repro test case from rust-lang#85360. The fix for rust-lang#85360 was supposed to be rust-lang#85868 however the repro was resolved in the 2021-07-05 nightly while rust-lang#85360 didn't land until 2021-09-03. The reason for that is d34a3a4 **also** resolves that issue. To test if rust-lang#85868 actually fixes rust-lang#85360, I reverted d34a3a4 and found that rust-lang#85868 does indeed resolve rust-lang#85360. With that question resolved, add a test case to our incremental test suite for the original Ok(EvaluatedToOkModuloRegions) ICE. Thanks to @lqd for helping track this down!
As suggested via reviewer feedback.
|
Some changes occurred in HTML/CSS/JS. |
rustbot
added
T-compiler
|
rust-highfive
added
the
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
Mark-Simulacrum
force-pushed
the
beta-next
branch
from
5b0db01 to
41946b5
Compare
This comment has been minimized.
This comment has been minimized.
Mark-Simulacrum
force-pushed
the
beta-next
branch
from
41946b5 to
a168fa3
Compare
|
@Aaron1011 @jackh726 @wesleywiser (not sure if others should also be cc'd) I'm seeing this diff on this PR for the test added by #91065, which seems potentially like we're missing a backport of some other PR? This does include #90423, but perhaps we need a separate PR to add to that... (Also going to ping on Zulip as we don't have much time before the release). 16 LL | fn test<T: Sized>(_: T) {}
17 | ----- predicate
18
- error: evaluate(Binder(TraitPredicate(<MaskedStorage<GenericComp2<Pos>> as std::marker::Sized>, polarity:Positive), [])) = Ok(EvaluatedToOkModuloRegions)
+ error: evaluate(Binder(TraitPredicate(<MaskedStorage<GenericComp2<Pos>> as std::marker::Sized>, polarity:Positive), [])) = Ok(EvaluatedToOk)
20 --> $DIR/issue-85360-eval-obligation-ice.rs:13:5
21 |
22 LL | test::<MaskedStorage<GenericComp2<Pos>>>(make());
25 LL | fn test<T: Sized>(_: T) {}
26 | - predicate
27
- error: evaluate(Binder(TraitPredicate(<MaskedStorage<GenericComp2<Pos>> as std::marker::Sized>, polarity:Positive), [])) = Ok(EvaluatedToOkModuloRegions)
+ error: evaluate(Binder(TraitPredicate(<MaskedStorage<GenericComp2<Pos>> as std::marker::Sized>, polarity:Positive), [])) = Ok(EvaluatedToOk)
29 --> $DIR/issue-85360-eval-obligation-ice.rs:13:5 |
This comment has been minimized.
This comment has been minimized.
Mark-Simulacrum
force-pushed
the
beta-next
branch
from
a168fa3 to
334e0df
Compare
This comment has been minimized.
This comment has been minimized.
Stand-in for a backport of "Sync portable-simd to remove autosplats rust-lang#91484".
Mark-Simulacrum
force-pushed
the
beta-next
branch
from
334e0df to
439efc1
Compare
|
@bors r+ rollup=never |
|
📌 Commit 439efc1 has been approved by |
bors
added
S-waiting-on-bors
|
@bors r+ rollup=never |
|
📌 Commit 10f9a63 has been approved by |
|
@bors p=1 (release next week) |
camelid
added
the
T-release
|
⌛ Testing commit 10f9a63 with merge 43f02cd4a7180e8dc2f2739e3a6d979da7e8496e... |
This comment has been minimized.
This comment has been minimized.
|
📌 Commit e458615 has been approved by |
|
@bors p=10 (setting up another rollup to merge after this) |
|
@bors retry |
|
☀️ Test successful - checks-actions |
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.
Backports these PRs:
r? @Mark-Simulacrum