diff options
| author | bors <bors@rust-lang.org> | 2019-01-22 13:40:01 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-01-22 13:40:01 +0000 |
| commit | ad30e9a6814b5d29dfbdcd85ecde48afcc94389b (patch) | |
| tree | 0e358d32a69cc6c584211e87fd412d8f3cb505fb /src/libsyntax/parse | |
| parent | 76c87a166fa8ca247855ea6c32465d627d1ead14 (diff) | |
| parent | dec7b7b1315a073c40c253cc9c80fc693422e3bf (diff) | |
| download | rust-ad30e9a6814b5d29dfbdcd85ecde48afcc94389b.tar.gz rust-ad30e9a6814b5d29dfbdcd85ecde48afcc94389b.zip | |
Auto merge of #57830 - Centril:rollup, r=Centril
Rollup of 9 pull requests Successful merges: - #57537 (Small perf improvement for fmt) - #57552 (Default images) - #57604 (Make `str` indexing generic on `SliceIndex`.) - #57667 (Fix memory leak in P::filter_map) - #57677 (const_eval: Predetermine the layout of all locals when pushing a stack frame) - #57791 (Add regression test for #54582) - #57798 (Corrected spelling inconsistency) - #57809 (Add powerpc64-unknown-freebsd) - #57813 (fix validation range printing when encountering undef) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 439eec5b0c4..09ea0995253 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -1,5 +1,5 @@ use rustc_target::spec::abi::{self, Abi}; -use ast::{AngleBracketedArgs, ParenthesisedArgs, AttrStyle, BareFnTy}; +use ast::{AngleBracketedArgs, ParenthesizedArgs, AttrStyle, BareFnTy}; use ast::{GenericBound, TraitBoundModifier}; use ast::Unsafety; use ast::{Mod, AnonConst, Arg, Arm, Guard, Attribute, BindingMode, TraitItemKind}; @@ -2203,7 +2203,7 @@ impl<'a> Parser<'a> { } else { None }; - ParenthesisedArgs { inputs, output, span }.into() + ParenthesizedArgs { inputs, output, span }.into() }; PathSegment { ident, args, id: ast::DUMMY_NODE_ID } |
