Cleanup refactoring around DefPath handling #38418
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
eddyb
approved these changes
Dec 17, 2016
| collector.parent_def = Some(def); | ||
|
|
||
| collector | ||
| } |
There was a problem hiding this comment.
You forgot to remove the hir::intravisit::Visitor impl.
| @@ -936,7 +940,7 @@ pub fn map_crate<'ast>(forest: &'ast mut Forest, | |||
| forest: forest, | |||
| dep_graph: forest.dep_graph.clone(), | |||
| map: RefCell::new(map), | |||
| definitions: RefCell::new(definitions), | |||
| definitions: definitions, | |||
| local_node_id_watermark: local_node_id_watermark, | |||
| local_def_id_watermark: local_def_id_watermark, | |||
There was a problem hiding this comment.
You can remove this watermark too btw.
|
@bors r=eddyb Thanks for the review! |
|
📌 Commit 77e659a has been approved by |
|
Travis found an ICE. |
|
@bors r- |
|
Something seems to break in rustdoc... |
|
@bors r=eddyb Re-reviewed. |
|
📌 Commit 3a82b0d has been approved by |
alexcrichton
added a commit
to alexcrichton/rust
that referenced
this pull request
Dec 20, 2016
…r=eddyb Cleanup refactoring around DefPath handling This PR makes two big changes: * All DefPaths of a crate are now stored in metadata in their own table (as opposed to `DefKey`s as part of metadata `Entry`s. * The compiler will no longer allocate a pseudo-local DefId for inlined HIR nodes (because those are gross). Inlined HIR nodes will have a NodeId but they don't have there own DefId anymore. Turns out they were not needed anymore either. Hopefully HIR inlining will be gone completely one day but if until then we start needing to be able to map inlined NodeIds to original DefIds, we can add an additional table to metadata that allows for reconstructing this. Overall this makes for some nice simplifications and removal of special cases. r? @eddyb cc @rust-lang/compiler
bors
added a commit
that referenced
this pull request
Dec 20, 2016
Rollup of 29 pull requests - Successful merges: #37761, #38006, #38131, #38150, #38158, #38171, #38208, #38215, #38236, #38245, #38289, #38302, #38315, #38346, #38388, #38395, #38398, #38418, #38432, #38451, #38463, #38468, #38470, #38471, #38472, #38478, #38486, #38493, #38498 - Failed merges: #38271, #38483
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.
This PR makes two big changes:
DefKeys as part of metadataEntrys.Overall this makes for some nice simplifications and removal of special cases.
r? @eddyb
cc @rust-lang/compiler