Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2024-11-27 23:20:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix dogfood error.

Browse source
This commit is contained in:
kennytm 2018-10-22 11:44:09 +08:00
parent 2d1c9313b0
commit 2b2acf1002
No known key found for this signature in database
GPG key ID: FEF6C8051D0E013C
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
clippy_lints/src/literal_representation.rs
View file

@ -210,7 +210,7 @@ impl<'a> DigitInfo<'a> {
.filter(|&c| c != '_') .filter(|&c| c != '_')
.collect::<Vec<_>>() .collect::<Vec<_>>()
.chunks(group_size) .chunks(group_size)
.map(|chunk| chunk.into_iter().rev().collect()) .map(|chunk| chunk.iter().rev().collect())
.rev() .rev()
.collect::<Vec<String>>() .collect::<Vec<String>>()
.join("_"); .join("_");
@ -221,7 +221,7 @@ impl<'a> DigitInfo<'a> {
.filter(|&c| c != '_') .filter(|&c| c != '_')
.collect::<Vec<_>>() .collect::<Vec<_>>()
.chunks(group_size) .chunks(group_size)
.map(|chunk| chunk.into_iter().collect()) .map(|chunk| chunk.iter().collect())
.collect::<Vec<String>>() .collect::<Vec<String>>()
.join("_"); .join("_");
format!( format!(
@ -238,7 +238,7 @@ impl<'a> DigitInfo<'a> {
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let mut hint = filtered_digits_vec let mut hint = filtered_digits_vec
.chunks(group_size) .chunks(group_size)
.map(|chunk| chunk.into_iter().rev().collect()) .map(|chunk| chunk.iter().rev().collect())
.rev() .rev()
.collect::<Vec<String>>() .collect::<Vec<String>>()
.join("_"); .join("_");

34
clippy_lints/src/methods/mod.rs
View file

@ -575,7 +575,7 @@ declare_clippy_lint! {
/// temporary placeholder for dealing with the `Option` type, then this does /// temporary placeholder for dealing with the `Option` type, then this does
/// not mitigate the need for error handling. If there is a chance that `.get()` /// not mitigate the need for error handling. If there is a chance that `.get()`
/// will be `None` in your program, then it is advisable that the `None` case /// will be `None` in your program, then it is advisable that the `None` case
/// is handled in a future refactor instead of using `.unwrap()` or the Index /// is handled in a future refactor instead of using `.unwrap()` or the Index
/// trait. /// trait.
/// ///
/// **Example:** /// **Example:**
@ -2135,22 +2135,6 @@ fn lint_asref(cx: &LateContext<'_, '_>, expr: &hir::Expr, call_name: &str, as_re
} }
fn ty_has_iter_method(cx: &LateContext<'_, '_>, self_ref_ty: ty::Ty<'_>) -> Option<(&'static Lint, &'static str, &'static str)> { fn ty_has_iter_method(cx: &LateContext<'_, '_>, self_ref_ty: ty::Ty<'_>) -> Option<(&'static Lint, &'static str, &'static str)> {
let (self_ty, mutbl) = match self_ref_ty.sty {
ty::TyKind::Ref(_, self_ty, mutbl) => (self_ty, mutbl),
_ => unreachable!(),
};
let method_name = match mutbl {
hir::MutImmutable => "iter",
hir::MutMutable => "iter_mut",
};
let def_id = match self_ty.sty {
ty::TyKind::Array(..) => return Some((INTO_ITER_ON_ARRAY, "array", method_name)),
ty::TyKind::Slice(..) => return Some((INTO_ITER_ON_REF, "slice", method_name)),
ty::Adt(adt, _) => adt.did,
_ => return None,
};
// FIXME: instead of this hard-coded list, we should check if `<adt>::iter` // FIXME: instead of this hard-coded list, we should check if `<adt>::iter`
// exists and has the desired signature. Unfortunately FnCtxt is not exported // exists and has the desired signature. Unfortunately FnCtxt is not exported
// so we can't use its `lookup_method` method. // so we can't use its `lookup_method` method.
@ -2170,6 +2154,22 @@ fn ty_has_iter_method(cx: &LateContext<'_, '_>, self_ref_ty: ty::Ty<'_>) -> Opti
(INTO_ITER_ON_REF, &["std", "sync", "mpsc", "Receiver"]), (INTO_ITER_ON_REF, &["std", "sync", "mpsc", "Receiver"]),
]; ];
let (self_ty, mutbl) = match self_ref_ty.sty {
ty::TyKind::Ref(_, self_ty, mutbl) => (self_ty, mutbl),
_ => unreachable!(),
};
let method_name = match mutbl {
hir::MutImmutable => "iter",
hir::MutMutable => "iter_mut",
};
let def_id = match self_ty.sty {
ty::TyKind::Array(..) => return Some((INTO_ITER_ON_ARRAY, "array", method_name)),
ty::TyKind::Slice(..) => return Some((INTO_ITER_ON_REF, "slice", method_name)),
ty::Adt(adt, _) => adt.did,
_ => return None,
};
for (lint, path) in &INTO_ITER_COLLECTIONS { for (lint, path) in &INTO_ITER_COLLECTIONS {
if match_def_path(cx.tcx, def_id, path) { if match_def_path(cx.tcx, def_id, path) {
return Some((lint, path.last().unwrap(), method_name)) return Some((lint, path.last().unwrap(), method_name))