Flatten rustc and rustc_trans module hierarchy slightly. #32432
Conversation
|
(rust_highfive has picked a reviewer for you, use r? to override) |
|
👍 from me. |
|
☔ The latest upstream changes (presumably #32156) made this pull request unmergeable. Please resolve the merge conflicts. |
|
☔ The latest upstream changes (presumably #32410) made this pull request unmergeable. Please resolve the merge conflicts. |
|
👍 from me too. |
|
@eddyb I guess I didn't say r=me explicitly, but r=me |
|
☔ The latest upstream changes (presumably #32346) made this pull request unmergeable. Please resolve the merge conflicts. |
|
@bors r=nikomatsakis |
|
📌 Commit 4f75da9 has been approved by |
|
☔ The latest upstream changes (presumably #32428) made this pull request unmergeable. Please resolve the merge conflicts. |
|
@bors r=nikomatsakis |
|
📌 Commit 7eb0547 has been approved by |
Flatten rustc and rustc_trans module hierarchy slightly.
The following moves were made, in the name of sanity/simplicity:
* `rustc::middle::{cfg, infer, traits, ty}` to `rustc::{cfg, infer, traits, ty}`
* `rustc::middle::subst` to `rustc::ty::subst`
* `rustc_trans::trans::*` to `rustc_trans::*`
* `rustc_trans::save` to `rustc_save_analysis` (cc @nrc)
I've rebased a larger WIP branch on top of this and the only conflicts were in imports, but YMMV.
|
☔ The latest upstream changes (presumably #32293) made this pull request unmergeable. Please resolve the merge conflicts. |
|
@bors r=nikomatsakis |
|
📌 Commit 17813e5 has been approved by |
|
@bors p=1 This has seen way too many rebases this week and it's just going to get worse. |
|
⌛ Testing commit 17813e5 with merge 0fac6d8... |
|
💔 Test failed - auto-linux-musl-64-opt |
|
@bors r=nikomatsakis |
|
📌 Commit 035a645 has been approved by |
|
⌛ Testing commit 035a645 with merge d5a91e6... |
Flatten rustc and rustc_trans module hierarchy slightly.
The following moves were made, in the name of sanity/simplicity:
* `rustc::middle::{cfg, infer, traits, ty}` to `rustc::{cfg, infer, traits, ty}`
* `rustc::middle::subst` to `rustc::ty::subst`
* `rustc_trans::trans::*` to `rustc_trans::*`
* `rustc_trans::save` to `rustc_save_analysis` (cc @nrc)
I've rebased a larger WIP branch on top of this and the only conflicts were in imports, but YMMV.
The following moves were made, in the name of sanity/simplicity:
rustc::middle::{cfg, infer, traits, ty}torustc::{cfg, infer, traits, ty}rustc::middle::substtorustc::ty::substrustc_trans::trans::*torustc_trans::*rustc_trans::savetorustc_save_analysis(cc @nrc)I've rebased a larger WIP branch on top of this and the only conflicts were in imports, but YMMV.