Skip to content

Commit a333fa7

Browse files
committed
make Clippy compile again, the test part, episode I
1 parent 6c48cc2 commit a333fa7

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

clippy_lints/src/ptr.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,10 @@ fn check_fn(cx: &LateContext, decl: &FnDecl, fn_id: NodeId, opt_body_id: Option<
225225
if let [ref bx] = *pp.segments;
226226
if let Some(ref params) = bx.args;
227227
if !params.parenthesized;
228-
if let [ref inner] = *params.args;
229-
if let GenericArg::Type(inner) = inner;
228+
if let Some(inner) = params.args.iter().find_map(|arg| match arg {
229+
GenericArg::Type(ty) => Some(ty),
230+
GenericArg::Lifetime(_) => None,
231+
});
230232
then {
231233
let replacement = snippet_opt(cx, inner.span);
232234
if let Some(r) = replacement {

clippy_lints/src/types.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,10 @@ fn check_ty_rptr(cx: &LateContext, ast_ty: &hir::Ty, is_local: bool, lt: &Lifeti
304304
if let [ref bx] = *path.segments;
305305
if let Some(ref params) = bx.args;
306306
if !params.parenthesized;
307-
if let [ref inner] = *params.args;
308-
if let GenericArg::Type(inner) = inner;
307+
if let Some(inner) = params.args.iter().find_map(|arg| match arg {
308+
GenericArg::Type(ty) => Some(ty),
309+
GenericArg::Lifetime(_) => None,
310+
});
309311
then {
310312
if is_any_trait(inner) {
311313
// Ignore `Box<Any>` types, see #1884 for details.

0 commit comments

Comments
 (0)