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.

Sign up for GitHub

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

Jump to bottom

Revert "Auto merge of #79209 #79637

Merged
merged 1 commit into from
Dec 3, 2020
Merged

Revert "Auto merge of #79209 #79637

merged 1 commit into from
Dec 3, 2020

Conversation

spastorino
Copy link
Member

r? @nikomatsakis

This has caused some issues (#79560) so better to revert and try to come up with a proper fix without rush.

@spastorino
Revert "Auto merge of rust-lang#79209 - spastorino:trait-inheritance-…
37354eb 
…self, r=nikomatsakis"

This reverts commit 349b3b3, reversing
changes made to b776d1c.
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 2, 2020
@Mark-Simulacrum
Copy link
Member

This also broke packed-simd on perf I believe, so going to go ahead and r+ this

@bors r+ p=1 rollup=never

@bors
Copy link
Contributor

bors commented Dec 3, 2020

📌 Commit 37354eb 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 Dec 3, 2020
@bors
Copy link
Contributor

bors commented Dec 3, 2020

⌛ Testing commit 37354eb with merge b4def89...

@tshepang tshepang mentioned this pull request Dec 3, 2020
Closed
@bors
Copy link
Contributor

bors commented Dec 3, 2020

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing b4def89 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 3, 2020
@bors bors merged commit b4def89 into rust-lang:master Dec 3, 2020
@rustbot rustbot added this to the 1.50.0 milestone Dec 3, 2020
@bors bors mentioned this pull request Dec 3, 2020
Closed
@rylev rylev mentioned this pull request Dec 3, 2020
Merged
@estebank estebank mentioned this pull request Dec 18, 2020
Open
spastorino added a commit to spastorino/rust that referenced this pull request Jan 5, 2021
@spastorino
Revert "Auto merge of rust-lang#79637 - spastorino:revert-trait-inher…
03c0e58 
…itance-self, r=Mark-Simulacrum"

This reverts commit b4def89, reversing
changes made to 7dc1e85.
@cuviper cuviper mentioned this pull request Jan 8, 2021
Closed
spastorino added a commit to spastorino/rust that referenced this pull request Feb 8, 2021
@spastorino
Revert "Auto merge of rust-lang#79637 - spastorino:revert-trait-inher…
7aa602b 
…itance-self, r=Mark-Simulacrum"

This reverts commit b4def89, reversing
changes made to 7dc1e85.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nikomatsakis nikomatsakis

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.50.0
Development

Successfully merging this pull request may close these issues.
6 participants
@spastorino @Mark-Simulacrum @bors @nikomatsakis @rust-highfive @rustbot