Skip to content

[Do not merge] Optional turbofish breakage test #53578

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
varkor wants to merge 4 commits into from
Closed

[Do not merge] Optional turbofish breakage test #53578

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
21da4b0
Allow generic parameters to be specified in expressions without `::`
varkor Aug 4, 2018
29ab824
Save parser state lazily
varkor Aug 19, 2018
307ea60
Fix issue parsing .
varkor Sep 13, 2018
c7b5c52
Remove do catch
varkor Sep 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Remove do catch
  • Loading branch information
@varkor
varkor committed Sep 13, 2018
commit c7b5c5230e3a5fd8e04189bf9e38c275aa0d8d01
1 change: 0 additions & 1 deletion src/libsyntax/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
#![feature(str_escape)]
#![feature(try_trait)]
#![feature(unicode_internals)]
#![feature(catch_expr)]

#![recursion_limit="256"]

Expand Down
12 changes: 6 additions & 6 deletions src/libsyntax/parse/parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2081,12 +2081,12 @@ impl<'a> Parser<'a> {

let args = if self.eat_lt() {
// `<'a, T, A = U>`
let args: PResult<_> = do catch {
let (args, bindings) = self.parse_generic_args()?;
self.expect_gt()?;
let span = lo.to(self.prev_span);
AngleBracketedArgs { args, bindings, span }
};
let args: PResult<_> = self.parse_generic_args().and_then(|(args, bindings)| {
self.expect_gt().and_then(|_| {
let span = lo.to(self.prev_span);
Ok(AngleBracketedArgs { args, bindings, span })
})
});

match args {
Err(mut err) => {
Expand Down