nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-30 10:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify fold_attribute.

Browse Source 
It doesn't need to return an `Option`.
This commit is contained in:
Nicholas Nethercote 2019-02-05 15:11:27 +11:00
parent eea2dfe76f
commit f97e896fd6
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libsyntax/ext/expand.rs
View File

@ -1465,7 +1465,7 @@ impl<'a, 'b> Folder for InvocationCollector<'a, 'b> {
noop_fold_generic_param(param, self) noop_fold_generic_param(param, self)
} }
fn fold_attribute(&mut self, at: ast::Attribute) -> Option<ast::Attribute> { fn fold_attribute(&mut self, at: ast::Attribute) -> ast::Attribute {
// turn `#[doc(include="filename")]` attributes into `#[doc(include(file="filename", // turn `#[doc(include="filename")]` attributes into `#[doc(include(file="filename",
// contents="file contents")]` attributes // contents="file contents")]` attributes
if !at.check_name("doc") { if !at.check_name("doc") {
@ -1585,10 +1585,8 @@ impl<'a, 'b> Folder for InvocationCollector<'a, 'b> {
let meta = attr::mk_list_item(DUMMY_SP, Ident::from_str("doc"), items); let meta = attr::mk_list_item(DUMMY_SP, Ident::from_str("doc"), items);
match at.style { match at.style {
ast::AttrStyle::Inner => ast::AttrStyle::Inner => attr::mk_spanned_attr_inner(at.span, at.id, meta),
Some(attr::mk_spanned_attr_inner(at.span, at.id, meta)), ast::AttrStyle::Outer => attr::mk_spanned_attr_outer(at.span, at.id, meta),
ast::AttrStyle::Outer =>
Some(attr::mk_spanned_attr_outer(at.span, at.id, meta)),
} }
} else { } else {
noop_fold_attribute(at, self) noop_fold_attribute(at, self)

16
src/libsyntax/fold.rs
View File

@ -209,7 +209,7 @@ pub trait Folder : Sized {
noop_fold_label(label, self) noop_fold_label(label, self)
} }
fn fold_attribute(&mut self, at: Attribute) -> Option<Attribute> { fn fold_attribute(&mut self, at: Attribute) -> Attribute {
noop_fold_attribute(at, self) noop_fold_attribute(at, self)
} }
@ -313,7 +313,7 @@ pub fn noop_fold_use_tree<T: Folder>(use_tree: UseTree, fld: &mut T) -> UseTree
} }
pub fn fold_attrs<T: Folder>(attrs: Vec<Attribute>, fld: &mut T) -> Vec<Attribute> { pub fn fold_attrs<T: Folder>(attrs: Vec<Attribute>, fld: &mut T) -> Vec<Attribute> {
attrs.move_flat_map(|x| fld.fold_attribute(x)) attrs.move_map(|x| fld.fold_attribute(x))
} }
pub fn fold_thin_attrs<T: Folder>(attrs: ThinVec<Attribute>, fld: &mut T) -> ThinVec<Attribute> { pub fn fold_thin_attrs<T: Folder>(attrs: ThinVec<Attribute>, fld: &mut T) -> ThinVec<Attribute> {
@ -485,15 +485,15 @@ pub fn noop_fold_local<T: Folder>(l: P<Local>, fld: &mut T) -> P<Local> {
}) })
} }
pub fn noop_fold_attribute<T: Folder>(attr: Attribute, fld: &mut T) -> Option<Attribute> { pub fn noop_fold_attribute<T: Folder>(attr: Attribute, fld: &mut T) -> Attribute {
Some(Attribute { Attribute {
id: attr.id, id: attr.id,
style: attr.style, style: attr.style,
path: fld.fold_path(attr.path), path: fld.fold_path(attr.path),
tokens: fld.fold_tts(attr.tokens), tokens: fld.fold_tts(attr.tokens),
is_sugared_doc: attr.is_sugared_doc, is_sugared_doc: attr.is_sugared_doc,
span: fld.new_span(attr.span), span: fld.new_span(attr.span),
}) }
} }
pub fn noop_fold_mac<T: Folder>(Spanned {node, span}: Mac, fld: &mut T) -> Mac { pub fn noop_fold_mac<T: Folder>(Spanned {node, span}: Mac, fld: &mut T) -> Mac {
@ -678,14 +678,10 @@ pub fn noop_fold_param_bound<T>(pb: GenericBound, fld: &mut T) -> GenericBound w
} }
pub fn noop_fold_generic_param<T: Folder>(param: GenericParam, fld: &mut T) -> GenericParam { pub fn noop_fold_generic_param<T: Folder>(param: GenericParam, fld: &mut T) -> GenericParam {
let attrs: Vec<_> = param.attrs.into();
GenericParam { GenericParam {
ident: fld.fold_ident(param.ident), ident: fld.fold_ident(param.ident),
id: fld.new_id(param.id), id: fld.new_id(param.id),
attrs: attrs.into_iter() attrs: fold_thin_attrs(param.attrs, fld),
.flat_map(|x| fld.fold_attribute(x).into_iter())
.collect::<Vec<_>>()
.into(),
bounds: param.bounds.move_map(|l| noop_fold_param_bound(l, fld)), bounds: param.bounds.move_map(|l| noop_fold_param_bound(l, fld)),
kind: match param.kind { kind: match param.kind {
GenericParamKind::Lifetime => GenericParamKind::Lifetime, GenericParamKind::Lifetime => GenericParamKind::Lifetime,