---

yaml
---
r: 234231
b: refs/heads/beta
c: 0be755c
h: refs/heads/master
i:
  234229: f48d7cf
  234227: 89cad49
  234223: dab8f3d
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: f3308b9c9d9b0cd5ace3d1fa4d3b0194a78187d0
+refs/heads/beta: 0be755c24a81f3c7c07dcd50406c9f17bee0d6ac
 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

@@ -742,11 +742,20 @@ impl EmitterWriter {
                         // 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),
+
+                            let mut diag_string = format!("in this expansion of {}{}{}",
+                                                          pre,
+                                                          ei.callee.name(),
+                                                          post);
+
+                            if let Some(def_site_span) = ei.callee.span {
+                                diag_string.push_str(&format!(" (defined in {})",
+                                                              cm.span_to_filename(def_site_span)));
+                            }
+
+                            try!(self.print_diagnostic(&cm.span_to_string(ei.call_site),
+                                                       Note,
+                                                       &diag_string,
                                                        None));
                         }
                         Ok(Some(ei.call_site))