From 074f4c2c91035dab745d197de8b2639fa05bdf40 Mon Sep 17 00:00:00 2001 From: Jeffrey Seyfried Date: Mon, 23 May 2016 06:27:43 +0000 Subject: Fix spans of generated `#[derive_*]` attributes --- src/libsyntax_ext/deriving/generic/mod.rs | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'src/libsyntax_ext/deriving/generic') diff --git a/src/libsyntax_ext/deriving/generic/mod.rs b/src/libsyntax_ext/deriving/generic/mod.rs index 9095230df63..b5dc5f8da35 100644 --- a/src/libsyntax_ext/deriving/generic/mod.rs +++ b/src/libsyntax_ext/deriving/generic/mod.rs @@ -201,7 +201,7 @@ use syntax::codemap::{self, respan, DUMMY_SP}; use syntax::codemap::Span; use syntax::errors::Handler; use syntax::util::move_map::MoveMap; -use syntax::parse::token::{intern, keywords, InternedString}; +use syntax::parse::token::{keywords, InternedString}; use syntax::ptr::P; use self::ty::{LifetimeBounds, Path, Ptr, PtrTy, Self_, Ty}; @@ -1421,20 +1421,9 @@ impl<'a> MethodDef<'a> { // general helper methods. impl<'a> TraitDef<'a> { fn set_expn_info(&self, - cx: &mut ExtCtxt, + _cx: &mut ExtCtxt, mut to_set: Span) -> Span { - let trait_name = match self.path.path.last() { - None => cx.span_bug(self.span, "trait with empty path in generic `derive`"), - Some(name) => *name - }; - to_set.expn_id = cx.codemap().record_expansion(codemap::ExpnInfo { - call_site: to_set, - callee: codemap::NameAndSpan { - format: codemap::MacroAttribute(intern(&format!("derive({})", trait_name))), - span: Some(self.span), - allow_internal_unstable: false, - } - }); + to_set.expn_id = self.span.expn_id; to_set } -- cgit 1.4.1-3-g733a5