Skip to content

query for def_span #41593

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.

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

Merged
merged 7 commits into from
Apr 30, 2017
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Merge branch 'master' into def_span
  • Loading branch information
hackeryarn authored Apr 29, 2017
commit 2f73b173cbe6e6635226593a2bc6672faf61bd60
7 changes: 4 additions & 3 deletions src/librustc/ty/maps.rs
Original file line number Diff line number Diff line change
Expand Up @@ -574,8 +574,9 @@ define_maps! { <'tcx>
[] def_symbol_name: SymbolName(DefId) -> ty::SymbolName,
[] symbol_name: symbol_name_dep_node(ty::Instance<'tcx>) -> ty::SymbolName,

pub describe_def: MetaData(DefId) -> Option<Def>,
pub def_span: MetaData(DefId) -> Span

[] describe_def: MetaData(DefId) -> Option<Def>,
Copy link
Member

Choose a reason for hiding this comment

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

Unnecessary extra empty line.

[] def_span: MetaData(DefId) -> Span
}

fn coherent_trait_dep_node((_, def_id): (CrateNum, DefId)) -> DepNode<DefId> {
Expand Down Expand Up @@ -606,4 +607,4 @@ fn typeck_item_bodies_dep_node(_: CrateNum) -> DepNode<DefId> {

fn const_eval_dep_node((def_id, _): (DefId, &Substs)) -> DepNode<DefId> {
DepNode::ConstEval(def_id)
}
}
You are viewing a condensed version of this merge commit. You can view the full changes here.