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

[beta] backports #92592

Merged
merged 12 commits into from
Jan 8, 2022
Merged

[beta] backports #92592

merged 12 commits into from
Jan 8, 2022

Conversation

Mark-Simulacrum
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum commented Jan 5, 2022

Backports these PRs:

r? @Mark-Simulacrum

compiler-errors and others added 6 commits January 5, 2022 15:07
…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.
@rust-highfive
Copy link
Collaborator

Some changes occurred in HTML/CSS/JS.

cc @GuillaumeGomez,@Folyd

@rustbot rustbot added T-compiler Relevant to the compiler 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. labels Jan 5, 2022
@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!
  • These commits modify compiler targets. (See the Target Tier Policy.)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 5, 2022
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@Mark-Simulacrum
Copy link
Member Author

@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

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

Stand-in for a backport of "Sync portable-simd to remove autosplats rust-lang#91484".
@Mark-Simulacrum
Copy link
Member Author

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Jan 6, 2022

📌 Commit 439efc1 has been approved by Mark-Simulacrum

@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 Jan 6, 2022
@Mark-Simulacrum
Copy link
Member Author

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Jan 7, 2022

📌 Commit 10f9a63 has been approved by Mark-Simulacrum

@Mark-Simulacrum
Copy link
Member Author

@bors p=1 (release next week)

@camelid camelid added the T-release Relevant to the release subteam, which will review and decide on the PR/issue. label Jan 7, 2022
@bors
Copy link
Contributor

bors commented Jan 7, 2022

⌛ Testing commit 10f9a63 with merge 43f02cd4a7180e8dc2f2739e3a6d979da7e8496e...

@rust-log-analyzer

This comment has been minimized.

@Mark-Simulacrum
Copy link
Member Author

@bors r+ rollup=never p=1

Cherry-picked 615604f to fix the tests as well.

@bors
Copy link
Contributor

bors commented Jan 7, 2022

📌 Commit e458615 has been approved by Mark-Simulacrum

@matthiaskrgr
Copy link
Member

@bors p=10 (setting up another rollup to merge after this)

@Aaron1011
Copy link
Member

@bors retry

@bors
Copy link
Contributor

bors commented Jan 8, 2022

⌛ Testing commit e458615 with merge 4aa9d23...

@bors
Copy link
Contributor

bors commented Jan 8, 2022

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 4aa9d23 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 8, 2022
@bors bors merged commit 4aa9d23 into rust-lang:beta Jan 8, 2022
@rustbot rustbot added this to the 1.58.0 milestone Jan 8, 2022
@Mark-Simulacrum Mark-Simulacrum deleted the beta-next branch January 12, 2022 14:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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-release Relevant to the release subteam, 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.