From 68476e1d13d1f90c5125156ce3a6b5f3febd1176 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Tue, 19 Feb 2019 13:04:43 +0530 Subject: [PATCH] Rustup to rustc 1.34.0-nightly (32471f7ea 2019-02-19) --- clippy_lints/src/lifetimes.rs | 6 +++--- clippy_lints/src/needless_pass_by_value.rs | 2 +- clippy_lints/src/ptr.rs | 2 +- clippy_lints/src/transmute.rs | 2 +- clippy_lints/src/types.rs | 16 ++++++++-------- clippy_lints/src/use_self.rs | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/clippy_lints/src/lifetimes.rs b/clippy_lints/src/lifetimes.rs index 5562d750dac..db9dbea97dc 100644 --- a/clippy_lints/src/lifetimes.rs +++ b/clippy_lints/src/lifetimes.rs @@ -113,7 +113,7 @@ fn check_fn_inner<'a, 'tcx>( let mut bounds_lts = Vec::new(); let types = generics.params.iter().filter(|param| match param.kind { GenericParamKind::Type { .. } => true, - GenericParamKind::Lifetime { .. } => false, + _ => false, }); for typ in types { for bound in &typ.bounds { @@ -133,7 +133,7 @@ fn check_fn_inner<'a, 'tcx>( if let Some(ref params) = *params { let lifetimes = params.args.iter().filter_map(|arg| match arg { GenericArg::Lifetime(lt) => Some(lt), - GenericArg::Type(_) => None, + _ => None, }); for bound in lifetimes { if bound.name != LifetimeName::Static && !bound.is_elided() { @@ -316,7 +316,7 @@ impl<'v, 't> RefVisitor<'v, 't> { if !last_path_segment.parenthesized && !last_path_segment.args.iter().any(|arg| match arg { GenericArg::Lifetime(_) => true, - GenericArg::Type(_) => false, + _ => false, }) { let hir_id = self.cx.tcx.hir().node_to_hir_id(ty.id); diff --git a/clippy_lints/src/needless_pass_by_value.rs b/clippy_lints/src/needless_pass_by_value.rs index c7af5fa79f3..2f71facb2cd 100644 --- a/clippy_lints/src/needless_pass_by_value.rs +++ b/clippy_lints/src/needless_pass_by_value.rs @@ -234,7 +234,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for NeedlessPassByValue { .and_then(|ps| ps.args.as_ref()) .map(|params| params.args.iter().find_map(|arg| match arg { GenericArg::Type(ty) => Some(ty), - GenericArg::Lifetime(_) => None, + _ => None, }).unwrap()); then { let slice_ty = format!("&[{}]", snippet(cx, elem_ty.span, "_")); diff --git a/clippy_lints/src/ptr.rs b/clippy_lints/src/ptr.rs index 5a54971f49e..cddb1c7106d 100644 --- a/clippy_lints/src/ptr.rs +++ b/clippy_lints/src/ptr.rs @@ -235,7 +235,7 @@ fn check_fn(cx: &LateContext<'_, '_>, decl: &FnDecl, fn_id: NodeId, opt_body_id: if !params.parenthesized; if let Some(inner) = params.args.iter().find_map(|arg| match arg { GenericArg::Type(ty) => Some(ty), - GenericArg::Lifetime(_) => None, + _ => None, }); then { let replacement = snippet_opt(cx, inner.span); diff --git a/clippy_lints/src/transmute.rs b/clippy_lints/src/transmute.rs index f39dc6f9b68..513db90477d 100644 --- a/clippy_lints/src/transmute.rs +++ b/clippy_lints/src/transmute.rs @@ -498,7 +498,7 @@ fn get_type_snippet(cx: &LateContext<'_, '_>, path: &QPath, to_ref_ty: Ty<'_>) - if !params.parenthesized; if let Some(to_ty) = params.args.iter().filter_map(|arg| match arg { GenericArg::Type(ty) => Some(ty), - GenericArg::Lifetime(_) => None, + _ => None, }).nth(1); if let TyKind::Rptr(_, ref to_ty) = to_ty.node; then { diff --git a/clippy_lints/src/types.rs b/clippy_lints/src/types.rs index 227b10cd29a..7455f7d68fd 100644 --- a/clippy_lints/src/types.rs +++ b/clippy_lints/src/types.rs @@ -223,7 +223,7 @@ fn match_type_parameter(cx: &LateContext<'_, '_>, qpath: &QPath, path: &[&str]) if !params.parenthesized; if let Some(ty) = params.args.iter().find_map(|arg| match arg { GenericArg::Type(ty) => Some(ty), - GenericArg::Lifetime(_) => None, + _ => None, }); if let TyKind::Path(ref qpath) = ty.node; if let Some(did) = opt_def_id(cx.tables.qpath_def(qpath, cx.tcx.hir().node_to_hir_id(ty.id))); @@ -267,7 +267,7 @@ fn check_ty(cx: &LateContext<'_, '_>, hir_ty: &hir::Ty, is_local: bool) { if let Some(ref last) = last_path_segment(qpath).args; if let Some(ty) = last.args.iter().find_map(|arg| match arg { GenericArg::Type(ty) => Some(ty), - GenericArg::Lifetime(_) => None, + _ => None, }); // ty is now _ at this point if let TyKind::Path(ref ty_qpath) = ty.node; @@ -278,7 +278,7 @@ fn check_ty(cx: &LateContext<'_, '_>, hir_ty: &hir::Ty, is_local: bool) { if let Some(ref last) = last_path_segment(ty_qpath).args; if let Some(boxed_ty) = last.args.iter().find_map(|arg| match arg { GenericArg::Type(ty) => Some(ty), - GenericArg::Lifetime(_) => None, + _ => None, }); then { let ty_ty = hir_ty_to_ty(cx.tcx, boxed_ty); @@ -327,7 +327,7 @@ fn check_ty(cx: &LateContext<'_, '_>, hir_ty: &hir::Ty, is_local: bool) { .map_or_else(|| [].iter(), |params| params.args.iter()) .filter_map(|arg| match arg { GenericArg::Type(ty) => Some(ty), - GenericArg::Lifetime(_) => None, + _ => None, }) }) { check_ty(cx, ty, is_local); @@ -340,7 +340,7 @@ fn check_ty(cx: &LateContext<'_, '_>, hir_ty: &hir::Ty, is_local: bool) { .map_or_else(|| [].iter(), |params| params.args.iter()) .filter_map(|arg| match arg { GenericArg::Type(ty) => Some(ty), - GenericArg::Lifetime(_) => None, + _ => None, }) }) { check_ty(cx, ty, is_local); @@ -351,7 +351,7 @@ fn check_ty(cx: &LateContext<'_, '_>, hir_ty: &hir::Ty, is_local: bool) { if let Some(ref params) = seg.args { for ty in params.args.iter().filter_map(|arg| match arg { GenericArg::Type(ty) => Some(ty), - GenericArg::Lifetime(_) => None, + _ => None, }) { check_ty(cx, ty, is_local); } @@ -387,7 +387,7 @@ fn check_ty_rptr(cx: &LateContext<'_, '_>, hir_ty: &hir::Ty, is_local: bool, lt: if !params.parenthesized; if let Some(inner) = params.args.iter().find_map(|arg| match arg { GenericArg::Type(ty) => Some(ty), - GenericArg::Lifetime(_) => None, + _ => None, }); then { if is_any_trait(inner) { @@ -2138,7 +2138,7 @@ impl<'tcx> ImplicitHasherType<'tcx> { .iter() .filter_map(|arg| match arg { GenericArg::Type(ty) => Some(ty), - GenericArg::Lifetime(_) => None, + _ => None, }) .collect(); let params_len = params.len(); diff --git a/clippy_lints/src/use_self.rs b/clippy_lints/src/use_self.rs index 1f1d9ddbfec..94f98a17e4f 100644 --- a/clippy_lints/src/use_self.rs +++ b/clippy_lints/src/use_self.rs @@ -181,7 +181,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UseSelf { let should_check = if let Some(ref params) = *parameters { !params.parenthesized && !params.args.iter().any(|arg| match arg { GenericArg::Lifetime(_) => true, - GenericArg::Type(_) => false, + _ => false, }) } else { true