rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Make print_macro_backtrace non-recursive

Browse Source
This commit is contained in:
Jonas Schievink
2015-09-10 21:22:59 +02:00
parent 9577e42682
commit 49d8b0dcbe
1 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libsyntax/diagnostic.rs
View File

@@ -727,7 +727,9 @@ impl EmitterWriter {
cm: &codemap::CodeMap, cm: &codemap::CodeMap,
sp: Span) sp: Span)
-> io::Result<()> { -> io::Result<()> {
let cs = try!(cm.with_expn_info(sp.expn_id, |expn_info| -> io::Result<_> { let mut sp_opt = Some(sp);
while let Some(sp) = sp_opt {
sp_opt = try!(cm.with_expn_info(sp.expn_id, |expn_info| -> io::Result<_> {
match expn_info { match expn_info {
Some(ei) => { Some(ei) => {
let ss = ei.callee.span.map_or(String::new(), let ss = ei.callee.span.map_or(String::new(),
@@ -750,7 +752,9 @@ impl EmitterWriter {
None => Ok(None) None => Ok(None)
} }
})); }));
cs.map_or(Ok(()), |call_site| self.print_macro_backtrace(cm, call_site)) }
Ok(())
} }
} }