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

Rename lint identity_conversion to useless_conversion #5568

Merged
merged 1 commit into from
May 17, 2020
Merged

Rename lint identity_conversion to useless_conversion #5568

merged 1 commit into from
May 17, 2020

Conversation

ThibsG
Copy link
Contributor

@ThibsG ThibsG commented May 4, 2020

Lint name identity_conversion was misleading, so this PR renames it to useless_conversion.

As decision has not really came up in the issue comments, this PR will probably need discussion.

fixes #3106

changelog: Rename lint identity_conversion to useless_conversion

flip1995
flip1995 requested changes May 4, 2020
View reviewed changes
Copy link
Member

@flip1995 flip1995 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For renaming lints the lint has to be store.register_renamed(..). Otherwise approved.

@flip1995 flip1995 added the S-needs-discussion Status: Needs further discussion before merging or work can be started label May 4, 2020
@ThibsG ThibsG force-pushed the RenameIdentityConversionLint branch from 73185dd to 5543796 Compare May 4, 2020 20:55
@ThibsG ThibsG force-pushed the RenameIdentityConversionLint branch 3 times, most recently from dce57d2 to 344ecdf Compare May 15, 2020 16:28
@ThibsG ThibsG requested a review from flip1995 May 15, 2020 16:49
@flip1995
Copy link
Member

@bors r+

Thanks!

@bors
Copy link
Contributor

bors commented May 16, 2020

📌 Commit 344ecdf has been approved by flip1995

@bors
Copy link
Contributor

bors commented May 16, 2020

⌛ Testing commit 344ecdf with merge 5fa247a...

bors added a commit that referenced this pull request May 16, 2020
@bors
Auto merge of #5568 - ThibsG:RenameIdentityConversionLint, r=flip1995
5fa247a 
Rename lint `identity_conversion` to `useless_conversion`

Lint name `identity_conversion` was misleading, so this PR renames it to `useless_conversion`.

As decision has not really came up in the issue comments, this PR will probably need discussion.

fixes #3106

changelog: Rename lint `identity_conversion` to `useless_conversion`
@flip1995
Copy link
Member

@bors retry (prio the mass renaming PR)

@bors
Copy link
Contributor

bors commented May 16, 2020

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout RenameIdentityConversionLint (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self RenameIdentityConversionLint --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message 
Auto-merging tests/ui/useless_conversion.stderr
Auto-merging tests/ui/useless_conversion.rs
Auto-merging tests/ui/useless_conversion.fixed
Auto-merging src/lintlist/mod.rs
Auto-merging clippy_lints/src/useless_conversion.rs
Auto-merging clippy_lints/src/lib.rs
CONFLICT (content): Merge conflict in clippy_lints/src/lib.rs
Auto-merging CHANGELOG.md
Automatic merge failed; fix conflicts and then commit the result.

@bors
Copy link
Contributor

bors commented May 16, 2020

☔ The latest upstream changes (presumably #5563) made this pull request unmergeable. Please resolve the merge conflicts.

@flip1995 flip1995 added S-waiting-on-author Status: This is awaiting some action from the author. (Use `@rustbot ready` to update this status) and removed S-needs-discussion Status: Needs further discussion before merging or work can be started labels May 16, 2020
@flip1995
Copy link
Member

You can ping me after rebase to re-approve. 👍

@ThibsG ThibsG force-pushed the RenameIdentityConversionLint branch from 344ecdf to e55b920 Compare May 16, 2020 20:51
@ThibsG ThibsG requested a review from flip1995 May 16, 2020 20:59
@flip1995
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented May 16, 2020

📌 Commit e55b920 has been approved by flip1995

@bors
Copy link
Contributor

bors commented May 16, 2020

⌛ Testing commit e55b920 with merge 9e839b5...

bors added a commit that referenced this pull request May 16, 2020
@bors
Auto merge of #5568 - ThibsG:RenameIdentityConversionLint, r=flip1995
9e839b5 
Rename lint `identity_conversion` to `useless_conversion`

Lint name `identity_conversion` was misleading, so this PR renames it to `useless_conversion`.

As decision has not really came up in the issue comments, this PR will probably need discussion.

fixes #3106

changelog: Rename lint `identity_conversion` to `useless_conversion`
@flip1995 flip1995 added S-waiting-on-bors Status: The marked PR was approved and is only waiting bors and removed S-waiting-on-author Status: This is awaiting some action from the author. (Use `@rustbot ready` to update this status) labels May 16, 2020
@bors
Copy link
Contributor

bors commented May 16, 2020

💔 Test failed - checks-action_test

flip1995
flip1995 approved these changes May 16, 2020
View reviewed changes
Copy link
Member

@flip1995 flip1995 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't worry about the test failure. This is already fixed in #5608

@phansch
Copy link
Member

phansch commented May 17, 2020

@bors retry

@bors
Copy link
Contributor

bors commented May 17, 2020

⌛ Testing commit e55b920 with merge 5eff742...

bors added a commit that referenced this pull request May 17, 2020
@bors
Auto merge of #5568 - ThibsG:RenameIdentityConversionLint, r=flip1995
5eff742 
Rename lint `identity_conversion` to `useless_conversion`

Lint name `identity_conversion` was misleading, so this PR renames it to `useless_conversion`.

As decision has not really came up in the issue comments, this PR will probably need discussion.

fixes #3106

changelog: Rename lint `identity_conversion` to `useless_conversion`
@bors
Copy link
Contributor

bors commented May 17, 2020

💔 Test failed - checks-action_remark_test

@phansch
Copy link
Member

phansch commented May 17, 2020

@bors retry (not sure what went wrong with the remark build)

@bors
Copy link
Contributor

bors commented May 17, 2020

⌛ Testing commit e55b920 with merge e214ea8...

@bors
Copy link
Contributor

bors commented May 17, 2020

☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Approved by: flip1995
Pushing e214ea8 to master...

@bors bors merged commit e214ea8 into rust-lang:master May 17, 2020
@ThibsG ThibsG deleted the RenameIdentityConversionLint branch May 17, 2020 17:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flip1995 flip1995 flip1995 approved these changes

Assignees
No one assigned
Labels
S-waiting-on-bors Status: The marked PR was approved and is only waiting bors
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

lint identity_conversion name is misleading
4 participants
@ThibsG @flip1995 @bors @phansch