rustup https://github.com/rust-lang/rust/pull/69745

2020-04-11 01:41:52 +02:00
parent 5e8c0c5ae0
commit f7bdead5ec
2 changed files with 8 additions and 3 deletions
--- a/clippy_lints/src/utils/mod.rs
+++ b/clippy_lints/src/utils/mod.rs
@@ -1389,7 +1389,12 @@ pub fn fn_has_unsatisfiable_preds(cx: &LateContext<'_, '_>, did: DefId) -> bool
        .iter()
        .filter_map(|(p, _)| if p.is_global() { Some(*p) } else { None })
        .collect();
-    !traits::normalize_and_test_predicates(cx.tcx, traits::elaborate_predicates(cx.tcx, predicates).collect())
+    !traits::normalize_and_test_predicates(
+        cx.tcx,
+        traits::elaborate_predicates(cx.tcx, predicates)
+            .map(|o| o.predicate)
+            .collect::<Vec<_>>(),
+    )
 }

 #[cfg(test)]