diff options
| author | bors <bors@rust-lang.org> | 2019-10-15 00:54:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-10-15 00:54:10 +0000 |
| commit | e369d87b015a84653343032833d65d0545fd3f26 (patch) | |
| tree | d58c82d0b3d84633a9452fa78a4c3c136cfa229b /src/libsyntax/parse/parser.rs | |
| parent | e413dc36a83a5aad3ab6270373000693a917e92b (diff) | |
| parent | 9422feb43395a7a1df60d6e81b5ead87abc90b4b (diff) | |
| download | rust-e369d87b015a84653343032833d65d0545fd3f26.tar.gz rust-e369d87b015a84653343032833d65d0545fd3f26.zip | |
Auto merge of #65422 - tmandry:rollup-r5u3mlc, r=tmandry
Rollup of 10 pull requests Successful merges: - #65170 (rustc_metadata: Privatize private code and remove dead code) - #65260 (Optimize `LexicalResolve::expansion`.) - #65261 (Remove `Option` from `TokenStream`) - #65332 (std::fmt: reorder docs) - #65340 (Several changes to the codegen backend organization) - #65365 (Include const generic arguments in metadata) - #65398 (Bring attention to suggestions when the only difference is capitalization) - #65410 (syntax: add parser recovery for intersection- / and-patterns `p1 @ p2`) - #65415 (Remove an outdated test output file) - #65416 (Minor sync changes) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax/parse/parser.rs')
| -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 400bf0f3856..478cfefc224 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -1273,7 +1273,7 @@ impl<'a> Parser<'a> { // This can happen due to a bad interaction of two unrelated recovery mechanisms with // mismatched delimiters *and* recovery lookahead on the likely typo `pub ident(` // (#62881). - return Ok((ret?, TokenStream::new(vec![]))); + return Ok((ret?, TokenStream::default())); } else { &mut self.token_cursor.stack[prev].last_token }; @@ -1288,7 +1288,7 @@ impl<'a> Parser<'a> { // This can happen due to a bad interaction of two unrelated recovery mechanisms // with mismatched delimiters *and* recovery lookahead on the likely typo // `pub ident(` (#62895, different but similar to the case above). - return Ok((ret?, TokenStream::new(vec![]))); + return Ok((ret?, TokenStream::default())); } }; |
