Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cleanup refactoring around DefPath handling #38418

Merged
merged 11 commits into from
Dec 21, 2016
Merged

Cleanup refactoring around DefPath handling #38418

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
87b4071
Definitions: Split out NodeId <-> DefIndex mapping
michaelwoerister Dec 13, 2016
8e34a8e
Definitions: Extract DefPath interning into its own data structure.
michaelwoerister Dec 14, 2016
aed0cdb
definitions: Don't allocate DefIds for inlined HIR
michaelwoerister Dec 16, 2016
ed5a88e
definitions: Store DefPath data in separate table in metadata
michaelwoerister Dec 16, 2016
e0d2629
definitions: Add some timing stats for DefPathTable decoding.
michaelwoerister Dec 16, 2016
ea733b5
No need to store Definitions in RefCell within HIR map
michaelwoerister Dec 16, 2016
72f95aa
Move retrace_path() implementation to DefPathTable
michaelwoerister Dec 16, 2016
70944c2
No need to have tcx::opt_def_path() now that we store all DefPaths
michaelwoerister Dec 16, 2016
45571f3
definitions: Add some documentation.
michaelwoerister Dec 17, 2016
77e659a
Remove some more things that were only needed for inlined-HIR DefIds
michaelwoerister Dec 17, 2016
3a82b0d
Don't try get local DefId of imported macro in rustdoc.
michaelwoerister Dec 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/librustc/hir/def_id.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,7 @@ impl fmt::Debug for DefId {

ty::tls::with_opt(|opt_tcx| {
if let Some(tcx) = opt_tcx {
if let Some(def_path) = tcx.opt_def_path(*self) {
write!(f, " => {}", def_path.to_string(tcx))?;
}
write!(f, " => {}", tcx.def_path(*self).to_string(tcx))?;
}
Ok(())
})?;
Expand Down
4 changes: 0 additions & 4 deletions src/librustc/hir/map/collector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
use super::*;

use hir::intravisit::{Visitor, NestedVisitorMap};
use hir::def_id::DefId;
use middle::cstore::InlinedItem;
use std::iter::repeat;
use syntax::ast::{NodeId, CRATE_NODE_ID};
Expand Down Expand Up @@ -47,8 +46,6 @@ impl<'ast> NodeCollector<'ast> {
pub fn extend(krate: &'ast Crate,
parent: &'ast InlinedItem,
parent_node: NodeId,
parent_def_path: DefPath,
parent_def_id: DefId,
map: Vec<MapEntry<'ast>>)
-> NodeCollector<'ast> {
let mut collector = NodeCollector {
Expand All @@ -58,7 +55,6 @@ impl<'ast> NodeCollector<'ast> {
ignore_nested_items: true
};

assert_eq!(parent_def_path.krate, parent_def_id.krate);
collector.insert_entry(parent_node, RootInlinedParent(parent));

collector
Expand Down
21 changes: 1 addition & 20 deletions src/librustc/hir/map/def_collector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use hir::map::definitions::*;

use hir;
use hir::intravisit::{self, Visitor, NestedVisitorMap};
use hir::def_id::{CRATE_DEF_INDEX, DefId, DefIndex};
use hir::def_id::{CRATE_DEF_INDEX, DefIndex};

use middle::cstore::InlinedItem;

Expand Down Expand Up @@ -47,25 +47,6 @@ impl<'a> DefCollector<'a> {
}
}

pub fn extend(parent_node: NodeId,
parent_def_path: DefPath,
parent_def_id: DefId,
definitions: &'a mut Definitions)
-> Self {
let mut collector = DefCollector::new(definitions);

assert_eq!(parent_def_path.krate, parent_def_id.krate);
let root_path = Box::new(InlinedRootPath {
data: parent_def_path.data,
def_id: parent_def_id,
});

let def = collector.create_def(parent_node, DefPathData::InlinedRoot(root_path));
collector.parent_def = Some(def);

collector
}

pub fn collect_root(&mut self) {
let root = self.create_def_with_parent(None, CRATE_NODE_ID, DefPathData::CrateRoot);
assert_eq!(root, CRATE_DEF_INDEX);
Expand Down
Loading