Rollup merge of #33730 - jseyfried:fix_macro_backtrace_diagnostics, r=nikomatsakis

Manishearth · Manishearth · commit acd2c11c5e84 · 2016-05-19T21:21:08.000+05:30
Fix macro expansion backtrace diagnostics Fixes #33704. r? @nikomatsakis
diff --git a/src/libsyntax/errors/emitter.rs b/src/libsyntax/errors/emitter.rs
@@ -423,7 +423,7 @@ impl EmitterWriter {
                     &format!(" (defined in {})",
                         self.cm.span_to_filename(def_site_span)));
             }
-            let snippet = self.cm.span_to_string(sp);
+            let snippet = self.cm.span_to_string(trace.call_site);
             print_diagnostic(&mut self.dst, &snippet, Note, &diag_string, None)?;
         }
         Ok(())

Original file line number	Diff line number	Diff line change
`@@ -423,7 +423,7 @@ impl EmitterWriter {`
`423`	`423`	`&format!(" (defined in {})",`
`424`	`424`	`self.cm.span_to_filename(def_site_span)));`
`425`	`425`	`}`
`426`		`- let snippet = self.cm.span_to_string(sp);`
	`426`	`+ let snippet = self.cm.span_to_string(trace.call_site);`
`427`	`427`	`print_diagnostic(&mut self.dst, &snippet, Note, &diag_string, None)?;`
`428`	`428`	`}`
`429`	`429`	`Ok(())`