Rollup merge of rust-lang#75658 - tgnottingham:issue-75599, r=estebank

tmandry · web-flow · commit 5eee694e3ee1 · 2020-08-18T22:15:15.000-07:00
Don't emit "is not a logical operator" error outside of associative expressions Avoid showing this error where it doesn't make sense by not assuming "and" and "or" were intended to mean "&&" and "||" until after we decide to continue parsing input as an associative expression. Note that the decision of whether or not to continue parsing input as an associative expression doesn't actually depend on this assumption. Fixes rust-lang#75599 --- First time contributor! Let me know if there are any conventions or policies I should be following that I missed here. Thanks :)
diff --git a/src/librustc_parse/parser/expr.rs b/src/librustc_parse/parser/expr.rs
@@ -308,7 +308,7 @@ impl<'a> Parser<'a> {
     }
 
     fn should_continue_as_assoc_expr(&mut self, lhs: &Expr) -> bool {
-        match (self.expr_is_complete(lhs), self.check_assoc_op().map(|op| op.node)) {
+        match (self.expr_is_complete(lhs), AssocOp::from_token(&self.token)) {
             // Semi-statement forms are odd:
             // See https://github.com/rust-lang/rust/issues/29071
             (true, None) => false,
diff --git a/src/test/ui/did_you_mean/issue-54109-and_instead_of_ampersands.rs b/src/test/ui/did_you_mean/issue-54109-and_instead_of_ampersands.rs
@@ -5,10 +5,8 @@ fn test_and() {
     let b = false;
 
     let _ = a and b; //~ ERROR `and` is not a logical operator
-                     //~| ERROR `and` is not a logical operator
 
     if a and b { //~ ERROR `and` is not a logical operator
-                 //~| ERROR `and` is not a logical operator
         println!("both");
     }
 
@@ -20,10 +18,8 @@ fn test_or() {
     let b = false;
 
     let _ = a or b; //~ ERROR `or` is not a logical operator
-                    //~| ERROR `or` is not a logical operator
 
     if a or b { //~ ERROR `or` is not a logical operator
-                //~| ERROR `or` is not a logical operator
         println!("both");
     }
 }
@@ -32,7 +28,6 @@ fn test_and_par() {
     let a = true;
     let b = false;
     if (a and b) {  //~ ERROR `and` is not a logical operator
-                    //~| ERROR `and` is not a logical operator
         println!("both");
     }
 }
@@ -41,7 +36,6 @@ fn test_or_par() {
     let a = true;
     let b = false;
     if (a or b) {  //~ ERROR `or` is not a logical operator
-                   //~| ERROR `or` is not a logical operator
         println!("both");
     }
 }
@@ -50,7 +44,6 @@ fn test_while_and() {
     let a = true;
     let b = false;
     while a and b {  //~ ERROR `and` is not a logical operator
-                     //~| ERROR `and` is not a logical operator
         println!("both");
     }
 }
@@ -59,7 +52,6 @@ fn test_while_or() {
     let a = true;
     let b = false;
     while a or b { //~ ERROR `or` is not a logical operator
-                   //~| ERROR `or` is not a logical operator
         println!("both");
     }
 }
diff --git a/src/test/ui/did_you_mean/issue-54109-and_instead_of_ampersands.stderr b/src/test/ui/did_you_mean/issue-54109-and_instead_of_ampersands.stderr
@@ -7,133 +7,69 @@ LL |     let _ = a and b;
    = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
 
 error: `and` is not a logical operator
-  --> $DIR/issue-54109-and_instead_of_ampersands.rs:7:15
-   |
-LL |     let _ = a and b;
-   |               ^^^ help: use `&&` to perform logical conjunction
-   |
-   = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
-
-error: `and` is not a logical operator
-  --> $DIR/issue-54109-and_instead_of_ampersands.rs:10:10
-   |
-LL |     if a and b {
-   |          ^^^ help: use `&&` to perform logical conjunction
-   |
-   = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
-
-error: `and` is not a logical operator
-  --> $DIR/issue-54109-and_instead_of_ampersands.rs:10:10
+  --> $DIR/issue-54109-and_instead_of_ampersands.rs:9:10
    |
 LL |     if a and b {
    |          ^^^ help: use `&&` to perform logical conjunction
    |
    = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
 
 error: `or` is not a logical operator
-  --> $DIR/issue-54109-and_instead_of_ampersands.rs:22:15
+  --> $DIR/issue-54109-and_instead_of_ampersands.rs:20:15
    |
 LL |     let _ = a or b;
    |               ^^ help: use `||` to perform logical disjunction
    |
    = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
 
 error: `or` is not a logical operator
-  --> $DIR/issue-54109-and_instead_of_ampersands.rs:22:15
-   |
-LL |     let _ = a or b;
-   |               ^^ help: use `||` to perform logical disjunction
-   |
-   = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
-
-error: `or` is not a logical operator
-  --> $DIR/issue-54109-and_instead_of_ampersands.rs:25:10
-   |
-LL |     if a or b {
-   |          ^^ help: use `||` to perform logical disjunction
-   |
-   = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
-
-error: `or` is not a logical operator
-  --> $DIR/issue-54109-and_instead_of_ampersands.rs:25:10
+  --> $DIR/issue-54109-and_instead_of_ampersands.rs:22:10
    |
 LL |     if a or b {
    |          ^^ help: use `||` to perform logical disjunction
    |
    = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
 
 error: `and` is not a logical operator
-  --> $DIR/issue-54109-and_instead_of_ampersands.rs:34:11
+  --> $DIR/issue-54109-and_instead_of_ampersands.rs:30:11
    |
 LL |     if (a and b) {
    |           ^^^ help: use `&&` to perform logical conjunction
    |
    = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
 
-error: `and` is not a logical operator
-  --> $DIR/issue-54109-and_instead_of_ampersands.rs:34:11
-   |
-LL |     if (a and b) {
-   |           ^^^ help: use `&&` to perform logical conjunction
-   |
-   = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
-
-error: `or` is not a logical operator
-  --> $DIR/issue-54109-and_instead_of_ampersands.rs:43:11
-   |
-LL |     if (a or b) {
-   |           ^^ help: use `||` to perform logical disjunction
-   |
-   = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
-
 error: `or` is not a logical operator
-  --> $DIR/issue-54109-and_instead_of_ampersands.rs:43:11
+  --> $DIR/issue-54109-and_instead_of_ampersands.rs:38:11
    |
 LL |     if (a or b) {
    |           ^^ help: use `||` to perform logical disjunction
    |
    = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
 
 error: `and` is not a logical operator
-  --> $DIR/issue-54109-and_instead_of_ampersands.rs:52:13
+  --> $DIR/issue-54109-and_instead_of_ampersands.rs:46:13
    |
 LL |     while a and b {
    |             ^^^ help: use `&&` to perform logical conjunction
    |
    = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
 
-error: `and` is not a logical operator
-  --> $DIR/issue-54109-and_instead_of_ampersands.rs:52:13
-   |
-LL |     while a and b {
-   |             ^^^ help: use `&&` to perform logical conjunction
-   |
-   = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
-
-error: `or` is not a logical operator
-  --> $DIR/issue-54109-and_instead_of_ampersands.rs:61:13
-   |
-LL |     while a or b {
-   |             ^^ help: use `||` to perform logical disjunction
-   |
-   = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
-
 error: `or` is not a logical operator
-  --> $DIR/issue-54109-and_instead_of_ampersands.rs:61:13
+  --> $DIR/issue-54109-and_instead_of_ampersands.rs:54:13
    |
 LL |     while a or b {
    |             ^^ help: use `||` to perform logical disjunction
    |
    = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
 
 error[E0308]: mismatched types
-  --> $DIR/issue-54109-and_instead_of_ampersands.rs:15:33
+  --> $DIR/issue-54109-and_instead_of_ampersands.rs:13:33
    |
 LL |     let _recovery_witness: () = 0;
    |                            --   ^ expected `()`, found integer
    |                            |
    |                            expected due to this
 
-error: aborting due to 17 previous errors
+error: aborting due to 9 previous errors
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/did_you_mean/issue-54109-without-witness.fixed b/src/test/ui/did_you_mean/issue-54109-without-witness.fixed
@@ -11,10 +11,8 @@ fn test_and() {
     let b = false;
 
     let _ = a && b; //~ ERROR `and` is not a logical operator
-                     //~| ERROR `and` is not a logical operator
 
     if a && b { //~ ERROR `and` is not a logical operator
-                 //~| ERROR `and` is not a logical operator
         println!("both");
     }
 }
@@ -24,10 +22,8 @@ fn test_or() {
     let b = false;
 
     let _ = a || b; //~ ERROR `or` is not a logical operator
-                    //~| ERROR `or` is not a logical operator
 
     if a || b { //~ ERROR `or` is not a logical operator
-                //~| ERROR `or` is not a logical operator
         println!("both");
     }
 }
@@ -36,7 +32,6 @@ fn test_and_par() {
     let a = true;
     let b = false;
     if (a && b) {  //~ ERROR `and` is not a logical operator
-                    //~| ERROR `and` is not a logical operator
         println!("both");
     }
 }
@@ -45,7 +40,6 @@ fn test_or_par() {
     let a = true;
     let b = false;
     if (a || b) {  //~ ERROR `or` is not a logical operator
-                   //~| ERROR `or` is not a logical operator
         println!("both");
     }
 }
@@ -54,7 +48,6 @@ fn test_while_and() {
     let a = true;
     let b = false;
     while a && b {  //~ ERROR `and` is not a logical operator
-                     //~| ERROR `and` is not a logical operator
         println!("both");
     }
 }
@@ -63,7 +56,6 @@ fn test_while_or() {
     let a = true;
     let b = false;
     while a || b { //~ ERROR `or` is not a logical operator
-                   //~| ERROR `or` is not a logical operator
         println!("both");
     }
 }
diff --git a/src/test/ui/did_you_mean/issue-54109-without-witness.rs b/src/test/ui/did_you_mean/issue-54109-without-witness.rs
@@ -11,10 +11,8 @@ fn test_and() {
     let b = false;
 
     let _ = a and b; //~ ERROR `and` is not a logical operator
-                     //~| ERROR `and` is not a logical operator
 
     if a and b { //~ ERROR `and` is not a logical operator
-                 //~| ERROR `and` is not a logical operator
         println!("both");
     }
 }
@@ -24,10 +22,8 @@ fn test_or() {
     let b = false;
 
     let _ = a or b; //~ ERROR `or` is not a logical operator
-                    //~| ERROR `or` is not a logical operator
 
     if a or b { //~ ERROR `or` is not a logical operator
-                //~| ERROR `or` is not a logical operator
         println!("both");
     }
 }
@@ -36,7 +32,6 @@ fn test_and_par() {
     let a = true;
     let b = false;
     if (a and b) {  //~ ERROR `and` is not a logical operator
-                    //~| ERROR `and` is not a logical operator
         println!("both");
     }
 }
@@ -45,7 +40,6 @@ fn test_or_par() {
     let a = true;
     let b = false;
     if (a or b) {  //~ ERROR `or` is not a logical operator
-                   //~| ERROR `or` is not a logical operator
         println!("both");
     }
 }
@@ -54,7 +48,6 @@ fn test_while_and() {
     let a = true;
     let b = false;
     while a and b {  //~ ERROR `and` is not a logical operator
-                     //~| ERROR `and` is not a logical operator
         println!("both");
     }
 }
@@ -63,7 +56,6 @@ fn test_while_or() {
     let a = true;
     let b = false;
     while a or b { //~ ERROR `or` is not a logical operator
-                   //~| ERROR `or` is not a logical operator
         println!("both");
     }
 }
diff --git a/src/test/ui/did_you_mean/issue-54109-without-witness.stderr b/src/test/ui/did_you_mean/issue-54109-without-witness.stderr
diff --git a/src/test/ui/issues/issue-75599.rs b/src/test/ui/issues/issue-75599.rs

Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,7 @@ impl<'a> Parser<'a> {`
`308`	`308`	`}`
`309`	`309`
`310`	`310`	`fn should_continue_as_assoc_expr(&mut self, lhs: &Expr) -> bool {`
`311`		`- match (self.expr_is_complete(lhs), self.check_assoc_op().map(\|op\| op.node)) {`
	`311`	`+ match (self.expr_is_complete(lhs), AssocOp::from_token(&self.token)) {`
`312`	`312`	`// Semi-statement forms are odd:`
`313`	`313`	`// See https://github.com/rust-lang/rust/issues/29071`
`314`	`314`	`(true, None) => false,`
Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,8 @@ fn test_and() {`
`5`	`5`	`let b = false;`
`6`	`6`
`7`	`7`	let _ = a and b; //~ ERROR `and` is not a logical operator
`8`		- //~\| ERROR `and` is not a logical operator
`9`	`8`
`10`	`9`	if a and b { //~ ERROR `and` is not a logical operator
`11`		- //~\| ERROR `and` is not a logical operator
`12`	`10`	`println!("both");`
`13`	`11`	`}`
`14`	`12`
`@@ -20,10 +18,8 @@ fn test_or() {`
`20`	`18`	`let b = false;`
`21`	`19`
`22`	`20`	let _ = a or b; //~ ERROR `or` is not a logical operator
`23`		- //~\| ERROR `or` is not a logical operator
`24`	`21`
`25`	`22`	if a or b { //~ ERROR `or` is not a logical operator
`26`		- //~\| ERROR `or` is not a logical operator
`27`	`23`	`println!("both");`
`28`	`24`	`}`
`29`	`25`	`}`
`@@ -32,7 +28,6 @@ fn test_and_par() {`
`32`	`28`	`let a = true;`
`33`	`29`	`let b = false;`
`34`	`30`	if (a and b) { //~ ERROR `and` is not a logical operator
`35`		- //~\| ERROR `and` is not a logical operator
`36`	`31`	`println!("both");`
`37`	`32`	`}`
`38`	`33`	`}`
`@@ -41,7 +36,6 @@ fn test_or_par() {`
`41`	`36`	`let a = true;`
`42`	`37`	`let b = false;`
`43`	`38`	if (a or b) { //~ ERROR `or` is not a logical operator
`44`		- //~\| ERROR `or` is not a logical operator
`45`	`39`	`println!("both");`
`46`	`40`	`}`
`47`	`41`	`}`
`@@ -50,7 +44,6 @@ fn test_while_and() {`
`50`	`44`	`let a = true;`
`51`	`45`	`let b = false;`
`52`	`46`	while a and b { //~ ERROR `and` is not a logical operator
`53`		- //~\| ERROR `and` is not a logical operator
`54`	`47`	`println!("both");`
`55`	`48`	`}`
`56`	`49`	`}`
`@@ -59,7 +52,6 @@ fn test_while_or() {`
`59`	`52`	`let a = true;`
`60`	`53`	`let b = false;`
`61`	`54`	while a or b { //~ ERROR `or` is not a logical operator
`62`		- //~\| ERROR `or` is not a logical operator
`63`	`55`	`println!("both");`
`64`	`56`	`}`
`65`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,8 @@ fn test_and() {`
`11`	`11`	`let b = false;`
`12`	`12`
`13`	`13`	let _ = a && b; //~ ERROR `and` is not a logical operator
`14`		- //~\| ERROR `and` is not a logical operator
`15`	`14`
`16`	`15`	if a && b { //~ ERROR `and` is not a logical operator
`17`		- //~\| ERROR `and` is not a logical operator
`18`	`16`	`println!("both");`
`19`	`17`	`}`
`20`	`18`	`}`
`@@ -24,10 +22,8 @@ fn test_or() {`
`24`	`22`	`let b = false;`
`25`	`23`
`26`	`24`	let _ = a \|\| b; //~ ERROR `or` is not a logical operator
`27`		- //~\| ERROR `or` is not a logical operator
`28`	`25`
`29`	`26`	if a \|\| b { //~ ERROR `or` is not a logical operator
`30`		- //~\| ERROR `or` is not a logical operator
`31`	`27`	`println!("both");`
`32`	`28`	`}`
`33`	`29`	`}`
`@@ -36,7 +32,6 @@ fn test_and_par() {`
`36`	`32`	`let a = true;`
`37`	`33`	`let b = false;`
`38`	`34`	if (a && b) { //~ ERROR `and` is not a logical operator
`39`		- //~\| ERROR `and` is not a logical operator
`40`	`35`	`println!("both");`
`41`	`36`	`}`
`42`	`37`	`}`
`@@ -45,7 +40,6 @@ fn test_or_par() {`
`45`	`40`	`let a = true;`
`46`	`41`	`let b = false;`
`47`	`42`	if (a \|\| b) { //~ ERROR `or` is not a logical operator
`48`		- //~\| ERROR `or` is not a logical operator
`49`	`43`	`println!("both");`
`50`	`44`	`}`
`51`	`45`	`}`
`@@ -54,7 +48,6 @@ fn test_while_and() {`
`54`	`48`	`let a = true;`
`55`	`49`	`let b = false;`
`56`	`50`	while a && b { //~ ERROR `and` is not a logical operator
`57`		- //~\| ERROR `and` is not a logical operator
`58`	`51`	`println!("both");`
`59`	`52`	`}`
`60`	`53`	`}`
`@@ -63,7 +56,6 @@ fn test_while_or() {`
`63`	`56`	`let a = true;`
`64`	`57`	`let b = false;`
`65`	`58`	while a \|\| b { //~ ERROR `or` is not a logical operator
`66`		- //~\| ERROR `or` is not a logical operator
`67`	`59`	`println!("both");`
`68`	`60`	`}`
`69`	`61`	`}`