Skip to content

Commit fd9c5a3

Browse files
author
Michael Wright
committed
Merge branch 'master' into dev-fmt-20190728
2 parents 2682bd1 + d1b4fc9 commit fd9c5a3

26 files changed

+443
-119
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1138,6 +1138,7 @@ Released 2018-09-13
11381138
[`trivially_copy_pass_by_ref`]: https://rust-lang.github.io/rust-clippy/master/index.html#trivially_copy_pass_by_ref
11391139
[`try_err`]: https://rust-lang.github.io/rust-clippy/master/index.html#try_err
11401140
[`type_complexity`]: https://rust-lang.github.io/rust-clippy/master/index.html#type_complexity
1141+
[`type_repetition_in_bounds`]: https://rust-lang.github.io/rust-clippy/master/index.html#type_repetition_in_bounds
11411142
[`unicode_not_nfc`]: https://rust-lang.github.io/rust-clippy/master/index.html#unicode_not_nfc
11421143
[`unimplemented`]: https://rust-lang.github.io/rust-clippy/master/index.html#unimplemented
11431144
[`unit_arg`]: https://rust-lang.github.io/rust-clippy/master/index.html#unit_arg

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
A collection of lints to catch common mistakes and improve your [Rust](https://github.com/rust-lang/rust) code.
88

9-
[There are 308 lints included in this crate!](https://rust-lang.github.io/rust-clippy/master/index.html)
9+
[There are 309 lints included in this crate!](https://rust-lang.github.io/rust-clippy/master/index.html)
1010

1111
We have a bunch of lint categories to allow you to choose how much Clippy is supposed to ~~annoy~~ help you:
1212

‎clippy_dev/src/fmt.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ pub enum CliError {
1616

1717
impl From<io::Error> for CliError {
1818
fn from(error: io::Error) -> Self {
19-
CliError::IoError(error)
19+
Self::IoError(error)
2020
}
2121
}
2222

2323
impl From<walkdir::Error> for CliError {
2424
fn from(error: walkdir::Error) -> Self {
25-
CliError::WalkDirError(error)
25+
Self::WalkDirError(error)
2626
}
2727
}
2828

‎clippy_lints/src/checked_conversions.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,12 +160,12 @@ impl ConversionType {
160160
/// Creates a conversion type if the type is allowed & conversion is valid
161161
fn try_new(from: &str, to: &str) -> Option<Self> {
162162
if UINTS.contains(&from) {
163-
Some(ConversionType::FromUnsigned)
163+
Some(Self::FromUnsigned)
164164
} else if SINTS.contains(&from) {
165165
if UINTS.contains(&to) {
166-
Some(ConversionType::SignedToUnsigned)
166+
Some(Self::SignedToUnsigned)
167167
} else if SINTS.contains(&to) {
168-
Some(ConversionType::SignedToSigned)
168+
Some(Self::SignedToSigned)
169169
} else {
170170
None
171171
}

‎clippy_lints/src/consts.rs

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -48,27 +48,27 @@ pub enum Constant {
4848
impl PartialEq for Constant {
4949
fn eq(&self, other: &Self) -> bool {
5050
match (self, other) {
51-
(&Constant::Str(ref ls), &Constant::Str(ref rs)) => ls == rs,
52-
(&Constant::Binary(ref l), &Constant::Binary(ref r)) => l == r,
53-
(&Constant::Char(l), &Constant::Char(r)) => l == r,
54-
(&Constant::Int(l), &Constant::Int(r)) => l == r,
55-
(&Constant::F64(l), &Constant::F64(r)) => {
51+
(&Self::Str(ref ls), &Self::Str(ref rs)) => ls == rs,
52+
(&Self::Binary(ref l), &Self::Binary(ref r)) => l == r,
53+
(&Self::Char(l), &Self::Char(r)) => l == r,
54+
(&Self::Int(l), &Self::Int(r)) => l == r,
55+
(&Self::F64(l), &Self::F64(r)) => {
5656
// We want `Fw32 == FwAny` and `FwAny == Fw64`, and by transitivity we must have
5757
// `Fw32 == Fw64`, so don’t compare them.
5858
// `to_bits` is required to catch non-matching 0.0, -0.0, and NaNs.
5959
l.to_bits() == r.to_bits()
6060
},
61-
(&Constant::F32(l), &Constant::F32(r)) => {
61+
(&Self::F32(l), &Self::F32(r)) => {
6262
// We want `Fw32 == FwAny` and `FwAny == Fw64`, and by transitivity we must have
6363
// `Fw32 == Fw64`, so don’t compare them.
6464
// `to_bits` is required to catch non-matching 0.0, -0.0, and NaNs.
6565
f64::from(l).to_bits() == f64::from(r).to_bits()
6666
},
67-
(&Constant::Bool(l), &Constant::Bool(r)) => l == r,
68-
(&Constant::Vec(ref l), &Constant::Vec(ref r)) | (&Constant::Tuple(ref l), &Constant::Tuple(ref r)) => {
67+
(&Self::Bool(l), &Self::Bool(r)) => l == r,
68+
(&Self::Vec(ref l), &Self::Vec(ref r)) | (&Self::Tuple(ref l), &Self::Tuple(ref r)) => {
6969
l == r
7070
},
71-
(&Constant::Repeat(ref lv, ref ls), &Constant::Repeat(ref rv, ref rs)) => ls == rs && lv == rv,
71+
(&Self::Repeat(ref lv, ref ls), &Self::Repeat(ref rv, ref rs)) => ls == rs && lv == rv,
7272
// TODO: are there inter-type equalities?
7373
_ => false,
7474
}
@@ -82,38 +82,38 @@ impl Hash for Constant {
8282
{
8383
std::mem::discriminant(self).hash(state);
8484
match *self {
85-
Constant::Str(ref s) => {
85+
Self::Str(ref s) => {
8686
s.hash(state);
8787
},
88-
Constant::Binary(ref b) => {
88+
Self::Binary(ref b) => {
8989
b.hash(state);
9090
},
91-
Constant::Char(c) => {
91+
Self::Char(c) => {
9292
c.hash(state);
9393
},
94-
Constant::Int(i) => {
94+
Self::Int(i) => {
9595
i.hash(state);
9696
},
97-
Constant::F32(f) => {
97+
Self::F32(f) => {
9898
f64::from(f).to_bits().hash(state);
9999
},
100-
Constant::F64(f) => {
100+
Self::F64(f) => {
101101
f.to_bits().hash(state);
102102
},
103-
Constant::Bool(b) => {
103+
Self::Bool(b) => {
104104
b.hash(state);
105105
},
106-
Constant::Vec(ref v) | Constant::Tuple(ref v) => {
106+
Self::Vec(ref v) | Self::Tuple(ref v) => {
107107
v.hash(state);
108108
},
109-
Constant::Repeat(ref c, l) => {
109+
Self::Repeat(ref c, l) => {
110110
c.hash(state);
111111
l.hash(state);
112112
},
113-
Constant::RawPtr(u) => {
113+
Self::RawPtr(u) => {
114114
u.hash(state);
115115
},
116-
Constant::Err(ref s) => {
116+
Self::Err(ref s) => {
117117
s.hash(state);
118118
},
119119
}
@@ -123,25 +123,25 @@ impl Hash for Constant {
123123
impl Constant {
124124
pub fn partial_cmp(tcx: TyCtxt<'_>, cmp_type: Ty<'_>, left: &Self, right: &Self) -> Option<Ordering> {
125125
match (left, right) {
126-
(&Constant::Str(ref ls), &Constant::Str(ref rs)) => Some(ls.cmp(rs)),
127-
(&Constant::Char(ref l), &Constant::Char(ref r)) => Some(l.cmp(r)),
128-
(&Constant::Int(l), &Constant::Int(r)) => {
126+
(&Self::Str(ref ls), &Self::Str(ref rs)) => Some(ls.cmp(rs)),
127+
(&Self::Char(ref l), &Self::Char(ref r)) => Some(l.cmp(r)),
128+
(&Self::Int(l), &Self::Int(r)) => {
129129
if let ty::Int(int_ty) = cmp_type.sty {
130130
Some(sext(tcx, l, int_ty).cmp(&sext(tcx, r, int_ty)))
131131
} else {
132132
Some(l.cmp(&r))
133133
}
134134
},
135-
(&Constant::F64(l), &Constant::F64(r)) => l.partial_cmp(&r),
136-
(&Constant::F32(l), &Constant::F32(r)) => l.partial_cmp(&r),
137-
(&Constant::Bool(ref l), &Constant::Bool(ref r)) => Some(l.cmp(r)),
138-
(&Constant::Tuple(ref l), &Constant::Tuple(ref r)) | (&Constant::Vec(ref l), &Constant::Vec(ref r)) => l
135+
(&Self::F64(l), &Self::F64(r)) => l.partial_cmp(&r),
136+
(&Self::F32(l), &Self::F32(r)) => l.partial_cmp(&r),
137+
(&Self::Bool(ref l), &Self::Bool(ref r)) => Some(l.cmp(r)),
138+
(&Self::Tuple(ref l), &Self::Tuple(ref r)) | (&Self::Vec(ref l), &Self::Vec(ref r)) => l
139139
.iter()
140140
.zip(r.iter())
141141
.map(|(li, ri)| Self::partial_cmp(tcx, cmp_type, li, ri))
142142
.find(|r| r.map_or(true, |o| o != Ordering::Equal))
143143
.unwrap_or_else(|| Some(l.len().cmp(&r.len()))),
144-
(&Constant::Repeat(ref lv, ref ls), &Constant::Repeat(ref rv, ref rs)) => {
144+
(&Self::Repeat(ref lv, ref ls), &Self::Repeat(ref rv, ref rs)) => {
145145
match Self::partial_cmp(tcx, cmp_type, lv, rv) {
146146
Some(Equal) => Some(ls.cmp(rs)),
147147
x => x,

‎clippy_lints/src/escape.rs

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use rustc::hir::intravisit as visit;
2-
use rustc::hir::*;
2+
use rustc::hir::{self, *};
33
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
44
use rustc::middle::expr_use_visitor::*;
55
use rustc::middle::mem_categorization::{cmt_, Categorization};
@@ -101,6 +101,19 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for BoxedLocal {
101101
}
102102
}
103103

104+
// TODO: Replace with Map::is_argument(..) when it's fixed
105+
fn is_argument(map: &hir::map::Map<'_>, id: HirId) -> bool {
106+
match map.find(id) {
107+
Some(Node::Binding(_)) => (),
108+
_ => return false,
109+
}
110+
111+
match map.find(map.get_parent_node(id)) {
112+
Some(Node::Arg(_)) => true,
113+
_ => false,
114+
}
115+
}
116+
104117
impl<'a, 'tcx> Delegate<'tcx> for EscapeDelegate<'a, 'tcx> {
105118
fn consume(&mut self, _: HirId, _: Span, cmt: &cmt_<'tcx>, mode: ConsumeMode) {
106119
if let Categorization::Local(lid) = cmt.cat {
@@ -113,11 +126,13 @@ impl<'a, 'tcx> Delegate<'tcx> for EscapeDelegate<'a, 'tcx> {
113126
fn matched_pat(&mut self, _: &Pat, _: &cmt_<'tcx>, _: MatchMode) {}
114127
fn consume_pat(&mut self, consume_pat: &Pat, cmt: &cmt_<'tcx>, _: ConsumeMode) {
115128
let map = &self.cx.tcx.hir();
116-
if map.is_argument(consume_pat.hir_id) {
129+
if is_argument(map, consume_pat.hir_id) {
117130
// Skip closure arguments
118-
if let Some(Node::Expr(..)) = map.find(map.get_parent_node(consume_pat.hir_id)) {
131+
let parent_id = map.get_parent_node(consume_pat.hir_id);
132+
if let Some(Node::Expr(..)) = map.find(map.get_parent_node(parent_id)) {
119133
return;
120134
}
135+
121136
if is_non_trait_box(cmt.ty) && !self.is_large_box(cmt.ty) {
122137
self.set.insert(consume_pat.hir_id);
123138
}

‎clippy_lints/src/excessive_precision.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,20 +143,20 @@ impl FloatFormat {
143143
fn new(s: &str) -> Self {
144144
s.chars()
145145
.find_map(|x| match x {
146-
'e' => Some(FloatFormat::LowerExp),
147-
'E' => Some(FloatFormat::UpperExp),
146+
'e' => Some(Self::LowerExp),
147+
'E' => Some(Self::UpperExp),
148148
_ => None,
149149
})
150-
.unwrap_or(FloatFormat::Normal)
150+
.unwrap_or(Self::Normal)
151151
}
152152
fn format<T>(&self, f: T) -> String
153153
where
154154
T: fmt::UpperExp + fmt::LowerExp + fmt::Display,
155155
{
156156
match self {
157-
FloatFormat::LowerExp => format!("{:e}", f),
158-
FloatFormat::UpperExp => format!("{:E}", f),
159-
FloatFormat::Normal => format!("{}", f),
157+
Self::LowerExp => format!("{:e}", f),
158+
Self::UpperExp => format!("{:E}", f),
159+
Self::Normal => format!("{}", f),
160160
}
161161
}
162162
}

‎clippy_lints/src/lib.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,7 @@ pub mod strings;
263263
pub mod suspicious_trait_impl;
264264
pub mod swap;
265265
pub mod temporary_assignment;
266+
pub mod trait_bounds;
266267
pub mod transmute;
267268
pub mod transmuting_null;
268269
pub mod trivially_copy_pass_by_ref;
@@ -588,6 +589,7 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry<'_>, conf: &Conf) {
588589
reg.register_late_lint_pass(box checked_conversions::CheckedConversions);
589590
reg.register_late_lint_pass(box integer_division::IntegerDivision);
590591
reg.register_late_lint_pass(box inherent_to_string::InherentToString);
592+
reg.register_late_lint_pass(box trait_bounds::TraitBounds);
591593

592594
reg.register_lint_group("clippy::restriction", Some("clippy_restriction"), vec![
593595
arithmetic::FLOAT_ARITHMETIC,
@@ -858,6 +860,7 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry<'_>, conf: &Conf) {
858860
swap::ALMOST_SWAPPED,
859861
swap::MANUAL_SWAP,
860862
temporary_assignment::TEMPORARY_ASSIGNMENT,
863+
trait_bounds::TYPE_REPETITION_IN_BOUNDS,
861864
transmute::CROSSPOINTER_TRANSMUTE,
862865
transmute::TRANSMUTE_BYTES_TO_STR,
863866
transmute::TRANSMUTE_INT_TO_BOOL,
@@ -1039,6 +1042,7 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry<'_>, conf: &Conf) {
10391042
reference::REF_IN_DEREF,
10401043
swap::MANUAL_SWAP,
10411044
temporary_assignment::TEMPORARY_ASSIGNMENT,
1045+
trait_bounds::TYPE_REPETITION_IN_BOUNDS,
10421046
transmute::CROSSPOINTER_TRANSMUTE,
10431047
transmute::TRANSMUTE_BYTES_TO_STR,
10441048
transmute::TRANSMUTE_INT_TO_BOOL,

‎clippy_lints/src/literal_representation.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ impl Radix {
115115
/// Returns a reasonable digit group size for this radix.
116116
crate fn suggest_grouping(&self) -> usize {
117117
match *self {
118-
Radix::Binary | Radix::Hexadecimal => 4,
119-
Radix::Octal | Radix::Decimal => 3,
118+
Self::Binary | Self::Hexadecimal => 4,
119+
Self::Octal | Self::Decimal => 3,
120120
}
121121
}
122122
}
@@ -285,7 +285,7 @@ enum WarningType {
285285
impl WarningType {
286286
crate fn display(&self, grouping_hint: &str, cx: &EarlyContext<'_>, span: syntax_pos::Span) {
287287
match self {
288-
WarningType::MistypedLiteralSuffix => span_lint_and_sugg(
288+
Self::MistypedLiteralSuffix => span_lint_and_sugg(
289289
cx,
290290
MISTYPED_LITERAL_SUFFIXES,
291291
span,
@@ -294,7 +294,7 @@ impl WarningType {
294294
grouping_hint.to_string(),
295295
Applicability::MaybeIncorrect,
296296
),
297-
WarningType::UnreadableLiteral => span_lint_and_sugg(
297+
Self::UnreadableLiteral => span_lint_and_sugg(
298298
cx,
299299
UNREADABLE_LITERAL,
300300
span,
@@ -303,7 +303,7 @@ impl WarningType {
303303
grouping_hint.to_owned(),
304304
Applicability::MachineApplicable,
305305
),
306-
WarningType::LargeDigitGroups => span_lint_and_sugg(
306+
Self::LargeDigitGroups => span_lint_and_sugg(
307307
cx,
308308
LARGE_DIGIT_GROUPS,
309309
span,
@@ -312,7 +312,7 @@ impl WarningType {
312312
grouping_hint.to_owned(),
313313
Applicability::MachineApplicable,
314314
),
315-
WarningType::InconsistentDigitGrouping => span_lint_and_sugg(
315+
Self::InconsistentDigitGrouping => span_lint_and_sugg(
316316
cx,
317317
INCONSISTENT_DIGIT_GROUPING,
318318
span,
@@ -321,7 +321,7 @@ impl WarningType {
321321
grouping_hint.to_owned(),
322322
Applicability::MachineApplicable,
323323
),
324-
WarningType::DecimalRepresentation => span_lint_and_sugg(
324+
Self::DecimalRepresentation => span_lint_and_sugg(
325325
cx,
326326
DECIMAL_LITERAL_REPRESENTATION,
327327
span,

0 commit comments

Comments
 (0)