bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Suggest && and || instead of 'and' and 'or'

Browse source 
Closes #54109.
This commit is contained in:
Vitaly _Vi Shukela 2018-09-13 15:54:12 +03:00
parent 06d2448f1f
commit 636f518aac
No known key found for this signature in database
GPG key ID: C097221D6E03DF68
1 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/libsyntax/parse/parser.rs
View file

@ -732,6 +732,12 @@ impl<'a> Parser<'a> {
format!("expected {} here", expect)))
};
let mut err = self.fatal(&msg_exp);
if self.token.is_ident_named("and") {
err.help("Use `&&` instead of `and` for the boolean operator");
}
if self.token.is_ident_named("or") {
err.help("Use `||` instead of `or` for the boolean operator");
}
let sp = if self.token == token::Token::Eof {
// This is EOF, don't want to point at the following char, but rather the last token
self.prev_span
@ -4751,6 +4757,13 @@ impl<'a> Parser<'a> {
e.span_label(sp, "expected `{`");
}
if self.token.is_ident_named("and") {
e.help("Use `&&` instead of `and` for the boolean operator");
}
if self.token.is_ident_named("or") {
e.help("Use `||` instead of `or` for the boolean operator");
}
// Check to see if the user has written something like
//
// if (cond)