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

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

Merged
merged 8 commits into from
Mar 14, 2020
Merged

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

merged 8 commits into from
Mar 14, 2020

Conversation

cjgillot
Copy link
Contributor

Followup on #67953.

I tried to follow the existing module structures.

cc @eddyb
r? @Zoxc

@bors
Copy link
Contributor

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
Contributor

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
Contributor

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
#![feature(never_type)]
#![feature(range_is_empty)]
#![feature(in_band_lifetimes)]
#![feature(crate_visibility_modifier)]
#![recursion_limit = "512"]
Copy link
Contributor

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

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

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
Contributor

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

ping in #69076 (comment)

[triagebot] Not my area of expertise.

@bors
Copy link
Contributor

bors commented Feb 28, 2020

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

@bors
Copy link
Contributor

bors commented Feb 28, 2020

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

@bors
Copy link
Contributor

bors commented Feb 28, 2020

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

@rust-highfive rust-highfive mentioned this pull request Mar 14, 2020
Closed
@rust-highfive
Copy link
Collaborator

📣 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
JohnTitor added a commit to JohnTitor/rust-clippy that referenced this pull request Mar 14, 2020
@JohnTitor
Rustup to rust-lang/rust#69076
00861d1
bors added a commit to rust-lang/rust-clippy that referenced this pull request Mar 14, 2020
@bors
Auto merge of #5317 - JohnTitor:rustup, r=matthiaskrgr
8fd7e31 
Rustup to rust-lang/rust#69076

changelog: none
@cjgillot cjgillot deleted the split_trait branch March 15, 2020 09:00
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 16, 2020
@matthiaskrgr
submodules: update clippy from 8485d40 to 23549a8
7e2ebb0 
Changes:
````
rustup rust-lang#69738
rustup rust-lang#68944
Make use of `or_patterns` feature
rustup rust-lang#69589
Rustup to rust-lang#69076
Don't convert Path to lossy str
Use `into_path`
Use pattern matching instead of manually checking condition
Fix typo
Remove git2 dependency.
Document that wildcard_imports doesn't warn about `use ...::prelude::*;`
Change changelog formatting
Update changelog_update doc to reflect the actual ordering of the changelog
Update CHANGELOG.md
````

Fixes rust-lang#70007
bors added a commit that referenced this pull request Mar 17, 2020
@bors
Auto merge of #70020 - matthiaskrgr:submodule_upd, r=ehuss
ae5b641 
submodules: update clippy from 8485d40 to d556bb7

Changes:
````
    rustup #68944
    rustup #69589
    Rustup to #69076
    Don't convert Path to lossy str
    Use `into_path`
    Use pattern matching instead of manually checking condition
    Fix typo
    Remove git2 dependency.
    Document that wildcard_imports doesn't warn about `use ...::prelude::*;`
    Change changelog formatting
    Update changelog_update doc to reflect the actual ordering of the changelog
    Update CHANGELOG.md
````

Fixes #70007
@nnethercote
Copy link
Contributor

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.

flip1995 pushed a commit to flip1995/rust-clippy that referenced this pull request May 5, 2020
@matthiaskrgr
submodules: update clippy from 8485d40 to 23549a8
371c74e 
Changes:
````
rustup rust-lang/rust#69738
rustup rust-lang/rust#68944
Make use of `or_patterns` feature
rustup rust-lang/rust#69589
Rustup to rust-lang/rust#69076
Don't convert Path to lossy str
Use `into_path`
Use pattern matching instead of manually checking condition
Fix typo
Remove git2 dependency.
Document that wildcard_imports doesn't warn about `use ...::prelude::*;`
Change changelog formatting
Update changelog_update doc to reflect the actual ordering of the changelog
Update CHANGELOG.md
````

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

@Zoxc Zoxc Zoxc left review comments

@matthewjasper matthewjasper matthewjasper left review comments

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.