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

Zero single char names #5468

Merged
merged 3 commits into from
Apr 15, 2020
Merged

Zero single char names #5468

merged 3 commits into from
Apr 15, 2020

Conversation

marcin-serwin
Copy link
Contributor

Fixes: #4086

changelog:

  • Make the inequality strict

flip1995
flip1995 approved these changes Apr 15, 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.

Thanks! You can just wait for the rustup.

@flip1995 flip1995 added the S-waiting-on-bors Status: The marked PR was approved and is only waiting bors label Apr 15, 2020
flip1995
flip1995 requested changes Apr 15, 2020
View reviewed changes
tests/ui/many_single_char_names.rs Outdated
@@ -1,6 +1,7 @@
#[warn(clippy::many_single_char_names)]

fn bla() {
let x: i32;
Copy link
Member

Choose a reason for hiding this comment

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

I'd rather lower the default threshold by one, than modifying the test.

rust-clippy/clippy_lints/src/utils/conf.rs

Lines 137 to 138 in c496f4e

/// Lint: MANY_SINGLE_CHAR_NAMES. The maximum number of single char bindings a scope may have
(single_char_binding_names_threshold, "single_char_binding_names_threshold": u64, 5),

(the documentation of this config param is now more correct than before 😄)

@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-waiting-on-bors Status: The marked PR was approved and is only waiting bors labels Apr 15, 2020
@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 Apr 15, 2020
@flip1995
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Apr 15, 2020

📌 Commit ce372c1 has been approved by flip1995

@bors
Copy link
Contributor

bors commented Apr 15, 2020

🌲 The tree is currently closed for pull requests below priority 1, this pull request will be tested once the tree is reopened

@flip1995 flip1995 mentioned this pull request Apr 15, 2020
Merged
bors added a commit that referenced this pull request Apr 15, 2020
@bors
Auto merge of #5470 - flip1995:rollup-cvkuiza, r=flip1995
6651c1b 
Rollup of 5 pull requests

Successful merges:

 - #5226 (Add lint for explicit deref and deref_mut method calls)
 - #5248 (Add lint on large non scalar const)
 - #5430 (Disallow bit-shifting in integer_arithmetic)
 - #5466 (large_enum_variant: Report sizes of variants)
 - #5468 (Zero single char names)

Failed merges:

r? @ghost

changelog: rollup
@bors bors merged commit 19183a6 into rust-lang:master Apr 15, 2020
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.

many_single_char_names incorrectly triggered if 'single-char-binding-names-threshold = 0'
3 participants
@marcin-serwin @flip1995 @bors