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

Remove duplicated code in trait selection #70641

Merged
merged 1 commit into from
Apr 3, 2020
Merged

Remove duplicated code in trait selection #70641

merged 1 commit into from
Apr 3, 2020

Conversation

estebank
Copy link
Contributor

No description provided.

@rust-highfive
Copy link
Collaborator

r? @eddyb

(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 Mar 31, 2020
@rust-highfive

This comment has been minimized.

Sign in to view
@rust-highfive

This comment has been minimized.

Sign in to view
@eddyb
Copy link
Member

eddyb commented Apr 1, 2020

I think that was intentional, from when these were split? At least some things could be exported though.

r? @nikomatsakis

@rust-highfive rust-highfive assigned nikomatsakis and unassigned eddyb Apr 1, 2020
@estebank
Copy link
Contributor Author

estebank commented Apr 2, 2020 •
edited
Loading

I somehow doubt that the duplicated implementations of Elaborator is intentional, looking to me more like a misapplied rebase, but I might be incorrect. Either way, I noticed this while trying to rebase #69745 back on master and this can easily cause bugs in the future if they ever diverge. I don't see a reason to keep both.

@nikomatsakis
Copy link
Contributor

I agree that duplication seems bad.

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Apr 3, 2020

📌 Commit 8bedb7e has been approved by nikomatsakis

@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 Apr 3, 2020
@Centril Centril mentioned this pull request Apr 3, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 3, 2020
@bors
Auto merge of rust-lang#70747 - Centril:rollup-2vx9bve, r=Centril
74bd074 
Rollup of 9 pull requests

Successful merges:

 - rust-lang#69860 (Use associated numeric consts in documentation)
 - rust-lang#70576 (Update the description of the ticket to point at RFC 1721)
 - rust-lang#70597 (Fix double-free and undefined behaviour in libstd::syn::unix::Thread::new)
 - rust-lang#70640 (Hide `task_context` when lowering body)
 - rust-lang#70641 (Remove duplicated code in trait selection)
 - rust-lang#70707 (Remove unused graphviz emitter)
 - rust-lang#70720 (Place TLS initializers with relocations in .tdata)
 - rust-lang#70735 (Clean up E0502 explanation)
 - rust-lang#70741 (Add test for rust-lang#59023)

Failed merges:

r? @ghost
@bors bors merged commit 752961b into rust-lang:master Apr 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nikomatsakis nikomatsakis nikomatsakis approved these changes

Assignees

@nikomatsakis nikomatsakis

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@estebank @rust-highfive @eddyb @nikomatsakis @bors