---

yaml
---
r: 274270
b: refs/heads/stable
c: 2b1e273
h: refs/heads/master

Author: dsprenkels

[refs]

@@ -29,7 +29,7 @@ refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: c0221c8897db309a79990367476177b1230bb264
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: 79f2cff44ec62cf42f6c97d28dc4286de683b1e5
+refs/heads/stable: 2b1e2732930830fc295d26bfb4bb29931e7e84ac
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
 refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/src/libsyntax/parse/parser.rs

@@ -2134,12 +2134,6 @@ impl<'a> Parser<'a> {
                 }
                 hi = self.last_span.hi;
             }
-            _ if self.token.is_keyword(keywords::Let) => {
-                // Catch this syntax error here, instead of in `check_strict_keywords`, so that
-                // we can explicitly mention that let is not to be used as an expression
-                let msg = "`let` is not an expression, so it cannot be used in this way";
-                return Err(self.diagnostic().struct_span_err(self.span, &msg));
-            },
             _ => {
                 if self.eat_lt() {
                     let (qself, path) =
@@ -2162,6 +2156,12 @@ impl<'a> Parser<'a> {
                     let lo = self.last_span.lo;
                     return self.parse_while_expr(None, lo, attrs);
                 }
+                if self.token.is_keyword(keywords::Let) {
+                    // Catch this syntax error here, instead of in `check_strict_keywords`, so
+                    // that we can explicitly mention that let is not to be used as an expression
+                    let msg = "`let` is not an expression, so it cannot be used in this way";
+                    self.span_err(self.span, msg);
+                }
                 if self.token.is_lifetime() {
                     let lifetime = self.get_lifetime();
                     let lo = self.span.lo;

branches/stable/src/test/run-fail-fulldeps/qquote.rs

@@ -10,7 +10,7 @@
 
 // ignore-cross-compile
 
-// error-pattern:expected identifier, found keyword `let`
+// error-pattern:`let` is not an expression, so it cannot be used in this way
 
 #![feature(quote, rustc_private)]