Skip to content

Rollup of 4 pull requests#3686

Closed
flip1995 wants to merge 20 commits into
rust-lang:masterfrom
flip1995:rollup
Closed

Rollup of 4 pull requests#3686
flip1995 wants to merge 20 commits into
rust-lang:masterfrom
flip1995:rollup

Conversation

@flip1995

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost

A.A.Abroskin and others added 20 commits January 7, 2019 13:30
Co-Authored-By: daxpedda <1645124+daxpedda@users.noreply.github.com>
Fix automatic suggestion on `use_self`.

In an example like this:
```rust
impl Example {
    fn fun_1() { }
    fn fun_2() {
        Example::fun_1();
    }
}
```
Clippy tries to replace `Example::fun_1` with `Self`, loosing `::fun_1` in the process, it should rather try to replace `Example` with `Self`.

**Question**
- There may be other paths that need the same treatment, but I'm not sure I understand them fully:
  - https://github.com/rust-lang/rust-clippy/blob/e648adf0866a1cea7db6ce2d33ea86e442f25377/clippy_lints/src/use_self.rs#L94-L96
  - https://github.com/rust-lang/rust-clippy/blob/e648adf0866a1cea7db6ce2d33ea86e442f25377/clippy_lints/src/use_self.rs#L225-L229
…lip1995

Add assert(true) and assert(false) lints

This PR add two lints on assert!(true) and assert!(false).
rust-lang#3575
…ns, r=oli-obk

"make_return" and "blockify" convenience methods, fixes rust-lang#3683

…ed them in "needless_bool".
@flip1995

Copy link
Copy Markdown
Member Author

@bors r+ p=10

@bors

bors commented Jan 22, 2019

Copy link
Copy Markdown
Contributor

📌 Commit bd6e510 has been approved by flip1995

@bors

bors commented Jan 22, 2019

Copy link
Copy Markdown
Contributor

⌛ Testing commit bd6e510 with merge 09397d9...

bors added a commit that referenced this pull request Jan 22, 2019
Rollup of 4 pull requests

Successful merges:

 - #3582 (Add assert(true) and assert(false) lints)
 - #3679 (Fix automatic suggestion on `use_self`.)
 - #3684 ("make_return" and "blockify" convenience methods, fixes #3683)
 - #3685 (Rustup)

Failed merges:

r? @ghost
@bors

bors commented Jan 22, 2019

Copy link
Copy Markdown
Contributor

💔 Test failed - checks-travis

@flip1995 flip1995 closed this Jan 22, 2019
@flip1995 flip1995 deleted the rollup branch January 29, 2019 11:41
@flip1995

Copy link
Copy Markdown
Member Author

@bors r-

@flip1995

Copy link
Copy Markdown
Member Author

@bors r- p=0

@flip1995

Copy link
Copy Markdown
Member Author

@bors clean

@flip1995

Copy link
Copy Markdown
Member Author

@bors ping

@bors

bors commented Feb 12, 2019

Copy link
Copy Markdown
Contributor

😪 I'm awake I'm awake

@flip1995

Copy link
Copy Markdown
Member Author

@bors force clean

@flip1995

Copy link
Copy Markdown
Member Author

Hmm, this PR is stuck in the queue... I can't figure out how to get it out of the queue 🤔

@phansch

phansch commented Feb 12, 2019

Copy link
Copy Markdown
Contributor

Maybe reopening and closing could work?

@Manishearth

Copy link
Copy Markdown
Member

Can't, the branch changed while it was closed, so it's stuck

@Manishearth

Copy link
Copy Markdown
Member

I'm going to synchronize

@Manishearth

Copy link
Copy Markdown
Member

It's fixed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Sugg structured snippet modifications wishlist

6 participants