Skip to content

Commit

Permalink
Do not trigger unused_{braces,parens} lints with yield
Browse files Browse the repository at this point in the history
  • Loading branch information
JohnTitor committed Aug 1, 2020
1 parent 22e6099 commit 86d0b9c
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/librustc_lint/unused.rs
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,7 @@ trait UnusedDelimLint {
ExprKind::Ret(_) | ExprKind::Break(..) => true,
_ => parser::contains_exterior_struct_lit(&inner),
})
|| if let ExprKind::Yield(..) = inner.kind { true } else { false }
}

fn emit_unused_delims_expr(
Expand Down
17 changes: 17 additions & 0 deletions src/test/ui/lint/issue-74883-unused-paren-baren-yield.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#![feature(generator_trait)]
#![feature(generators)]
#![deny(unused_braces, unused_parens)]

use std::ops::Generator;
use std::pin::Pin;

fn main() {
let mut x = |_| {
while let Some(_) = (yield) {}
while let Some(_) = {yield} {}
// Only warn these cases
while let Some(_) = ({yield}) {} //~ ERROR: unnecessary parentheses
while let Some(_) = {(yield)} {} //~ ERROR: unnecessary braces
};
let _ = Pin::new(&mut x).resume(Some(5));
}
26 changes: 26 additions & 0 deletions src/test/ui/lint/issue-74883-unused-paren-baren-yield.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
error: unnecessary parentheses around `let` scrutinee expression
--> $DIR/issue-74883-unused-paren-baren-yield.rs:13:29
|
LL | while let Some(_) = ({yield}) {}
| ^^^^^^^^^ help: remove these parentheses
|
note: the lint level is defined here
--> $DIR/issue-74883-unused-paren-baren-yield.rs:3:24
|
LL | #![deny(unused_braces, unused_parens)]
| ^^^^^^^^^^^^^

error: unnecessary braces around `let` scrutinee expression
--> $DIR/issue-74883-unused-paren-baren-yield.rs:14:29
|
LL | while let Some(_) = {(yield)} {}
| ^^^^^^^^^ help: remove these braces
|
note: the lint level is defined here
--> $DIR/issue-74883-unused-paren-baren-yield.rs:3:9
|
LL | #![deny(unused_braces, unused_parens)]
| ^^^^^^^^^^^^^

error: aborting due to 2 previous errors

0 comments on commit 86d0b9c

Please sign in to comment.