Skip to content

Minimize dependencies on trait and infer inside librustc#67970

Merged
bors merged 18 commits intorust-lang:masterfrom
cjgillot:inherent
Jan 8, 2020
Merged

Minimize dependencies on trait and infer inside librustc#67970
bors merged 18 commits intorust-lang:masterfrom
cjgillot:inherent

Conversation

@cjgillot
Copy link
Contributor

@cjgillot cjgillot commented Jan 7, 2020 •
edited by Centril
Loading

Split from #67953

All commits should pass check on their own.

r? @Centril

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

Centril commented Jan 7, 2020

@bors rollup=never p=10

cjgillot added 17 commits January 7, 2020 17:37
@cjgillot
Remove private methods from TyCtxt impl block: rustc::infer::error_re…
47256b8 
…porting.
@cjgillot
Remove private methods from TyCtxt impl block: rustc::middle::stability.
811adb5
@cjgillot
Remove private methods from TyCtxt impl block: rustc::trait::object_s…
c1afe6a 
…afety.
@cjgillot
Remove trivial function.
0d9f4fb
@cjgillot
Remove private methods from TyCtxt impl block: rustc::ty::outlives.
640cae2
@cjgillot
Remove private methods from TyCtxt impl block: rustc::ty::print::pretty.
7118e33
@cjgillot
Make rustc::infer::error_reporting::{note_and_explain_free_region, no…
d53bf7a 
…te_and_explain_region} free functions.
@cjgillot
Make rustc::traits::error_reporting::{recursive_type_with_infinite_si…
0b1521e 
…ze_error, report_object_safety_error} free functions.
@cjgillot
Make rustc::traits::object_safety::{astconv_object_safety_violations,…
7770bce 
…is_vtable_safe_method,object_safety_violations} free functions.
@cjgillot
Move normalize_erasing_regions to rustc::ty.
a80bff8
@cjgillot
Move subst_and_normalize_erasing_regionsto rustc::ty.
56a0aec
@cjgillot
Make traits::util::* free functions.
787cd54
@cjgillot
Move ty::wf to traits.
73667af
@cjgillot
Move structural_match to rustc::traits.
e905d5d
@cjgillot
Move free_region_map to rustc::ty.
24d09c7
@cjgillot
Move required_region_bounds to rustc::infer::opaque_types.
86ec4b5
@cjgillot
Move magic traits queries to rustc::traits::drop.
f629baf
@cjgillot
Copy link
Contributor Author

cjgillot commented Jan 7, 2020

Rebased.

Centril
Centril reviewed Jan 7, 2020
View reviewed changes
Copy link
Contributor

@Centril Centril left a comment

Choose a reason for hiding this comment

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

Thanks!

The comment below is the only thing I'd prefer having addressed now before this can land.

However, I also had some other thoughts:

  • Moving ty::wf to traits feels odd because well-formedness of types isn't a semantic property of traits only.

  • The free_region_map should perhaps not be in ty.

That said, I think we can experiment for now and reassess once more things like Ty<'tcx> has been moved out. Perhaps more opportunities for good semantic categorization will arise then.

Also, let's cc @nikomatsakis & @matthewjasper for awareness. :)

@Centril
Copy link
Contributor

Centril commented Jan 7, 2020

@bors r+

@bors
Copy link
Collaborator

bors commented Jan 7, 2020

📌 Commit 700ac84 has been approved by Centril

@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 Jan 7, 2020
@matthewjasper
Copy link
Contributor

matthewjasper commented Jan 7, 2020 

* The `free_region_map` should perhaps not be in `ty`.

It shouldn't. It's currently in TypeckTables but it's unused there.

@bors
Copy link
Collaborator

bors commented Jan 7, 2020

⌛ Testing commit 700ac84 with merge 7e393b5...

bors added a commit that referenced this pull request Jan 7, 2020
@bors
Auto merge of #67970 - cjgillot:inherent, r=Centril
7e393b5 
Minimize dependencies on trait and infer inside librustc

Split from #67953

All commits should pass check on their own.

r? @Centril
@bors
Copy link
Collaborator

bors commented Jan 8, 2020

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 7e393b5 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 8, 2020
@bors bors merged commit 700ac84 into rust-lang:master Jan 8, 2020
@rust-highfive rust-highfive mentioned this pull request Jan 8, 2020
Closed
@rust-highfive
Copy link
Contributor

rust-highfive commented Jan 8, 2020

📣 Toolstate changed by #67970!

Tested on commit 7e393b5.
Direct link to PR: #67970

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

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jan 8, 2020
@rust-highfive
📣 Toolstate changed by rust-lang/rust#67970!
52693b1 
Tested on commit rust-lang/rust@7e393b5.
Direct link to PR: <rust-lang/rust#67970>

💔 clippy-driver on windows: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra).
This was referenced Jan 8, 2020
Merged
Merged
Merged
Merged
Closed
Merged
Merged
Closed
krishna-veerareddy added a commit to krishna-veerareddy/rust-clippy that referenced this pull request Jan 8, 2020
@krishna-veerareddy
Rustup to rust-lang/rust#67970
ac0dea5
JohnTitor added a commit to JohnTitor/rust-clippy that referenced this pull request Jan 8, 2020
@JohnTitor
Rustup to rust-lang/rust#67970
fa33681
bors added a commit to rust-lang/rust-clippy that referenced this pull request Jan 8, 2020
@bors
Auto merge of #5018 - JohnTitor:rustup-0108, r=phansch
baa5cc1 
Rustup to rust-lang/rust#67970

changelog: none
@cjgillot cjgillot deleted the inherent branch January 8, 2020 07:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@Centril Centril Centril left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@Centril Centril

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.

5 participants

@cjgillot @Centril @bors @matthewjasper @rust-highfive