Span's PartialEq ignores expn_id, so compare sp.expn_id not sp

rprichard · rprichard · commit aa34c6780ec0 · 2015-04-05T18:13:56.000-07:00
We already fixed the comparison at the top of this function.
diff --git a/src/libsyntax/diagnostic.rs b/src/libsyntax/diagnostic.rs
@@ -453,7 +453,7 @@ fn emit(dst: &mut EmitterWriter, cm: &codemap::CodeMap, rsp: RenderSpan,
             try!(highlight_lines(dst, cm, sp, lvl, cm.span_to_lines(sp)));
         }
     }
-    if sp != COMMAND_LINE_SP && rsp.is_full_span() {
+    if sp.expn_id != COMMAND_LINE_EXPN && rsp.is_full_span() {
         try!(print_macro_backtrace(dst, cm, sp));
     }
     match code {

Original file line number	Diff line number	Diff line change
`@@ -453,7 +453,7 @@ fn emit(dst: &mut EmitterWriter, cm: &codemap::CodeMap, rsp: RenderSpan,`
`453`	`453`	`try!(highlight_lines(dst, cm, sp, lvl, cm.span_to_lines(sp)));`
`454`	`454`	`}`
`455`	`455`	`}`
`456`		`- if sp != COMMAND_LINE_SP && rsp.is_full_span() {`
	`456`	`+ if sp.expn_id != COMMAND_LINE_EXPN && rsp.is_full_span() {`
`457`	`457`	`try!(print_macro_backtrace(dst, cm, sp));`
`458`	`458`	`}`
`459`	`459`	`match code {`