diff options
| author | bors <bors@rust-lang.org> | 2019-01-13 17:08:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-01-13 17:08:24 +0000 |
| commit | 2cf736f76563f054aecd84207b39114c6fceb8ed (patch) | |
| tree | 3700724bbe6c6438f2aef5999ed54084c9c17018 /src/libsyntax/parse/parser.rs | |
| parent | 1c561d9b55aabc7df484f8faba24430421aee998 (diff) | |
| parent | e2311b31c64e56c3d3218f6101c22ffe573bb687 (diff) | |
| download | rust-2cf736f76563f054aecd84207b39114c6fceb8ed.tar.gz rust-2cf736f76563f054aecd84207b39114c6fceb8ed.zip | |
Auto merge of #57577 - Centril:rollup, r=Centril
Rollup of 4 pull requests Successful merges: - #57004 (Make `TokenStream` less recursive.) - #57102 (NLL: Add union justifications to conflicting borrows.) - #57337 (rustc: Place wasm linker args first instead of last) - #57549 (Add #[must_use] message to Iterator and Future) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax/parse/parser.rs')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index b90eeaca54b..5c8ed94731a 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -2914,7 +2914,7 @@ impl<'a> Parser<'a> { TokenTree::Delimited( frame.span, frame.delim, - frame.tree_cursor.original_stream().into(), + frame.tree_cursor.stream.into(), ) }, token::CloseDelim(_) | token::Eof => unreachable!(), |