Skip to content

Split librustc::{traits,infer} to their respective crates#69076

Merged
bors merged 8 commits intorust-lang:masterfrom
cjgillot:split_trait
Mar 14, 2020
Merged

Split librustc::{traits,infer} to their respective crates#69076
bors merged 8 commits intorust-lang:masterfrom
cjgillot:split_trait

Conversation

@cjgillot
Copy link
Contributor

@cjgillot cjgillot commented Feb 11, 2020

Followup on #67953.

I tried to follow the existing module structures.

cc @eddyb
r? @Zoxc

@bors
Copy link
Collaborator

bors commented Feb 12, 2020

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

@bors bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Feb 12, 2020
@bors
Copy link
Collaborator

bors commented Feb 12, 2020

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

@Zoxc Zoxc mentioned this pull request Feb 16, 2020
Merged
@cjgillot cjgillot changed the title [WIP] Split librustc::{traits,infer} to their respective crates Split librustc::{traits,infer} to their respective crates Feb 17, 2020
@bors
Copy link
Collaborator

bors commented Feb 17, 2020

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

@Zoxc
Copy link
Contributor

Zoxc commented Feb 17, 2020

Would rustc_trait_selection be a better crate name for rustc_infer::traits?

cc @rust-lang/compiler

@Zoxc
Copy link
Contributor

Zoxc commented Feb 17, 2020

Could you split Querify object_safety_violations. into a separate PR so we can run perf on it?

@cjgillot cjgillot mentioned this pull request Feb 17, 2020
Merged
bors added a commit that referenced this pull request Feb 21, 2020
@bors
Auto merge of #69242 - cjgillot:object_violations, r=Zoxc
1d7e818 
Querify object_safety_violations.

Split from #69076

r? @Zoxc
@Zoxc
Copy link
Contributor

Zoxc commented Feb 21, 2020

This seems to be a bit too heavy on trait stuff for me to review.

r? @matthewjasper

@rust-highfive rust-highfive assigned matthewjasper and unassigned Zoxc Feb 21, 2020
matthewjasper
matthewjasper reviewed Feb 24, 2020
View reviewed changes
src/librustc_infer/lib.rs Outdated
Copy link
Contributor

@matthewjasper matthewjasper Feb 24, 2020

Choose a reason for hiding this comment

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

This was only needed for the parallel compiler. Can you try building it before removing this?

Copy link
Contributor Author

@cjgillot cjgillot Feb 25, 2020

Choose a reason for hiding this comment

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

I managed to compile as is.

Copy link
Contributor

@Zoxc Zoxc Mar 12, 2020

Choose a reason for hiding this comment

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

Looks like this is needed anyway for rustdoc.

@bors
Copy link
Collaborator

bors commented Feb 26, 2020

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

@petrochenkov
Copy link
Contributor

petrochenkov commented Feb 26, 2020

ping in #69076 (comment)

[triagebot] Not my area of expertise.

@bors
Copy link
Collaborator

bors commented Feb 28, 2020

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

@bors
Copy link
Collaborator

bors commented Feb 28, 2020

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

@bors
Copy link
Collaborator

bors commented Feb 28, 2020

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

@matthewjasper
Copy link
Contributor

matthewjasper commented Mar 14, 2020

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 14, 2020

📌 Commit 0144a97 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 14, 2020
@bors
Copy link
Collaborator

bors commented Mar 14, 2020

⌛ Testing commit 0144a97 with merge 131772c...

@bors
Copy link
Collaborator

bors commented Mar 14, 2020

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 14, 2020
@bors bors mentioned this pull request Mar 14, 2020
Merged
@bors bors merged commit 131772c into rust-lang:master Mar 14, 2020
@rust-highfive rust-highfive mentioned this pull request Mar 14, 2020
Closed
@rust-highfive
Copy link
Contributor

rust-highfive commented Mar 14, 2020

📣 Toolstate changed by #69076!

Tested on commit 131772c.
Direct link to PR: #69076

💔 clippy-driver on windows: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq).
💔 clippy-driver on linux: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Mar 14, 2020
@rust-highfive
📣 Toolstate changed by rust-lang/rust#69076!
a6d9552 
Tested on commit rust-lang/rust@131772c.
Direct link to PR: <rust-lang/rust#69076>

💔 clippy-driver on windows: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq).
💔 clippy-driver on linux: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq).
This was referenced Mar 14, 2020
Merged
Merged
Merged
Merged
Merged
Merged
Closed
Closed
Merged
Merged
Merged
Closed
Merged
Closed
Merged
Merged
@nnethercote
Copy link
Contributor

nnethercote commented Apr 8, 2020

This change regressed compile time of the keccak benchmark significantly.

@cjgillot: any idea why, and how to fix it?

@Zoxc
Copy link
Contributor

Zoxc commented Apr 8, 2020

@nnethercote It's probably due to things not being inlined anymore. This PR seems to restore performance for keccack.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@matthewjasper matthewjasper matthewjasper left review comments

+1 more reviewer

@Zoxc Zoxc Zoxc left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@matthewjasper matthewjasper

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

No milestone

Development

Successfully merging this pull request may close these issues.