From b2c5065b0434f0986e45bdf5a5d0028972e8104c Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Tue, 30 Jul 2019 14:12:52 -0400 Subject: Remove Span argument from ExtCtxt::attribute MetaItem.span was always equivalent --- src/libsyntax/attr/builtin.rs | 2 +- src/libsyntax/ext/build.rs | 6 +++--- src/libsyntax/ext/proc_macro.rs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/libsyntax') diff --git a/src/libsyntax/attr/builtin.rs b/src/libsyntax/attr/builtin.rs index dbf31ad0148..eabb6302d46 100644 --- a/src/libsyntax/attr/builtin.rs +++ b/src/libsyntax/attr/builtin.rs @@ -929,7 +929,7 @@ pub fn find_transparency( pub fn check_builtin_macro_attribute(ecx: &ExtCtxt<'_>, meta_item: &MetaItem, name: Symbol) { // All the built-in macro attributes are "words" at the moment. let template = AttributeTemplate { word: true, list: None, name_value_str: None }; - let attr = ecx.attribute(meta_item.span, meta_item.clone()); + let attr = ecx.attribute(meta_item.clone()); check_builtin_attribute(ecx.parse_sess, &attr, name, template); } diff --git a/src/libsyntax/ext/build.rs b/src/libsyntax/ext/build.rs index 8a7a9e712a3..ea2c1fd7078 100644 --- a/src/libsyntax/ext/build.rs +++ b/src/libsyntax/ext/build.rs @@ -259,7 +259,7 @@ pub trait AstBuilder { generics: Generics) -> P; fn item_ty(&self, span: Span, name: Ident, ty: P) -> P; - fn attribute(&self, sp: Span, mi: ast::MetaItem) -> ast::Attribute; + fn attribute(&self, mi: ast::MetaItem) -> ast::Attribute; fn meta_word(&self, sp: Span, w: ast::Name) -> ast::MetaItem; @@ -1134,8 +1134,8 @@ impl<'a> AstBuilder for ExtCtxt<'a> { self.item_ty_poly(span, name, ty, Generics::default()) } - fn attribute(&self, sp: Span, mi: ast::MetaItem) -> ast::Attribute { - attr::mk_attr_outer(sp, mi) + fn attribute(&self, mi: ast::MetaItem) -> ast::Attribute { + attr::mk_attr_outer(mi.span, mi) } fn meta_word(&self, sp: Span, w: ast::Name) -> ast::MetaItem { diff --git a/src/libsyntax/ext/proc_macro.rs b/src/libsyntax/ext/proc_macro.rs index 425b9813f59..d1fabf963b5 100644 --- a/src/libsyntax/ext/proc_macro.rs +++ b/src/libsyntax/ext/proc_macro.rs @@ -239,11 +239,11 @@ crate fn add_derived_markers( item.visit_attrs(|attrs| { if names.contains(&sym::Eq) && names.contains(&sym::PartialEq) { let meta = cx.meta_word(span, sym::structural_match); - attrs.push(cx.attribute(span, meta)); + attrs.push(cx.attribute(meta)); } if names.contains(&sym::Copy) { let meta = cx.meta_word(span, sym::rustc_copy_clone_marker); - attrs.push(cx.attribute(span, meta)); + attrs.push(cx.attribute(meta)); } }); } -- cgit 1.4.1-3-g733a5