Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Lint on redundant trailing semicolon after item #79812

Merged
merged 4 commits into from
Dec 30, 2020
Merged

Lint on redundant trailing semicolon after item #79812

merged 4 commits into from
Dec 30, 2020

Conversation

Aaron1011
Copy link
Member

We now lint on code like this:

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

Previously, this caused warnings in Cargo, so it was disabled.

@rust-highfive
Copy link
Collaborator

r? @eddyb

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 7, 2020
@oli-obk
Copy link
Contributor

oli-obk commented Dec 28, 2020

r? @oli-obk

@rust-highfive rust-highfive assigned oli-obk and unassigned eddyb Dec 28, 2020
@oli-obk
Copy link
Contributor

oli-obk commented Dec 28, 2020

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Dec 28, 2020

📌 Commit fdc336c has been approved by oli-obk

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 28, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Dec 28, 2020
@Dylan-DPC
Rollup merge of rust-lang#79812 - Aaron1011:lint-item-trailing-semi, …
761400f 
…r=oli-obk

Lint on redundant trailing semicolon after item

We now lint on code like this:

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

Previously, this caused warnings in Cargo, so it was disabled.
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Dec 28, 2020
Closed
@Dylan-DPC-zz
Copy link

failed in rollup

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 28, 2020
@Aaron1011
Copy link
Member Author

@oli-obk: The failure was caused by Rustdoc including an unnecessary semicolon in some of the code that it generates for doctests. This should now be ready to merge.

@oli-obk
Copy link
Contributor

oli-obk commented Dec 28, 2020

Oh, heh, makes sense

@bors r+

@bors
Copy link
Contributor

bors commented Dec 28, 2020

📌 Commit 87c97d3 has been approved by oli-obk

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 28, 2020
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Dec 29, 2020
@GuillaumeGomez
Rollup merge of rust-lang#79812 - Aaron1011:lint-item-trailing-semi, …
9e4975d 
…r=oli-obk

Lint on redundant trailing semicolon after item

We now lint on code like this:

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

Previously, this caused warnings in Cargo, so it was disabled.
@GuillaumeGomez GuillaumeGomez mentioned this pull request Dec 29, 2020
Closed
@Dylan-DPC-zz
Copy link

failed in rollup

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 29, 2020
@Aaron1011
Lint on redundant trailing semicolon after item
c857cbe 
We now lint on code like this:

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

Previously, this caused warnings in Cargo, so it was disabled.
@Aaron1011
Remove trailing semicolon in librustdoc
21ed141
@Aaron1011
Remove unnecessary semicolon from Rustdoc-generated code
4c4700d
@Aaron1011
Copy link
Member Author

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Dec 29, 2020

📌 Commit 6bef37c has been approved by oli-obk

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 29, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Dec 30, 2020
@Dylan-DPC
Rollup merge of rust-lang#79812 - Aaron1011:lint-item-trailing-semi, …
b6e565f 
…r=oli-obk

Lint on redundant trailing semicolon after item

We now lint on code like this:

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

Previously, this caused warnings in Cargo, so it was disabled.
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Dec 30, 2020
Closed
@JohnTitor JohnTitor mentioned this pull request Dec 30, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 30, 2020
@bors
Auto merge of rust-lang#80503 - JohnTitor:rollup-b26vglu, r=JohnTitor
d107a87 
Rollup of 13 pull requests

Successful merges:

 - rust-lang#79812 (Lint on redundant trailing semicolon after item)
 - rust-lang#80348 (remove redundant clones (clippy::redundant_clone))
 - rust-lang#80358 (Edit rustc_span documentation)
 - rust-lang#80457 (Add missing commas to `rustc_ast_pretty::pp` docs)
 - rust-lang#80461 (Add llvm-libunwind change to bootstrap CHANGELOG)
 - rust-lang#80464 (Use Option::map_or instead of open coding it)
 - rust-lang#80465 (Fix typo in ffi-pure.md)
 - rust-lang#80467 (More uses of the matches! macro)
 - rust-lang#80469 (Fix small typo in time comment)
 - rust-lang#80472 (Use sans-serif font for the "all items" page links)
 - rust-lang#80477 (Make forget intrinsic safe)
 - rust-lang#80482 (don't clone copy types)
 - rust-lang#80487 (don't redundantly repeat field names)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 3fe4236 into rust-lang:master Dec 30, 2020
@rustbot rustbot added this to the 1.51.0 milestone Dec 30, 2020
@ehuss ehuss mentioned this pull request Dec 31, 2020
Merged
bors added a commit to rust-lang/cargo that referenced this pull request Dec 31, 2020
@bors
Auto merge of #9033 - ehuss:redundant_semicolons, r=Eh2406
0cf6d24 
Fix redundant semicolon.

Lint introduced by rust-lang/rust#79812.
@camelid camelid mentioned this pull request Jan 6, 2021
Closed
ehuss added a commit to ehuss/rust that referenced this pull request Jan 25, 2021
@ehuss
tidy: Remove unnecessary trailing semicolon.
6f22f51 
This will cause a failure due to the warning after the next beta branch
as rust-lang#79812 will hit beta.
zaharidichev pushed a commit to zaharidichev/rust that referenced this pull request Mar 15, 2021
@ehuss @zaharidichev
tidy: Remove unnecessary trailing semicolon.
96148d0 
This will cause a failure due to the warning after the next beta branch
as rust-lang#79812 will hit beta.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@oli-obk oli-obk

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.51.0
Development

Successfully merging this pull request may close these issues.
7 participants
@Aaron1011 @rust-highfive @oli-obk @bors @Dylan-DPC-zz @eddyb @rustbot