Skip to content

Update Clippy #75405

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.

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

Merged
merged 156 commits into from
Aug 12, 2020
Merged
Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
156 commits
Select commit Hold shift + click to select a range
442c8ae
Fix FP for `suspicious_arithmetic_impl` from `suspicious_trait_impl` …
ThibsG Jul 18, 2020
51f2a6f
Add documentation for basic Clippy hacking
flip1995 Jul 22, 2020
17903f6
Mention lint naming guidelines earlier
flip1995 Jul 24, 2020
3a4cc9f
Address review comments
flip1995 Jul 24, 2020
b375f1d
Add suggestion for `iter_skip_next` lint
dima74 Jul 25, 2020
d164ab6
Merge commit 'da5a6fb1b65ec6581a67e942a3850f6bc15a552c' into clippyup
flip1995 Jul 26, 2020
f5d429c
Auto merge of #5820 - ThibsG:FixSuspiciousArithmeticImpl, r=flip1995
bors Jul 26, 2020
5a64496
run cargo dev new_lint
Ryan1729 Jul 27, 2020
fc20ee6
move derive_ord_xor_partial_ord into derive mod so we can reuse deriv…
Ryan1729 Jul 27, 2020
0722991
add test for derive_ord_xor_partial_ord based on test for derive_hash…
Ryan1729 Jul 27, 2020
068acbd
initial implementation based on code for `derive_hash_xor_partial_eq`…
Ryan1729 Jul 27, 2020
a8d6eda
use get_trait_def_id to check for Ord trait
Ryan1729 Jul 27, 2020
6c3e459
update reference since we see the expected four errors
Ryan1729 Jul 27, 2020
7dc9748
remove is_local check since getting the def_id directly makes it unne…
Ryan1729 Jul 27, 2020
431924c
add description for derive_ord_xor_partial_ord
Ryan1729 Jul 27, 2020
668b747
run cargo dev fmt and fix overly long line
Ryan1729 Jul 27, 2020
ca03f2b
s/pord/partial_ord/ to fix dogfood failure
Ryan1729 Jul 27, 2020
12a6eee
fill in lint description for DERIVE_ORD_XOR_PARTIAL_ORD
Ryan1729 Jul 27, 2020
94b10a6
run cargo dev update_lints
Ryan1729 Jul 27, 2020
3a9ccff
`chmod` 644 `clippy_lints/src/utils/ast_utils.rs`
giraffate Jul 27, 2020
d3e9db7
Auto merge of #5850 - giraffate:chmod_utils_ats_utils, r=flip1995
bors Jul 27, 2020
dfa1af2
clippy
lcnr Jun 19, 2020
8878708
this might be unqualified, but at least it's now quantified
lcnr Jun 24, 2020
6ce37fa
introduce PredicateAtom
lcnr Jul 8, 2020
133e1d6
clippy
lcnr Jul 27, 2020
94c50bc
Lint duplicate methods of trait bounds
wiomoc Jul 28, 2020
04f4471
Merge remote-tracking branch 'upstream/master' into rustup
flip1995 Jul 29, 2020
61eab6e
Auto merge of #5853 - flip1995:rustup, r=flip1995
bors Jul 29, 2020
73764ab
Auto merge of #5840 - flip1995:basics, r=phansch
bors Jul 29, 2020
2e0f8b6
Auto merge of #5843 - dima74:iter_skip_next.add-suggestion, r=phansch
bors Jul 29, 2020
2b7fde6
typo fix
wiomoc Jul 29, 2020
98f3c79
Update clippy ui test.
oli-obk Jul 29, 2020
a427c99
Handle mapping to Option in `map_flatten` lint
dima74 Jul 25, 2020
d4ba561
Review fixes
dima74 Jul 30, 2020
aa3d9ca
Rename HAIR to THIR (Typed HIR).
Lezzz Jul 21, 2020
cb00cdf
Remove old Symbol reexport
phansch Aug 2, 2020
bb6e857
fmt
phansch Aug 2, 2020
24a6130
fix typos
Aug 2, 2020
e336fe8
manual_async_fn: take input lifetimes into account
ebroto Aug 2, 2020
05bb6e6
Create test for wanted behavior
JarredAllen Jul 20, 2020
3ee6137
Write the lint and write tests
JarredAllen Jul 23, 2020
3657c92
Check for other things which can be used indirectly
JarredAllen Jul 23, 2020
c86f410
Split indirect collects into their own test case
JarredAllen Jul 23, 2020
a849483
Fix formatting and dogfood fallout
JarredAllen Jul 23, 2020
bb2c14e
Fix a bug causing it to be too trigger-happy
JarredAllen Jul 23, 2020
5e10b03
Implement review suggestions
JarredAllen Aug 3, 2020
e521c67
early return on empty parameters/where clause
wiomoc Aug 3, 2020
0e44ed5
Fix ui-cargo tests in CI
flip1995 Aug 3, 2020
bbbc973
Auto merge of #5864 - rust-lang:ci_debug, r=Manishearth
bors Aug 3, 2020
25abd7a
Create stable_sort_primitive lint
JarredAllen Jul 9, 2020
e967710
try_err: Consider Try impl for Poll when generating suggestions
tmiasko Aug 2, 2020
0ccdf29
Remove obsolete known problems unnecessary_fold
camsteffen Aug 3, 2020
52a9c15
rustc_ast: `(Nested)MetaItem::check_name` -> `has_name`
petrochenkov Aug 2, 2020
1968aed
Auto merge of #5867 - flip1995:rustup, r=flip1995
bors Aug 4, 2020
ca2a25d
Rollup merge of #5837 - JarredAllen:needless_collect, r=phansch
flip1995 Aug 4, 2020
378ba2e
Rollup merge of #5846 - dima74:map_flatten.map_to_option, r=flip1995
flip1995 Aug 4, 2020
888067c
Rollup merge of #5848 - Ryan1729:add-derive_ord_xor_partial_ord-lint,…
flip1995 Aug 4, 2020
84455b2
Rollup merge of #5852 - wiomoc:feature/lint-duplicate-trait, r=Manish…
flip1995 Aug 4, 2020
fb7ad95
Rollup merge of #5856 - phansch:remove-symbol-reexport, r=flip1995
flip1995 Aug 4, 2020
8012178
Auto merge of #5868 - flip1995:rollup-5g8vft5, r=flip1995
bors Aug 4, 2020
2ceb8c6
Auto merge of #5865 - camsteffen:unnecessary-fold-known-probs, r=Mani…
bors Aug 4, 2020
542740c
Run cargo dev fmt
JarredAllen Aug 5, 2020
3d7e3fd
Auto merge of #5857 - tmiasko:try-err-poll, r=matthiaskrgr
bors Aug 5, 2020
1e8ada3
Add lint `same_item_push`
giraffate Jul 18, 2020
161f475
Add test case for `same_item_push`
giraffate Jul 19, 2020
2beb909
Rename TypeckTables to TypeckResults
giraffate Jul 20, 2020
1543e11
cargo dev update_lints
giraffate Jul 20, 2020
14a4e3b
Fix a lint message
giraffate Jul 20, 2020
b7ceb4d
rustfmt
giraffate Jul 20, 2020
228f668
Use `mutated_variables`
giraffate Jul 22, 2020
e48685e
Just check if it contains `_` in `for pat`
giraffate Jul 22, 2020
610d4e3
rustfmt
giraffate Aug 5, 2020
2eab060
Auto merge of #5859 - ebroto:5765_manual_async_fn_fp, r=yaahc
bors Aug 5, 2020
2d4c337
Auto merge of #5809 - JarredAllen:stable_sort_primitive, r=Manishearth
bors Aug 5, 2020
50a86d4
enable #[allow(clippy::unsafe_derive_deserialize)]
ebroto Aug 5, 2020
0abc483
Lint .min(x).max(y) with x < y
wiomoc Aug 6, 2020
5e84b8c
run cargo dev new_lint then move transmutes_expressible_as_ptr_casts …
Ryan1729 Aug 3, 2020
069f851
initial compiling version of TRANSMUTES_EXPRESSIBLE_AS_PTR_CASTS
Ryan1729 Aug 3, 2020
46ef4e8
write currently failing test for transmutes_expressible_as_ptr_casts
Ryan1729 Aug 3, 2020
34d3a00
accidentally cause an ICE by putting the TRANSMUTES_EXPRESSIBLE_AS_PT…
Ryan1729 Aug 3, 2020
de05212
try putting the can_be_expressed_as_pointer_cast at the top and find …
Ryan1729 Aug 3, 2020
ccc4747
get the expected number of errors by acknowledging that other lints a…
Ryan1729 Aug 3, 2020
d38766e
address some review comments
Ryan1729 Aug 4, 2020
19f36bc
add description to assert
Ryan1729 Aug 4, 2020
94340d6
add documentation to functions that call `do_check` and add a test ag…
Ryan1729 Aug 6, 2020
ded2d6c
add extra error message to the expected stderr for transmutes_express…
Ryan1729 Aug 6, 2020
8997c55
change filter to assert, and update comments
Ryan1729 Aug 6, 2020
b0c8c7a
add newline to transmutes_expressible_as_ptr_casts.rs
Ryan1729 Aug 6, 2020
0d2a378
run clippy_dev update_lints
Ryan1729 Aug 6, 2020
42f3d39
run clippy_dev fmt
Ryan1729 Aug 6, 2020
49c7e39
Apply suggestions from code review
Ryan1729 Aug 6, 2020
d642c3b
Fix clippy
petrochenkov Jul 22, 2020
a285b58
Add some comments for magic numbers + Add tests
petrochenkov Aug 4, 2020
fe9ad57
copy over *.fixed file
Ryan1729 Aug 7, 2020
a7fa264
Auto merge of #74821 - oli-obk:const_eval_read_uninit_fast_path, r=we…
bors Aug 7, 2020
e0a4988
Lint against `Self` as an arbitrary self type
wiomoc Aug 4, 2020
737f62c
fix doc
wiomoc Aug 4, 2020
d635b76
adopt comments from review
wiomoc Aug 5, 2020
c87d999
fix ui tests
wiomoc Aug 5, 2020
e03f73e
fix nits
wiomoc Aug 5, 2020
bfe610c
ignore mutable self reference parameters
wiomoc Aug 7, 2020
87e7409
check impl Ord / is_float
wiomoc Aug 7, 2020
bd71b01
Make the docs clearer for new contributors
camelid Aug 7, 2020
01bba2c
Eliminate the `SessionGlobals` from `librustc_ast`.
nnethercote Jul 30, 2020
888657e
Fix ICE in `loops` module
ebroto Aug 8, 2020
fd87cdb
Run fmt
flip1995 Aug 8, 2020
3899d60
Auto merge of #5878 - flip1995:rustup, r=flip1995
bors Aug 8, 2020
70c46de
Auto merge of #5877 - ebroto:5872_loops_ice, r=Manishearth
bors Aug 8, 2020
a1ca125
update stderr for transmutes_expressible_as_ptr_casts
Ryan1729 Aug 9, 2020
84db238
add a test example of where transmutes_expressible_as_ptr_casts shoul…
Ryan1729 Aug 9, 2020
bc8d32d
fix unary minus on usize and unused variable errors in .fixed file
Ryan1729 Aug 9, 2020
873e5f5
add allow unused_unsafe and allow dead_code
Ryan1729 Aug 9, 2020
6af9693
Prevent compile parts of rustc when using `cargo dev ra-setup`
dima74 Aug 9, 2020
7228368
Auto merge of #5882 - dima74:ra_setup-prevent-compile-rustc, r=Manish…
bors Aug 9, 2020
9da5b6d
Rollup merge of #5825 - giraffate:same_item_push, r=Manishearth
flip1995 Aug 10, 2020
8ee57ee
Rollup merge of #5869 - wiomoc:feature/implicit-self, r=ebroto,flip1995
flip1995 Aug 10, 2020
08ab29b
Rollup merge of #5870 - ebroto:5789_allow_unsafe_derive_deserialize, …
flip1995 Aug 10, 2020
ee8db50
Rollup merge of #5871 - wiomoc:feature/methodcall-minmax, r=flip1995
flip1995 Aug 10, 2020
7f6897c
Rollup merge of #5874 - camelid:patch-1, r=flip1995
flip1995 Aug 10, 2020
c576bed
Auto merge of #5883 - flip1995:rollup-x9mftxe, r=flip1995
bors Aug 10, 2020
82c816e
Fix CHANGELOG's commit range links
robojumper Aug 10, 2020
4113453
Auto merge of #5887 - robojumper:patch-1, r=flip1995
bors Aug 10, 2020
e57aafe
too-many-lines: make lint adhere to lint message convention
matthiaskrgr Jul 23, 2020
0876f17
bool-comparison: make lint adhere to lint message convention
matthiaskrgr Jul 23, 2020
fd379a8
builtin-type-shadow: make lint adhere to lint message convention
matthiaskrgr Jul 23, 2020
40416c0
naive_bytecount: make lint adhere to lint message convention
matthiaskrgr Jul 23, 2020
5d66bd7
Avoid or_fun_call for const_fn with no args
ebroto Aug 10, 2020
9b7ab1d
checked-conversions: make lint adhere to lint message convention
matthiaskrgr Jul 23, 2020
8679dd3
unnecessary_unwrap, panicking_unwrap: make lints adhere to lint messa…
matthiaskrgr Jul 23, 2020
3d592b5
cmp_null: make lint adhere to lint message convention
matthiaskrgr Jul 23, 2020
6b0a6a7
default-trait-access: make lint adhere to lint message convention
matthiaskrgr Jul 23, 2020
ba7a01a
double-comparisons: make lint adhere to lint message convention
matthiaskrgr Jul 23, 2020
590b91d
double-parens: make lint adhere to lint message convention and do min…
matthiaskrgr Jul 23, 2020
0db5cb1
drop_bounds: make lint adhere to lint message convention
matthiaskrgr Jul 23, 2020
2792260
empty-liner-after-outer-attr: make lint adhere to lint message conven…
matthiaskrgr Jul 23, 2020
4418ff1
unneeded-field-pattern: make lint adhere to lint message convention
matthiaskrgr Jul 23, 2020
b36a6c9
ref_in_deref: make lint adhere to lint message convention
matthiaskrgr Jul 23, 2020
7954c22
unknown: make lint adhere to lint message convention
matthiaskrgr Jul 23, 2020
fe37ddb
suspicious-arithmetic-impl: make lint adhere to lint message convention
matthiaskrgr Jul 23, 2020
5d69ca5
also change "deprecated-attribute" message
matthiaskrgr Jul 23, 2020
3e1e0c9
redundant-static-lifetimes: make lint adhere to lint message convention
matthiaskrgr Jul 23, 2020
81f77a4
range-zip-with-len: make lint adhere to lint message convention
matthiaskrgr Jul 23, 2020
9178363
path-buf-push-overwrite: make lint adhere to lint message convention
matthiaskrgr Jul 23, 2020
e519bb3
overflow-check-conditional: make lint adhere to lint message convention
matthiaskrgr Jul 23, 2020
178da9b
neg-multiply: make lint adhere to lint message convention
matthiaskrgr Jul 23, 2020
dabf989
neg-cmp-op-on-partial-ord: make lint adhere to lint message convention
matthiaskrgr Jul 28, 2020
c514ff0
Update clippy_lints/src/neg_cmp_op_on_partial_ord.rs
matthiaskrgr Aug 10, 2020
1b46e48
Update clippy_lints/src/unwrap.rs
matthiaskrgr Aug 10, 2020
f59ec19
run cargo dev update-lints
matthiaskrgr Aug 10, 2020
1683189
Auto merge of #5889 - ebroto:5886_or_fun_call_const_0_args, r=Manishe…
bors Aug 10, 2020
6d0b5e2
update test stderr
matthiaskrgr Aug 10, 2020
cc5bfd4
Auto merge of #5888 - matthiaskrgr:lints, r=yaahc
bors Aug 10, 2020
9e73d33
Rollup merge of #75098 - Ryan1729:clippy-pointer-cast-lint-experiment…
Dylan-DPC Aug 10, 2020
9311c11
Fix sync fallout
flip1995 Aug 11, 2020
09bd400
Auto merge of #5891 - flip1995:rustup, r=flip1995
bors Aug 11, 2020
d6b991d
Merge commit '09bd400243ed6f7059fedc0c1623aae3792521d6' into clippyup
flip1995 Aug 11, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion clippy_lints/src/attrs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@ fn check_empty_line_after_outer_attr(cx: &EarlyContext<'_>, item: &rustc_ast::as
cx,
EMPTY_LINE_AFTER_OUTER_ATTR,
begin_of_attr_to_item,
"Found an empty line after an outer attribute. \
"found an empty line after an outer attribute. \
Perhaps you forgot to add a `!` to make it an inner attribute?",
);
}
Expand Down
4 changes: 2 additions & 2 deletions clippy_lints/src/bytecount.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ impl<'tcx> LateLintPass<'tcx> for ByteCount {
cx,
NAIVE_BYTECOUNT,
expr.span,
"You appear to be counting bytes the naive way",
"Consider using the bytecount crate",
"you appear to be counting bytes the naive way",
"consider using the bytecount crate",
format!("bytecount::count({}, {})",
snippet_with_applicability(cx, haystack.span, "..", &mut applicability),
snippet_with_applicability(cx, needle.span, "..", &mut applicability)),
Expand Down
2 changes: 1 addition & 1 deletion clippy_lints/src/checked_conversions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ impl<'tcx> LateLintPass<'tcx> for CheckedConversions {
cx,
CHECKED_CONVERSIONS,
item.span,
"Checked cast can be simplified.",
"checked cast can be simplified",
"try",
format!("{}::try_from({}).is_ok()", to_type, snippet),
applicability,
Expand Down
2 changes: 1 addition & 1 deletion clippy_lints/src/default_trait_access.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ impl<'tcx> LateLintPass<'tcx> for DefaultTraitAccess {
cx,
DEFAULT_TRAIT_ACCESS,
expr.span,
&format!("Calling `{}` is more clear than this expression", replacement),
&format!("calling `{}` is more clear than this expression", replacement),
"try",
replacement,
Applicability::Unspecified, // First resolve the TODO above
Expand Down
2 changes: 1 addition & 1 deletion clippy_lints/src/double_comparison.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ impl<'tcx> DoubleComparisons {
cx,
DOUBLE_COMPARISONS,
span,
"This binary expression can be simplified",
"this binary expression can be simplified",
"try",
sugg,
applicability,
Expand Down
23 changes: 5 additions & 18 deletions clippy_lints/src/double_parens.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,41 +45,28 @@ impl EarlyLintPass for DoubleParens {
return;
}

let msg: &str = "consider removing unnecessary double parentheses";

match expr.kind {
ExprKind::Paren(ref in_paren) => match in_paren.kind {
ExprKind::Paren(_) | ExprKind::Tup(_) => {
span_lint(
cx,
DOUBLE_PARENS,
expr.span,
"Consider removing unnecessary double parentheses",
);
span_lint(cx, DOUBLE_PARENS, expr.span, &msg);
},
_ => {},
},
ExprKind::Call(_, ref params) => {
if params.len() == 1 {
let param = &params[0];
if let ExprKind::Paren(_) = param.kind {
span_lint(
cx,
DOUBLE_PARENS,
param.span,
"Consider removing unnecessary double parentheses",
);
span_lint(cx, DOUBLE_PARENS, param.span, &msg);
}
}
},
ExprKind::MethodCall(_, ref params, _) => {
if params.len() == 2 {
let param = &params[1];
if let ExprKind::Paren(_) = param.kind {
span_lint(
cx,
DOUBLE_PARENS,
param.span,
"Consider removing unnecessary double parentheses",
);
span_lint(cx, DOUBLE_PARENS, param.span, &msg);
}
}
},
Expand Down
6 changes: 3 additions & 3 deletions clippy_lints/src/drop_bounds.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ declare_clippy_lint! {
/// ```
pub DROP_BOUNDS,
correctness,
"Bounds of the form `T: Drop` are useless"
"bounds of the form `T: Drop` are useless"
}

const DROP_BOUNDS_SUMMARY: &str = "Bounds of the form `T: Drop` are useless. \
Use `std::mem::needs_drop` to detect if a type has drop glue.";
const DROP_BOUNDS_SUMMARY: &str = "bounds of the form `T: Drop` are useless, \
use `std::mem::needs_drop` to detect if a type has drop glue";

declare_lint_pass!(DropBounds => [DROP_BOUNDS]);

Expand Down
2 changes: 1 addition & 1 deletion clippy_lints/src/functions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ impl<'tcx> Functions {
}

if line_count > self.max_lines {
span_lint(cx, TOO_MANY_LINES, span, "This function has a large number of lines.")
span_lint(cx, TOO_MANY_LINES, span, "this function has a large number of lines")
}
}

Expand Down
12 changes: 6 additions & 6 deletions clippy_lints/src/misc_early.rs
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ impl EarlyLintPass for MiscEarlyLints {
cx,
BUILTIN_TYPE_SHADOW,
param.ident.span,
&format!("This generic shadows the built-in type `{}`", name),
&format!("this generic shadows the built-in type `{}`", name),
);
}
}
Expand All @@ -298,9 +298,9 @@ impl EarlyLintPass for MiscEarlyLints {
cx,
UNNEEDED_FIELD_PATTERN,
pat.span,
"All the struct fields are matched to a wildcard pattern, consider using `..`.",
"all the struct fields are matched to a wildcard pattern, consider using `..`",
None,
&format!("Try with `{} {{ .. }}` instead", type_name),
&format!("try with `{} {{ .. }}` instead", type_name),
);
return;
}
Expand All @@ -313,7 +313,7 @@ impl EarlyLintPass for MiscEarlyLints {
cx,
UNNEEDED_FIELD_PATTERN,
field.span,
"You matched a field with a wildcard pattern. Consider using `..` instead",
"you matched a field with a wildcard pattern, consider using `..` instead",
);
} else {
let mut normal = vec![];
Expand All @@ -333,10 +333,10 @@ impl EarlyLintPass for MiscEarlyLints {
cx,
UNNEEDED_FIELD_PATTERN,
field.span,
"You matched a field with a wildcard pattern. Consider using `..` \
"you matched a field with a wildcard pattern, consider using `..` \
instead",
None,
&format!("Try with `{} {{ {}, .. }}`", type_name, normal[..].join(", ")),
&format!("try with `{} {{ {}, .. }}`", type_name, normal[..].join(", ")),
);
}
}
Expand Down
2 changes: 1 addition & 1 deletion clippy_lints/src/needless_bool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ fn check_comparison<'a, 'tcx>(
cx,
BOOL_COMPARISON,
e.span,
"This comparison might be written more concisely",
"this comparison might be written more concisely",
"try simplifying it as shown",
format!(
"{} != {}",
Expand Down
6 changes: 3 additions & 3 deletions clippy_lints/src/neg_cmp_op_on_partial_ord.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ impl<'tcx> LateLintPass<'tcx> for NoNegCompOpForPartialOrd {
cx,
NEG_CMP_OP_ON_PARTIAL_ORD,
expr.span,
"The use of negated comparison operators on partially ordered \
types produces code that is hard to read and refactor. Please \
"the use of negated comparison operators on partially ordered \
types produces code that is hard to read and refactor, please \
consider using the `partial_cmp` method instead, to make it \
clear that the two values could be incomparable."
clear that the two values could be incomparable"
)
}
}
Expand Down
2 changes: 1 addition & 1 deletion clippy_lints/src/neg_multiply.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ fn check_mul(cx: &LateContext<'_>, span: Span, lit: &Expr<'_>, exp: &Expr<'_>) {
if let Constant::Int(1) = consts::lit_to_constant(&l.node, cx.typeck_results().expr_ty_opt(lit));
if cx.typeck_results().expr_ty(exp).is_integral();
then {
span_lint(cx, NEG_MULTIPLY, span, "Negation by multiplying with `-1`");
span_lint(cx, NEG_MULTIPLY, span, "negation by multiplying with `-1`");
}
}
}
8 changes: 4 additions & 4 deletions clippy_lints/src/overflow_check_conditional.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ impl<'tcx> LateLintPass<'tcx> for OverflowCheckConditional {
if let BinOpKind::Lt = op.node {
if let BinOpKind::Add = op2.node {
span_lint(cx, OVERFLOW_CHECK_CONDITIONAL, expr.span,
"You are trying to use classic C overflow conditions that will fail in Rust.");
"you are trying to use classic C overflow conditions that will fail in Rust");
}
}
if let BinOpKind::Gt = op.node {
if let BinOpKind::Sub = op2.node {
span_lint(cx, OVERFLOW_CHECK_CONDITIONAL, expr.span,
"You are trying to use classic C underflow conditions that will fail in Rust.");
"you are trying to use classic C underflow conditions that will fail in Rust");
}
}
}
Expand All @@ -67,13 +67,13 @@ impl<'tcx> LateLintPass<'tcx> for OverflowCheckConditional {
if let BinOpKind::Gt = op.node {
if let BinOpKind::Add = op2.node {
span_lint(cx, OVERFLOW_CHECK_CONDITIONAL, expr.span,
"You are trying to use classic C overflow conditions that will fail in Rust.");
"you are trying to use classic C overflow conditions that will fail in Rust");
}
}
if let BinOpKind::Lt = op.node {
if let BinOpKind::Sub = op2.node {
span_lint(cx, OVERFLOW_CHECK_CONDITIONAL, expr.span,
"You are trying to use classic C underflow conditions that will fail in Rust.");
"you are trying to use classic C underflow conditions that will fail in Rust");
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion clippy_lints/src/path_buf_push_overwrite.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ impl<'tcx> LateLintPass<'tcx> for PathBufPushOverwrite {
cx,
PATH_BUF_PUSH_OVERWRITE,
lit.span,
"Calling `push` with '/' or '\\' (file system root) will overwrite the previous path definition",
"calling `push` with '/' or '\\' (file system root) will overwrite the previous path definition",
"try",
format!("\"{}\"", pushed_path_lit.trim_start_matches(|c| c == '/' || c == '\\')),
Applicability::MachineApplicable,
Expand Down
2 changes: 1 addition & 1 deletion clippy_lints/src/ptr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ impl<'tcx> LateLintPass<'tcx> for Ptr {
cx,
CMP_NULL,
expr.span,
"Comparing with null is better expressed by the `.is_null()` method",
"comparing with null is better expressed by the `.is_null()` method",
);
}
}
Expand Down
2 changes: 1 addition & 1 deletion clippy_lints/src/ranges.rs
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ impl<'tcx> LateLintPass<'tcx> for Ranges {
span_lint(cx,
RANGE_ZIP_WITH_LEN,
expr.span,
&format!("It is more idiomatic to use `{}.iter().enumerate()`",
&format!("it is more idiomatic to use `{}.iter().enumerate()`",
snippet(cx, iter_args[0].span, "_")));
}
}
Expand Down
4 changes: 2 additions & 2 deletions clippy_lints/src/redundant_static_lifetimes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,13 @@ impl EarlyLintPass for RedundantStaticLifetimes {
fn check_item(&mut self, cx: &EarlyContext<'_>, item: &Item) {
if !item.span.from_expansion() {
if let ItemKind::Const(_, ref var_type, _) = item.kind {
self.visit_type(var_type, cx, "Constants have by default a `'static` lifetime");
self.visit_type(var_type, cx, "constants have by default a `'static` lifetime");
// Don't check associated consts because `'static` cannot be elided on those (issue
// #2438)
}

if let ItemKind::Static(ref var_type, _, _) = item.kind {
self.visit_type(var_type, cx, "Statics have by default a `'static` lifetime");
self.visit_type(var_type, cx, "statics have by default a `'static` lifetime");
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion clippy_lints/src/reference.rs
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ impl EarlyLintPass for RefInDeref {
cx,
REF_IN_DEREF,
object.span,
"Creating a reference that is immediately dereferenced.",
"creating a reference that is immediately dereferenced",
"try this",
snippet_with_applicability(cx, inner.span, "_", &mut applicability).to_string(),
applicability,
Expand Down
4 changes: 2 additions & 2 deletions clippy_lints/src/suspicious_trait_impl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ impl<'tcx> LateLintPass<'tcx> for SuspiciousImpl {
cx,
SUSPICIOUS_ARITHMETIC_IMPL,
binop.span,
&format!(r#"Suspicious use of binary operator in `{}` impl"#, impl_trait),
&format!("suspicious use of binary operator in `{}` impl", impl_trait),
);
}

Expand Down Expand Up @@ -135,7 +135,7 @@ impl<'tcx> LateLintPass<'tcx> for SuspiciousImpl {
cx,
SUSPICIOUS_OP_ASSIGN_IMPL,
binop.span,
&format!(r#"Suspicious use of binary operator in `{}` impl"#, impl_trait),
&format!("suspicious use of binary operator in `{}` impl", impl_trait),
);
}
}
Expand Down
6 changes: 3 additions & 3 deletions clippy_lints/src/unwrap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,8 @@ impl<'a, 'tcx> Visitor<'tcx> for UnwrappableVariablesVisitor<'a, 'tcx> {
self.cx,
UNNECESSARY_UNWRAP,
expr.span,
&format!("You checked before that `{}()` cannot fail. \
Instead of checking and unwrapping, it's better to use `if let` or `match`.",
&format!("you checked before that `{}()` cannot fail, \
instead of checking and unwrapping, it's better to use `if let` or `match`",
method_name.ident.name),
|diag| { diag.span_label(unwrappable.check.span, "the check is happening here"); },
);
Expand All @@ -191,7 +191,7 @@ impl<'a, 'tcx> Visitor<'tcx> for UnwrappableVariablesVisitor<'a, 'tcx> {
self.cx,
PANICKING_UNWRAP,
expr.span,
&format!("This call to `{}()` will always panic.",
&format!("this call to `{}()` will always panic",
method_name.ident.name),
|diag| { diag.span_label(unwrappable.check.span, "because of this check"); },
);
Expand Down
4 changes: 2 additions & 2 deletions clippy_lints/src/utils/attrs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,12 @@ pub fn get_attr<'a>(
})
.map_or_else(
|| {
sess.span_err(attr_segments[1].ident.span, "Usage of unknown attribute");
sess.span_err(attr_segments[1].ident.span, "usage of unknown attribute");
false
},
|deprecation_status| {
let mut diag =
sess.struct_span_err(attr_segments[1].ident.span, "Usage of deprecated attribute");
sess.struct_span_err(attr_segments[1].ident.span, "usage of deprecated attribute");
match *deprecation_status {
DeprecationStatus::Deprecated => {
diag.emit();
Expand Down
2 changes: 1 addition & 1 deletion src/lintlist/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ pub static ref ALL_LINTS: Vec<Lint> = vec![
Lint {
name: "drop_bounds",
group: "correctness",
desc: "Bounds of the form `T: Drop` are useless",
desc: "bounds of the form `T: Drop` are useless",
deprecation: None,
module: "drop_bounds",
},
Expand Down
4 changes: 2 additions & 2 deletions tests/ui-toml/functions_maxlines/test.stderr
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
error: This function has a large number of lines.
error: this function has a large number of lines
--> $DIR/test.rs:18:1
|
LL | / fn too_many_lines() {
Expand All @@ -9,7 +9,7 @@ LL | | }
|
= note: `-D clippy::too-many-lines` implied by `-D warnings`

error: This function has a large number of lines.
error: this function has a large number of lines
--> $DIR/test.rs:38:1
|
LL | / fn comment_before_code() {
Expand Down
8 changes: 4 additions & 4 deletions tests/ui/bool_comparison.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -84,25 +84,25 @@ error: order comparisons between booleans can be simplified
LL | if x > y {
| ^^^^^ help: try simplifying it as shown: `x & !y`

error: This comparison might be written more concisely
error: this comparison might be written more concisely
--> $DIR/bool_comparison.rs:120:8
|
LL | if a == !b {};
| ^^^^^^^ help: try simplifying it as shown: `a != b`

error: This comparison might be written more concisely
error: this comparison might be written more concisely
--> $DIR/bool_comparison.rs:121:8
|
LL | if !a == b {};
| ^^^^^^^ help: try simplifying it as shown: `a != b`

error: This comparison might be written more concisely
error: this comparison might be written more concisely
--> $DIR/bool_comparison.rs:125:8
|
LL | if b == !a {};
| ^^^^^^^ help: try simplifying it as shown: `b != a`

error: This comparison might be written more concisely
error: this comparison might be written more concisely
--> $DIR/bool_comparison.rs:126:8
|
LL | if !b == a {};
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/builtin-type-shadow.stderr
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
error: This generic shadows the built-in type `u32`
error: this generic shadows the built-in type `u32`
--> $DIR/builtin-type-shadow.rs:4:8
|
LL | fn foo<u32>(a: u32) -> u32 {
Expand Down
Loading