Skip to content

Revert #86853 #89450

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 2 commits into from
Oct 2, 2021
Merged

Revert #86853 #89450

merged 2 commits into from
Oct 2, 2021

Conversation

usbalbin
Copy link
Contributor

@usbalbin usbalbin commented Oct 1, 2021 •
edited
Loading

Should fix issue found in #89432

@rust-highfive
Copy link
Contributor

r? @m-ou-se

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 1, 2021
@usbalbin usbalbin mentioned this pull request Oct 1, 2021
Closed
@eddyb
Copy link
Member

eddyb commented Oct 1, 2021

For the record, while I'm not going to open my own PR, I was able to get a simpler revert by reverting the merge commit instead of every single commit (eddyb@5345239), using:

git revert -m 1 c6007fdc7059c677a6c089e8d2915b264c0d1326

@usbalbin
Copy link
Contributor Author

usbalbin commented Oct 1, 2021

Oh, thanks :)

@oli-obk
Copy link
Contributor

oli-obk commented Oct 1, 2021

@bors r+ p=1

@bors
Copy link
Collaborator

bors commented Oct 1, 2021

📌 Commit 81bb5a5 has been approved by oli-obk

@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 Oct 1, 2021
@usbalbin
Copy link
Contributor Author

usbalbin commented Oct 1, 2021

Should I add some sort of regression test like the one mentioned here? If so where should I put it?

@oli-obk
Copy link
Contributor

oli-obk commented Oct 1, 2021

Yea, that seems useful, but it could also wait for the real fix PR. I'm not sure where we have the tests for const trait bounds, but probably in src/test/consts

@oli-obk
Copy link
Contributor

oli-obk commented Oct 1, 2021

r? @oli-obk

@bors delegate+

Feel free to r=oli-obk in case you add a test

@rust-highfive rust-highfive assigned oli-obk and unassigned m-ou-se Oct 1, 2021
@bors
Copy link
Collaborator

bors commented Oct 1, 2021

✌️ @usbalbin can now approve this pull request

@usbalbin
Copy link
Contributor Author

usbalbin commented Oct 1, 2021

Yea, that seems useful, but it could also wait for the real fix PR. [...]

If the highest prio is getting the revert landed, then I'll wait for another PR/the fix PR. :)

@usbalbin @cuviper
Add regression test for rust-lang#89432
6a0c97a 
Co-authored-by: Josh Stone <cuviper@gmail.com>
@usbalbin
Copy link
Contributor Author

usbalbin commented Oct 2, 2021

@bors r=oli-obk

@bors
Copy link
Collaborator

bors commented Oct 2, 2021

📌 Commit 6a0c97a has been approved by oli-obk

@bors
Copy link
Collaborator

bors commented Oct 2, 2021

⌛ Testing commit 6a0c97a with merge b9712854cd6786939d92688a4bbb301d4756fa3e...

@bors
Copy link
Collaborator

bors commented Oct 2, 2021

💥 Test timed out

@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 Oct 2, 2021
@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)

@workingjubilee
Copy link
Member

@bors retry

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 2, 2021
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 2, 2021
@bors
Copy link
Collaborator

bors commented Oct 2, 2021

⌛ Testing commit 6a0c97a with merge a8387ae...

@bors
Copy link
Collaborator

bors commented Oct 2, 2021

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing a8387ae to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 2, 2021
@bors bors merged commit a8387ae into rust-lang:master Oct 2, 2021
@rustbot rustbot added this to the 1.57.0 milestone Oct 2, 2021
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (a8387ae): comparison url.

Summary: This benchmark run did not return any relevant changes.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

@fee1-dead fee1-dead mentioned this pull request Dec 5, 2021
Merged
fee1-dead added a commit to fee1-dead-contrib/rust that referenced this pull request Dec 12, 2021
@fee1-dead
Revert "Auto merge of rust-lang#89450 - usbalbin:const_try_revert, r=…
e22fe40 
…oli-obk"

This reverts commit a8387ae, reversing
changes made to 6e12110.
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 12, 2021
@bors
Auto merge of rust-lang#91549 - fee1-dead:const_env, r=spastorino
22f8bde 
Eliminate ConstnessAnd again

Closes rust-lang#91489.
Closes rust-lang#89432.

Reverts rust-lang#91491.
Reverts rust-lang#89450.

r? `@spastorino`
flip1995 pushed a commit to flip1995/rust that referenced this pull request Dec 17, 2021
@bors
Auto merge of rust-lang#91549 - fee1-dead:const_env, r=spastorino
41c48bd 
Eliminate ConstnessAnd again

Closes rust-lang#91489.
Closes rust-lang#89432.

Reverts rust-lang#91491.
Reverts rust-lang#89450.

r? `@spastorino`
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@oli-obk oli-obk

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

Successfully merging this pull request may close these issues.
10 participants
@usbalbin @rust-highfive @eddyb @oli-obk @bors @rust-log-analyzer @workingjubilee @rust-timer @m-ou-se @rustbot