Skip to content

Extract rustc_hir out of rustc - #67803

Merged
bors merged 20 commits into
rust-lang:masterfrom
Centril:librustc_hir
Jan 5, 2020
Merged

Extract rustc_hir out of rustc#67803
bors merged 20 commits into
rust-lang:masterfrom
Centril:librustc_hir

Conversation

@Centril

@CentrilCentril commented Jan 2, 2020•
edited
Loading

Copy link
Copy Markdown
Contributor

The new crate contains:

pubmod def;pubmod def_id;mod hir;pubmod hir_id;pubmod itemlikevisit;pubmod pat_util;pubmod print;mod stable_hash_impls;pubuse hir::*;pubuse hir_id::*;pubuse stable_hash_impls::HashStableContext;

Remains to be done in follow-up PRs:

cc #65031

r? @Zoxc

@rust-highfive

This comment has been minimized.

Sign in to view
@rust-highfive

This comment has been minimized.

Sign in to view
@CentrilCentril mentioned this pull request Jan 2, 2020
Merged
@CentrilCentril added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 2, 2020
@CentrilCentril mentioned this pull request Jan 2, 2020
Merged
@bors

This comment has been minimized.

Sign in to view
Zoxc
Zoxc reviewed Jan 4, 2020
View reviewed changes
Comment threadsrc/librustc/query/mod.rs Outdated
Zoxc
Zoxc reviewed Jan 4, 2020
View reviewed changes
Comment threadsrc/librustc/ich/impls_syntax.rs Outdated

@ZoxcZoxcJan 4, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I think it would be better to have a is_ignored_attr method on syntax::HashStableContext and move the impl to syntax.

@CentrilCentrilJan 4, 2020

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

This doesn't work out well unfortunately. I'm only able to move one of the impls, but not the impl<AstCtx: crate::HashStableContext> HashStable<AstCtx> for [ast::Attribute] { one because it becomes orphaned (including with specialization). So I would prefer to have those impls in one place and this file is the only way to do that I think.

Zoxc
Zoxc reviewed Jan 4, 2020
View reviewed changes
Comment threadsrc/librustc/ich/impls_hir.rs Outdated

@ZoxcZoxcJan 4, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

You could add with_node_id_hashing_mode and while_hashing_hir_bodies to rustc_hir::HashStableContext then you wouldn't need to keep all the impls here.

@Centril
fn adt_kind -> wfcheck
c19ed3b
@Centril
extract rustc::middle::codegen_fn_attrs
66f5bf1
@Centril
canonicalize FxHash{Map,Set} imports
7901c7f
@Centril
define_id_collections -> rustc_data_structures
f507403
@Centril
move Node{Map,Set} -> rustc_session::node_id
5ccc1e4
@Centril
canonicalize rustc_session imports
8e15bb6
@Centril
DefId{Map,Set} -> rustc::hir::def_id
ca297f8
@Centril
{HirId,ItemLocal}{Map,Set} -> rustc::hir & nix rustc::nodemap
2f64ab6
@Centril
remove DefId::to_dep_node (dead code)
e0e9ff0
@Centril
move describe_as_module to where it's used
7eb7b23
@Centril
move def_id to new rustc_hir crate
7a14073
@Centril
move HirId to librustc_hir::hir_id
72241ad
@Centril
split hir/mod.rs -> hir.rs & hir/hir.rs
3b66f4e
@Centril
hir::hir: simplify some imports
e108721
@Centril
move {Par}DeepVisitor to intravisit
60d5d36
@Centril
simplify self::Namespace::* import
702b2d7
@Centril
extract Export, ExportMap from hir::def
1f7b4e9
@Centril
hir::{hir,def,itemlikevisit,pat_util,print} -> rustc_hir
ef08662
Also fix fallout wrt. HashStable.
@Centril
cleanup librustc_hir/Cargo.toml
937c76b
@Zoxc

Zoxc commented Jan 4, 2020

Copy link
Copy Markdown
Contributor

@bors r+ p=5 rollup=never

@bors

bors commented Jan 4, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit cdf32e1 has been approved by Zoxc

@borsbors 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 4, 2020
@bors

bors commented Jan 4, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit cdf32e1 with merge 7494250...

bors added a commit that referenced this pull request Jan 4, 2020
@bors
Auto merge of#67803- Centril:librustc_hir, r=Zoxc
7494250
Extract `rustc_hir` out of `rustc`
The new crate contains:
```rust
pub mod def;
pub mod def_id;
mod hir;
pub mod hir_id;
pub mod itemlikevisit;
pub mod pat_util;
pub mod print;
mod stable_hash_impls;
pub use hir::*;
pub use hir_id::*;
pub use stable_hash_impls::HashStableContext;
```
Remains to be done in follow-up PRs:
- Move `rustc::hir::map` into `rustc_hir_map` -- this has to be a separate crate due to the `dep_graph` (blocked on #67761).
- Move references to `rustc::hir` to `rustc_hir` where possible.
cc #65031
r? @Zoxc
@bors

bors commented Jan 5, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure
Approved by: Zoxc
Pushing 7494250 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jan 5, 2020
@bors
bors merged commit cdf32e1 into rust-lang:masterJan 5, 2020
@Centril
Centril deleted the librustc_hir branch January 5, 2020 01:19
This was referenced Jan 5, 2020
Merged
Closed
Merged
Merged
Closed
JohnTitor added a commit to JohnTitor/rust-clippy that referenced this pull request Jan 5, 2020
@JohnTitor
Rustup torust-lang/rust#67803
da7e093
matthiaskrgr added a commit to matthiaskrgr/rust-clippy that referenced this pull request Jan 5, 2020
@matthiaskrgr
rustuprust-lang/rust#67803
5a43052
JohnTitor added a commit to JohnTitor/rust-clippy that referenced this pull request Jan 5, 2020
@JohnTitor
Rustup torust-lang/rust#67803
07f0615
bors added a commit to rust-lang/rust-clippy that referenced this pull request Jan 5, 2020
@bors
Auto merge of#4996- JohnTitor:rustup, r=matthiaskrgr
8ac8d76
Rustup to rust-lang/rust#67803 and rust-lang/rust#67137
changelog: none
bors added a commit to rust-lang/rust-clippy that referenced this pull request Jan 5, 2020
@bors
Auto merge of#4996- JohnTitor:rustup, r=matthiaskrgr
732825d
Rustup to rust-lang/rust#67803 and rust-lang/rust#67137
changelog: none
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@ZoxcZoxcZoxc left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@ZoxcZoxc

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: 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.

4 participants

@Centril@rust-highfive@bors@Zoxc