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

Move datatypes definitions in specific modules inside rustc::{traits, infer} #68461

Merged
merged 11 commits into from
Feb 6, 2020

Conversation

cjgillot
Copy link
Contributor

Prelude to #67953

Some data types inside rustc::traits and rustc::infer are used in other parts of librustc. These cannot go to a separate crate librustc_infer.

This PR moves those data types to traits::types and infer::types modules, from where everything is reexported.

Note for review: some imports feature the crate -> rustc substitution. This is cruft from the splitting out of #67953. This can be reverted, but are bound to be put back by #67953.

r? @Centril
cc @Zoxc

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 22, 2020
@Centril
Copy link
Contributor

Centril commented Jan 22, 2020

cc @nikomatsakis @matthewjasper

@Centril
Copy link
Contributor

Centril commented Jan 22, 2020

Actually, I have less of a sense of direction wrt. traits/infer, so I'll r? @nikomatsakis :)

@bors
Copy link
Contributor

bors commented Feb 5, 2020

☔ The latest upstream changes (presumably #68831) made this pull request unmergeable. Please resolve the merge conflicts.

@matthewjasper
Copy link
Contributor

r? @matthewjasper
@bors r+

@bors
Copy link
Contributor

bors commented Feb 5, 2020

📌 Commit 735d664 has been approved by matthewjasper

@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 Feb 5, 2020
@bors
Copy link
Contributor

bors commented Feb 5, 2020

⌛ Testing commit 735d664 with merge a25d58b...

bors added a commit that referenced this pull request Feb 5, 2020
Move datatypes definitions in specific modules inside rustc::{traits, infer}

Prelude to #67953

Some data types inside `rustc::traits` and `rustc::infer` are used in other parts of `librustc`. These cannot go to a separate crate `librustc_infer`.

This PR moves those data types to `traits::types` and `infer::types` modules, from where everything is reexported.

Note for review: some imports feature the `crate -> rustc` substitution. This is cruft from the splitting out of #67953. This can be reverted, but are bound to be put back by #67953.

r? @Centril
cc @Zoxc
@bors
Copy link
Contributor

bors commented Feb 6, 2020

☀️ Test successful - checks-azure
Approved by: matthewjasper
Pushing a25d58b to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 6, 2020
@bors bors merged commit 735d664 into rust-lang:master Feb 6, 2020
@cjgillot cjgillot deleted the split_infer_prelude branch February 6, 2020 07:32
@eddyb
Copy link
Member

eddyb commented Feb 19, 2020

This PR made some fields pub that weren't before (e.g. in SelectionCache, EvaluationCache etc.).
That's an abstraction boundary break, IMO, but I'm not sure how I'd address it.

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

Successfully merging this pull request may close these issues.

7 participants