diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2019-07-30 14:12:52 -0400 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2019-07-31 08:55:37 -0400 |
| commit | b2c5065b0434f0986e45bdf5a5d0028972e8104c (patch) | |
| tree | 7db5a5565578de21f84e3a3883ef4c3be658aff3 /src/libsyntax | |
| parent | 0a42badd4c9bfb6cb693f9a2105cc5b2cc674f63 (diff) | |
| download | rust-b2c5065b0434f0986e45bdf5a5d0028972e8104c.tar.gz rust-b2c5065b0434f0986e45bdf5a5d0028972e8104c.zip | |
Remove Span argument from ExtCtxt::attribute
MetaItem.span was always equivalent
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/attr/builtin.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/ext/build.rs | 6 | ||||
| -rw-r--r-- | src/libsyntax/ext/proc_macro.rs | 4 |
3 files changed, 6 insertions, 6 deletions
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<ast::Item>; fn item_ty(&self, span: Span, name: Ident, ty: P<ast::Ty>) -> P<ast::Item>; - 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<T: HasAttrs>( 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)); } }); } |
