From 7054fe309445d6c9275b87a40ba2122b321b5a31 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sun, 23 Jul 2017 16:20:14 +0300
Subject: [PATCH] Lambda expressions honor no struct literal restriction

---
 src/libsyntax/parse/parser.rs                 |  5 +++-
 .../struct-literal-restrictions-in-lamda.rs   | 29 +++++++++++++++++++
 src/test/run-pass/semistatement-in-lambda.rs  | 19 ++++++++++++
 3 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 src/test/parse-fail/struct-literal-restrictions-in-lamda.rs
 create mode 100644 src/test/run-pass/semistatement-in-lambda.rs

diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 553cac80d8222..ab0dab9a1eb8c 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -3073,7 +3073,10 @@ impl<'a> Parser<'a> {
         let decl = self.parse_fn_block_decl()?;
         let decl_hi = self.prev_span;
         let body = match decl.output {
-            FunctionRetTy::Default(_) => self.parse_expr()?,
+            FunctionRetTy::Default(_) => {
+                let restrictions = self.restrictions - RESTRICTION_STMT_EXPR;
+                self.parse_expr_res(restrictions, None)?
+            },
             _ => {
                 // If an explicit return type is given, require a
                 // block to appear (RFC 968).
diff --git a/src/test/parse-fail/struct-literal-restrictions-in-lamda.rs b/src/test/parse-fail/struct-literal-restrictions-in-lamda.rs
new file mode 100644
index 0000000000000..6b7a26556f430
--- /dev/null
+++ b/src/test/parse-fail/struct-literal-restrictions-in-lamda.rs
@@ -0,0 +1,29 @@
+// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// compile-flags: -Z parse-only
+
+struct Foo {
+    x: isize,
+}
+
+impl Foo {
+    fn hi(&self) -> bool {
+        true
+    }
+}
+
+fn main() {
+    while || Foo {
+        x: 3    //~ ERROR expected type, found `3`
+    }.hi() { //~ ERROR expected one of `.`, `;`, `?`, `}`, or an operator, found `{`
+        println!("yo");
+    }
+}
diff --git a/src/test/run-pass/semistatement-in-lambda.rs b/src/test/run-pass/semistatement-in-lambda.rs
new file mode 100644
index 0000000000000..0fc5fe498a62d
--- /dev/null
+++ b/src/test/run-pass/semistatement-in-lambda.rs
@@ -0,0 +1,19 @@
+// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+
+pub fn main() {
+    // Test that lambdas behave as unary expressions with block-like expressions
+    -if true { 1 } else { 2 } * 3;
+    || if true { 1 } else { 2 } * 3;
+
+    // The following is invalid and parses as `if true { 1 } else { 2 }; *3`
+    // if true { 1 } else { 2 } * 3
+}