---

yaml
---
r: 234230
b: refs/heads/beta
c: f3308b9
h: refs/heads/master
v: v3

Author: jonas-schievink

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: 31fa44b18e6e8bd42630d6495823ade6a5adaeba
+refs/heads/beta: f3308b9c9d9b0cd5ace3d1fa4d3b0194a78187d0
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 370fe2786109360f7c35b8ba552b83b773dd71d6
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/libsyntax/diagnostic.rs

@@ -727,7 +727,9 @@ impl EmitterWriter {
                              cm: &codemap::CodeMap,
                              sp: Span)
                              -> io::Result<()> {
+        let mut last_span = codemap::DUMMY_SP;
         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 {
@@ -737,12 +739,16 @@ impl EmitterWriter {
                             codemap::MacroBang(..) => ("", "!"),
                             codemap::CompilerExpansion(..) => ("", ""),
                         };
-                        try!(self.print_diagnostic(&cm.span_to_string(ei.call_site), Note,
-                                                   &format!("in this expansion of {}{}{}",
-                                                            pre,
-                                                            ei.callee.name(),
-                                                            post),
-                                                   None));
+                        // Don't print recursive invocations
+                        if ei.call_site != last_span {
+                            last_span = ei.call_site;
+                            try!(self.print_diagnostic(&cm.span_to_string(ei.call_site), Note,
+                                                       &format!("in this expansion of {}{}{}",
+                                                                pre,
+                                                                ei.callee.name(),
+                                                                post),
+                                                       None));
+                        }
                         Ok(Some(ei.call_site))
                     }
                     None => Ok(None)