Skip to content

Commit

Permalink
Lint on redundant trailing semicolon after item
Browse files Browse the repository at this point in the history
We now lint on code like this:

```rust
fn main() {
    fn foo() {};
    struct Bar {};
}
```

Previously, this caused warnings in Cargo, so it was disabled.
  • Loading branch information
Aaron1011 committed Dec 7, 2020
1 parent 3d6705a commit 6ada445
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 23 deletions.
20 changes: 3 additions & 17 deletions compiler/rustc_lint/src/redundant_semicolon.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,40 +28,26 @@ declare_lint_pass!(RedundantSemicolons => [REDUNDANT_SEMICOLONS]);

impl EarlyLintPass for RedundantSemicolons {
fn check_block(&mut self, cx: &EarlyContext<'_>, block: &Block) {
let mut after_item_stmt = false;
let mut seq = None;
for stmt in block.stmts.iter() {
match (&stmt.kind, &mut seq) {
(StmtKind::Empty, None) => seq = Some((stmt.span, false)),
(StmtKind::Empty, Some(seq)) => *seq = (seq.0.to(stmt.span), true),
(_, seq) => {
maybe_lint_redundant_semis(cx, seq, after_item_stmt);
after_item_stmt = matches!(stmt.kind, StmtKind::Item(_));
}
(_, seq) => maybe_lint_redundant_semis(cx, seq),
}
}
maybe_lint_redundant_semis(cx, &mut seq, after_item_stmt);
maybe_lint_redundant_semis(cx, &mut seq);
}
}

fn maybe_lint_redundant_semis(
cx: &EarlyContext<'_>,
seq: &mut Option<(Span, bool)>,
after_item_stmt: bool,
) {
fn maybe_lint_redundant_semis(cx: &EarlyContext<'_>, seq: &mut Option<(Span, bool)>) {
if let Some((span, multiple)) = seq.take() {
// FIXME: Find a better way of ignoring the trailing
// semicolon from macro expansion
if span == rustc_span::DUMMY_SP {
return;
}

// FIXME: Lint on semicolons after item statements
// once doing so doesn't break bootstrapping
if after_item_stmt {
return;
}

cx.struct_span_lint(REDUNDANT_SEMICOLONS, span, |lint| {
let (msg, rem) = if multiple {
("unnecessary trailing semicolons", "remove these semicolons")
Expand Down
8 changes: 2 additions & 6 deletions src/test/ui/lint/redundant-semicolon/item-stmt-semi.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
// check-pass
// This test should stop compiling
// we decide to enable this lint for item statements.

#![deny(redundant_semicolons)]

fn main() {
fn inner() {};
struct Bar {};
fn inner() {}; //~ ERROR unnecessary
struct Bar {}; //~ ERROR unnecessary
}
20 changes: 20 additions & 0 deletions src/test/ui/lint/redundant-semicolon/item-stmt-semi.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
error: unnecessary trailing semicolon
--> $DIR/item-stmt-semi.rs:4:18
|
LL | fn inner() {};
| ^ help: remove this semicolon
|
note: the lint level is defined here
--> $DIR/item-stmt-semi.rs:1:9
|
LL | #![deny(redundant_semicolons)]
| ^^^^^^^^^^^^^^^^^^^^

error: unnecessary trailing semicolon
--> $DIR/item-stmt-semi.rs:5:18
|
LL | struct Bar {};
| ^ help: remove this semicolon

error: aborting due to 2 previous errors

0 comments on commit 6ada445

Please sign in to comment.