diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 37bda15ac2c..c70a171ff7b 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -4092,20 +4092,20 @@ fn parse_fn_block_decl(&mut self) (optional_unboxed_closure_kind, args) } }; - let output = if self.eat(&token::RARROW) { - self.parse_ty(true) + let (style, output) = if self.token == token::RARROW { + self.parse_ret_ty() } else { - P(Ty { + (Return, P(Ty { id: ast::DUMMY_NODE_ID, node: TyInfer, span: self.span, - }) + })) }; (P(FnDecl { inputs: inputs_captures, output: output, - cf: Return, + cf: style, variadic: false }), optional_unboxed_closure_kind) } @@ -4118,20 +4118,20 @@ fn parse_proc_decl(&mut self) -> P { seq_sep_trailing_allowed(token::COMMA), |p| p.parse_fn_block_arg()); - let output = if self.eat(&token::RARROW) { - self.parse_ty(true) + let (style, output) = if self.token == token::RARROW { + self.parse_ret_ty() } else { - P(Ty { + (Return, P(Ty { id: ast::DUMMY_NODE_ID, node: TyInfer, span: self.span, - }) + })) }; P(FnDecl { inputs: inputs, output: output, - cf: Return, + cf: style, variadic: false }) } diff --git a/src/test/run-pass/closure-syntax.rs b/src/test/run-pass/closure-syntax.rs index c2fbc2a4bf2..b5a94a02b34 100644 --- a/src/test/run-pass/closure-syntax.rs +++ b/src/test/run-pass/closure-syntax.rs @@ -78,6 +78,10 @@ fn bar<'b>() { let a = A; a.foo::<<'a>||>(); + + // issue #13490 + let _ = || -> ! loop {}; + let _ = proc() -> ! loop {}; } struct B;