diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 0e45cacaf38c..8e11104b3f68 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -4719,7 +4719,12 @@ impl<'a> Parser<'a> { if !self.eat(&token::OpenDelim(token::Brace)) { let sp = self.span; let tok = self.this_token_to_string(); + let mut do_not_suggest_help = false; let mut e = self.span_fatal(sp, &format!("expected `{{`, found `{}`", tok)); + if self.token.is_keyword(keywords::In) || self.token == token::Colon { + do_not_suggest_help = true; + e.span_label(sp, "expected `{`"); + } // Check to see if the user has written something like // @@ -4729,7 +4734,8 @@ impl<'a> Parser<'a> { // Which is valid in other languages, but not Rust. match self.parse_stmt_without_recovery(false) { Ok(Some(stmt)) => { - if self.look_ahead(1, |t| t == &token::OpenDelim(token::Brace)) { + if self.look_ahead(1, |t| t == &token::OpenDelim(token::Brace)) + || do_not_suggest_help { // if the next token is an open brace (e.g., `if a b {`), the place- // inside-a-block suggestion would be more likely wrong than right return Err(e); diff --git a/src/test/ui/issue-51602.rs b/src/test/ui/issue-51602.rs new file mode 100644 index 000000000000..a3edecb94f7c --- /dev/null +++ b/src/test/ui/issue-51602.rs @@ -0,0 +1,15 @@ +// Copyright 2018 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 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +fn main(){ + if i in 1..10 { + break; + } +} diff --git a/src/test/ui/issue-51602.stderr b/src/test/ui/issue-51602.stderr new file mode 100644 index 000000000000..ac079b452c5e --- /dev/null +++ b/src/test/ui/issue-51602.stderr @@ -0,0 +1,10 @@ +error: expected `{`, found `in` + --> $DIR/issue-51602.rs:12:10 + | +LL | if i in 1..10 { + | -- ^^ expected `{` + | | + | this `if` statement has a condition, but no block + +error: aborting due to previous error +