---

yaml
---
r: 147071
b: refs/heads/try2
c: 0c0e73e
h: refs/heads/master
i:
  147069: fa4e6ae
  147067: 00e07af
  147063: b34c84b
  147055: 791ddab
  147039: f38c48a
  147007: e295c74
  146943: b938899
v: v3

Author: huonw

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 3ef933647ab6adf841d8323a712101f37851eff9
+refs/heads/try2: 0c0e73eed6ee914c0be3fbc2ed200482a51c3fa9
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libsyntax/ext/deriving/generic.rs

@@ -899,7 +899,9 @@ impl<'self> MethodDef<'self> {
         let summary = enum_def.variants.map(|v| {
             let ident = v.node.name;
             let summary = match v.node.kind {
-                ast::tuple_variant_kind(ref args) => Unnamed(args.map(|va| va.ty.span)),
+                ast::tuple_variant_kind(ref args) => {
+                    Unnamed(args.map(|va| trait_.set_expn_info(va.ty.span)))
+                }
                 ast::struct_variant_kind(struct_def) => {
                     trait_.summarise_struct(struct_def)
                 }
@@ -919,11 +921,27 @@ enum StructType {
 
 // general helper methods.
 impl<'a> TraitDef<'a> {
+    fn set_expn_info(&self, mut to_set: Span) -> Span {
+        let trait_name = match self.path.path.last_opt() {
+            None => self.cx.span_bug(self.span, "trait with empty path in generic `deriving`"),
+            Some(name) => *name
+        };
+        to_set.expn_info = Some(@codemap::ExpnInfo {
+            call_site: to_set,
+            callee: codemap::NameAndSpan {
+                name: format!("deriving({})", trait_name).to_managed(),
+                format: codemap::MacroAttribute,
+                span: Some(self.span)
+            }
+        });
+        to_set
+    }
+
     fn summarise_struct(&self, struct_def: &struct_def) -> StaticFields {
         let mut named_idents = ~[];
         let mut just_spans = ~[];
         for field in struct_def.fields.iter(){
-            let sp = field.span;
+            let sp = self.set_expn_info(field.span);
             match field.node.kind {
                 ast::named_field(ident, _) => named_idents.push((ident, sp)),
                 ast::unnamed_field => just_spans.push(sp),
@@ -973,7 +991,7 @@ impl<'a> TraitDef<'a> {
         let mut struct_type = Unknown;
 
         for (i, struct_field) in struct_def.fields.iter().enumerate() {
-            let sp = struct_field.span;
+            let sp = self.set_expn_info(struct_field.span);
             let opt_id = match struct_field.node.kind {
                 ast::named_field(ident, _) if (struct_type == Unknown ||
                                                struct_type == Record) => {
@@ -1031,7 +1049,7 @@ impl<'a> TraitDef<'a> {
                 let mut paths = ~[];
                 let mut ident_expr = ~[];
                 for (i, va) in variant_args.iter().enumerate() {
-                    let sp = va.ty.span;
+                    let sp = self.set_expn_info(va.ty.span);
                     let path = cx.path_ident(sp, cx.ident_of(format!("{}_{}", prefix, i)));
 
                     paths.push(path.clone());