user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use source_callee().is_some() to detect macros

Browse source 
macro_backtrace() allocates a vector, whereas source_callee() doesn't
but indicates the same thing.  Suggested by @estebank
This commit is contained in:
Pi Lanningham 2019-11-05 23:49:46 +00:00
parent 15ccad399f
commit 6186edeae5
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/librustc_passes/dead.rs
View file

@ -579,14 +579,15 @@ impl Visitor<'tcx> for DeadVisitor<'tcx> {
hir::ItemKind::Trait(..) |
hir::ItemKind::Impl(..) => {
// FIXME(66095): Because item.span is annotated with things
// like a macro_backtrace, and ident.span isn't, we use the
// like expansion data, and ident.span isn't, we use the
// def_span method if it's part of a macro invocation
// (and thus has asource_callee set).
// We should probably annotate ident.span with the macro
// context, but that's a larger change.
if item.span.macro_backtrace().len() == 0 {
item.ident.span
} else {
if item.span.source_callee().is_some() {
self.tcx.sess.source_map().def_span(item.span)
} else {
item.ident.span
}
},
_ => item.span,