about summary refs log tree commit diff
diff options
context:
space:
mode:
authorYuki Okushi <huyuumi.dev@gmail.com>2020-01-22 07:26:07 +0900
committerYuki Okushi <huyuumi.dev@gmail.com>2020-01-22 07:26:07 +0900
commit7ce9b8437de8253b921eae02a21060ce0dd3c656 (patch)
treef4aa85d0554b6604fd74b92e6aad99af25d4e878
parentf78cc075099f608787d50e151b4b6f529a0629c1 (diff)
downloadrust-7ce9b8437de8253b921eae02a21060ce0dd3c656.tar.gz
rust-7ce9b8437de8253b921eae02a21060ce0dd3c656.zip
Rustup to rust-lang/rust#68140
-rw-r--r--clippy_lints/src/needless_pass_by_value.rs2
-rw-r--r--clippy_lints/src/utils/mod.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/clippy_lints/src/needless_pass_by_value.rs b/clippy_lints/src/needless_pass_by_value.rs
index 8af5c3009e9..b23e26b7558 100644
--- a/clippy_lints/src/needless_pass_by_value.rs
+++ b/clippy_lints/src/needless_pass_by_value.rs
@@ -114,7 +114,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for NeedlessPassByValue {
         let preds = traits::elaborate_predicates(cx.tcx, cx.param_env.caller_bounds.to_vec())
             .filter(|p| !p.is_global())
             .filter_map(|pred| {
-                if let ty::Predicate::Trait(poly_trait_ref) = pred {
+                if let ty::Predicate::Trait(poly_trait_ref, _) = pred {
                     if poly_trait_ref.def_id() == sized_trait || poly_trait_ref.skip_binder().has_escaping_bound_vars()
                     {
                         return None;
diff --git a/clippy_lints/src/utils/mod.rs b/clippy_lints/src/utils/mod.rs
index 9150d189f23..57eef077bdf 100644
--- a/clippy_lints/src/utils/mod.rs
+++ b/clippy_lints/src/utils/mod.rs
@@ -1300,7 +1300,7 @@ pub fn is_must_use_ty<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, ty: Ty<'tcx>) -> boo
         Tuple(ref substs) => substs.types().any(|ty| is_must_use_ty(cx, ty)),
         Opaque(ref def_id, _) => {
             for (predicate, _) in cx.tcx.predicates_of(*def_id).predicates {
-                if let ty::Predicate::Trait(ref poly_trait_predicate) = predicate {
+                if let ty::Predicate::Trait(ref poly_trait_predicate, _) = predicate {
                     if must_use_attr(&cx.tcx.get_attrs(poly_trait_predicate.skip_binder().trait_ref.def_id)).is_some() {
                         return true;
                     }