OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rollup merge of #68769 - Centril:unwrap, r=petrochenkov

Browse Source 
parser: avoid re-wrapping NtItem

r? @petrochenkov
This commit is contained in:
Mazdak Farrokhzad 2020-02-02 14:15:53 +01:00 committed by GitHub
commit 011fb23c58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/librustc_parse/parser/item.rs
View File

@ -70,16 +70,15 @@ impl<'a> Parser<'a> {
/// Parses one of the items allowed by the flags. /// Parses one of the items allowed by the flags.
fn parse_item_implementation( fn parse_item_implementation(
&mut self, &mut self,
attrs: Vec<Attribute>, mut attrs: Vec<Attribute>,
macros_allowed: bool, macros_allowed: bool,
attributes_allowed: bool, attributes_allowed: bool,
) -> PResult<'a, Option<P<Item>>> { ) -> PResult<'a, Option<P<Item>>> {
maybe_whole!(self, NtItem, |item| { maybe_whole!(self, NtItem, |item| {
let mut item = item.into_inner(); let mut item = item;
let mut attrs = attrs;
mem::swap(&mut item.attrs, &mut attrs); mem::swap(&mut item.attrs, &mut attrs);
item.attrs.extend(attrs); item.attrs.extend(attrs);
Some(P(item)) Some(item)
}); });
let lo = self.token.span; let lo = self.token.span;