Rollup merge of #40311 - nrc:save-proc-macro-attr, r=jseyfried

Expect macro defs in save-analysis and add expn info to spans for att…

…r proc macros

r? @jseyfried

diff --combined src/librustc_save_analysis/dump_visitor.rs
index cbb1a3e5023638d0c60217e60d9c182dd93ada8e,33d5c17a41921f9122942da41b394c85c9f1de0f..61956e5cd9d66e4abfd1e411e7b30d1a7ccfedf8
--- 1/src/librustc_save_analysis/dump_visitor.rs
--- 2/src/librustc_save_analysis/dump_visitor.rs
+++ b/src/librustc_save_analysis/dump_visitor.rs
@@@ -327,6 -327,9 +327,9 @@@ impl<'l, 'tcx: 'l, 'll, D: Dump + 'll> 
                      scope: scope
                  }.lower(self.tcx));
              }
+             // With macros 2.0, we can legitimately get a ref to a macro, but
+             // we don't handle it properly for now (FIXME).
+             Def::Macro(..) => {}
              Def::Local(..) |
              Def::Upvar(..) |
              Def::SelfTy(..) |
@@@ -336,7 -339,6 +339,6 @@@
              Def::AssociatedTy(..) |
              Def::AssociatedConst(..) |
              Def::PrimTy(_) |
-             Def::Macro(..) |
              Def::Err => {
                 span_bug!(span,
                           "process_def_kind for unexpected item: {:?}",
@@@ -373,7 -375,6 +375,7 @@@
                          visibility: Visibility::Inherited,
                          docs: String::new(),
                          sig: None,
 +                        attributes: vec![],
                      }.lower(self.tcx));
                  }
              }
@@@ -449,7 -450,6 +451,7 @@@
                      visibility: vis,
                      docs: docs_for_attrs(attrs),
                      sig: method_data.sig,
 +                    attributes: attrs.to_vec(),
                  }.lower(self.tcx));
              }
  
@@@ -521,7 -521,6 +523,7 @@@
                      parent: None,
                      docs: String::new(),
                      sig: None,
 +                    attributes: vec![],
                  }.lower(self.tcx));
              }
          }
@@@ -595,7 -594,6 +597,7 @@@
                  visibility: vis,
                  docs: docs_for_attrs(attrs),
                  sig: None,
 +                attributes: attrs.to_vec(),
              }.lower(self.tcx));
          }
  
@@@ -640,7 -638,6 +642,7 @@@
                  visibility: From::from(&item.vis),
                  docs: docs_for_attrs(&item.attrs),
                  sig: self.save_ctxt.sig_base(item),
 +                attributes: item.attrs.clone(),
              }.lower(self.tcx));
          }
  
@@@ -706,7 -703,6 +708,7 @@@
                              parent: Some(make_def_id(item.id, &self.tcx.hir)),
                              docs: docs_for_attrs(&variant.node.attrs),
                              sig: sig,
 +                            attributes: variant.node.attrs.clone(),
                          }.lower(self.tcx));
                      }
                  }
@@@ -733,7 -729,6 +735,7 @@@
                              parent: Some(make_def_id(item.id, &self.tcx.hir)),
                              docs: docs_for_attrs(&variant.node.attrs),
                              sig: sig,
 +                            attributes: variant.node.attrs.clone(),
                          }.lower(self.tcx));
                      }
                  }
@@@ -805,7 -800,6 +807,7 @@@
                  visibility: From::from(&item.vis),
                  docs: docs_for_attrs(&item.attrs),
                  sig: self.save_ctxt.sig_base(item),
 +                attributes: item.attrs.clone(),
              }.lower(self.tcx));
          }
  
@@@ -1072,7 -1066,6 +1074,7 @@@
                      visibility: Visibility::Inherited,
                      docs: String::new(),
                      sig: None,
 +                    attributes: vec![],
                  }.lower(self.tcx));
              }
          }
@@@ -1314,7 -1307,6 +1316,7 @@@ impl<'l, 'tcx: 'l, 'll, D: Dump +'ll> V
                          parent: None,
                          docs: docs_for_attrs(&item.attrs),
                          sig: Some(self.save_ctxt.sig_base(item)),
 +                        attributes: item.attrs.clone(),
                      }.lower(self.tcx));
                  }
  
@@@ -1537,7 -1529,6 +1539,7 @@@
                              visibility: Visibility::Inherited,
                              docs: String::new(),
                              sig: None,
 +                            attributes: vec![],
                          }.lower(self.tcx));
                      }
                  }