Move some code to librustc_passes. #67688
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rust-highfive
added
the
S-waiting-on-review
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
Zoxc
reviewed
Dec 29, 2019
src/librustc/lib.rs
Outdated
| @@ -102,7 +102,30 @@ pub mod middle { | |||
| pub mod exported_symbols; | |||
| pub mod free_region; | |||
| pub mod lang_items; | |||
| pub mod lib_features; | |||
| pub mod lib_features { | |||
There was a problem hiding this comment.
Maybe split this out to middle.rs?
|
cc @Centril |
Zoxc
reviewed
Dec 29, 2019
|
|
||
| use rustc_error_codes::*; | ||
| use lazy_static::lazy_static; | ||
|
|
||
| macro_rules! weak_lang_items { |
There was a problem hiding this comment.
Any particular reason you where unable to move the entire file?
There was a problem hiding this comment.
librustc_codegen_ssa depends on the link_name function. I did not want to introduce a dependency on librustc_passes just for that.
There was a problem hiding this comment.
I'd just add that dependency instead of keeping stuff in rustc.
There was a problem hiding this comment.
Please, don't introduce the dependency, it's a much larger build time penalty than a tiny function in rustc.
There was a problem hiding this comment.
Maybe make a rustc_lang_items and put that as a librustc_codegen_ssa dependency instead?
There was a problem hiding this comment.
rustc_lang_items is probably sensible long term, also because I'd like to be able to refer to lang items in lowering (#60607).
There was a problem hiding this comment.
Let's just move these to a new rustc_lang_items crate then.
|
The first 4 commits look good, you could split them off into a separate PR so I can approve them. I'd like the |
👍 -- this tends to work well with git so as to preserve blame and history. |
This was referenced Dec 29, 2019
petrochenkov
added
S-waiting-on-author
|
Rebased, with the split-out commits removed. |
|
Maybe move the non lang-items commits to #67698 too, they should be good to go. |
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
Dec 30, 2019
Move reachable_set and diagnostic_items to librustc_passes. Split out of rust-lang#67688 r? @Zoxc
|
☔ The latest upstream changes (presumably #67721) made this pull request unmergeable. Please resolve the merge conflicts. |
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Dec 31, 2019
Move the region_scope_tree query to librustc_passes. Split out of rust-lang#67688. r? @Zoxc
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Dec 31, 2019
Move the region_scope_tree query to librustc_passes. Split out of rust-lang#67688. r? @Zoxc
|
☔ The latest upstream changes (presumably #67700) made this pull request unmergeable. Please resolve the merge conflicts. |
|
I see you added some more stuff here. |
|
☔ The latest upstream changes (presumably #67886) made this pull request unmergeable. Please resolve the merge conflicts. |
|
@cjgillot can you rebase this? thanks |
|
Rebased. |
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
|
☔ The latest upstream changes (presumably #68330) made this pull request unmergeable. Please resolve the merge conflicts. |
|
Ping from triage: |
|
Rebased with lang_items changes moved to #68554. |
Zoxc
reviewed
Jan 27, 2020
src/librustc_passes/check_attr.rs
Outdated
| ForeignStatic, | ||
| ForeignTy, | ||
| pub(crate) trait TargetExt { | ||
| fn from_impl_item<'tcx>(tcx: TyCtxt<'tcx>, impl_item: &hir::ImplItem<'_>) -> Target; |
There was a problem hiding this comment.
I think this method can just stay in rustc.
There was a problem hiding this comment.
This method is only used in this file. Since I plan to remove rustc::hir::check_attr in #68554, I think I will make it a free function.
|
☔ The latest upstream changes (presumably #68635) made this pull request unmergeable. Please resolve the merge conflicts. |
|
@bors r+ |
|
📌 Commit f9335e9 has been approved by |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-azure |
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
Feb 12, 2020
Split lang_items to crates `rustc_hir` and `rustc_passes`. As discussed in comment rust-lang#67688 (comment)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Per instructions by @Zoxc, some code from
librustc::middleis moved tolibrustc_passes.cc #65031
r? @Zoxc