diff options
| author | Yuki Okushi <huyuumi.dev@gmail.com> | 2019-10-23 17:14:42 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-23 17:14:42 +0900 |
| commit | 5bac3617769cec8080e304f2781971cf9113e188 (patch) | |
| tree | 7b79f562fff3508a64fc842fe46c97c4d05df907 /src/libsyntax/parse/parser | |
| parent | 7fc6ce9db2bd69738acc7fece8c9f6b9b1ae505e (diff) | |
| parent | 40f92b3b0595984f40aafd70ec4a5b9a3bdde47a (diff) | |
| download | rust-5bac3617769cec8080e304f2781971cf9113e188.tar.gz rust-5bac3617769cec8080e304f2781971cf9113e188.zip | |
Rollup merge of #65686 - yjhmelody:yjhmelody-patch-1, r=Centril
refactor and move `maybe_append`
Diffstat (limited to 'src/libsyntax/parse/parser')
| -rw-r--r-- | src/libsyntax/parse/parser/item.rs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/libsyntax/parse/parser/item.rs b/src/libsyntax/parse/parser/item.rs index 0acfd1450d8..73bd80e2a21 100644 --- a/src/libsyntax/parse/parser/item.rs +++ b/src/libsyntax/parse/parser/item.rs @@ -10,7 +10,6 @@ use crate::ast::{Visibility, VisibilityKind, Mutability, FnHeader, ForeignItem, use crate::ast::{Ty, TyKind, Generics, GenericBounds, TraitRef, EnumDef, VariantData, StructField}; use crate::ast::{Mac, MacDelimiter, Block, BindingMode, FnDecl, MethodSig, SelfKind, Param}; use crate::parse::token; -use crate::parse::parser::maybe_append; use crate::tokenstream::{TokenTree, TokenStream}; use crate::symbol::{kw, sym}; use crate::source_map::{self, respan, Span}; @@ -416,10 +415,17 @@ impl<'a> Parser<'a> { ) -> PResult<'a, Option<P<Item>>> { let (ident, item, extra_attrs) = info; let span = lo.to(self.prev_span); - let attrs = maybe_append(attrs, extra_attrs); + let attrs = Self::maybe_append(attrs, extra_attrs); Ok(Some(self.mk_item(span, ident, item, vis, attrs))) } + fn maybe_append<T>(mut lhs: Vec<T>, mut rhs: Option<Vec<T>>) -> Vec<T> { + if let Some(ref mut rhs) = rhs { + lhs.append(rhs); + } + lhs + } + /// This is the fall-through for parsing items. fn parse_macro_use_or_failure( &mut self, |
