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

small coherence cleanup #74454

Merged
merged 4 commits into from
Jul 22, 2020
Merged

small coherence cleanup #74454

merged 4 commits into from
Jul 22, 2020

Conversation

lcnr
Copy link
Contributor

@lcnr lcnr commented Jul 17, 2020

r? @eddyb

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 17, 2020
@lcnr lcnr changed the title some coherence cleanup small coherence cleanup Jul 17, 2020
Comment on lines 390 to 391
// FIXME(eddyb) figure out if this is redundant with `ty_is_non_local`,
// or maybe if this should be calling `ty_is_non_local_constructor`.
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This FIXME is interesting.

Will have to do something about this before we merge this PR

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking into the current impl it seems somewhat overly complicated but can't quite think of a clear solution here.

I do feel like using a TypeWalker in fn orphan_check_trait_ref might actually be the cleanest approach here, but iirc we wanted to slowly phase out uses of this struct.

What's the current status here?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will have to do something about this before we merge this PR

Is there an interaction, or you would just like to clean this up as part of the PR?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I really would like to clean this up before merging this.

If we merge it without fixing this, we should at least update the method names 😅

@eddyb
Copy link
Member

eddyb commented Jul 20, 2020

r? @nikomatsakis (sorry, not sure what the plans are in this area)

@rust-highfive rust-highfive assigned nikomatsakis and unassigned eddyb Jul 20, 2020
src/librustc_trait_selection/traits/coherence.rs Outdated Show resolved Hide resolved
src/librustc_trait_selection/traits/coherence.rs Outdated Show resolved Hide resolved
Comment on lines 390 to 391
// FIXME(eddyb) figure out if this is redundant with `ty_is_non_local`,
// or maybe if this should be calling `ty_is_non_local_constructor`.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will have to do something about this before we merge this PR

Is there an interaction, or you would just like to clean this up as part of the PR?

@lcnr
Copy link
Contributor Author

lcnr commented Jul 20, 2020

@nikomatsakis this should be ready for merge/rereview. Wasn't able to improve orphan_check_trait_ref so I just updated the fixme there

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Jul 21, 2020

📌 Commit cfcbca6 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 Jul 21, 2020
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 22, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 22, 2020
…arth

Rollup of 9 pull requests

Successful merges:

 - rust-lang#73655 (va_args implementation for AAPCS.)
 - rust-lang#73893 (Stabilize control-flow-guard codegen option)
 - rust-lang#74237 (compiletest: Rewrite extract_*_version functions)
 - rust-lang#74454 (small coherence cleanup)
 - rust-lang#74528 (refactor and reword intra-doc link errors)
 - rust-lang#74568 (Apply rust-lang#66379 to `*mut T` `as_ref`)
 - rust-lang#74570 (Use forge links for prioritization procedure)
 - rust-lang#74589 (Update books)
 - rust-lang#74635 (Fix tooltip position if the documentation starts with a code block)

Failed merges:

r? @ghost
@bors bors merged commit e811e29 into rust-lang:master Jul 22, 2020
@lcnr lcnr deleted the negative-impls branch July 22, 2020 18:20
@cuviper cuviper added this to the 1.47.0 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants