Auto merge of rust-lang#91549 - fee1-dead:const_env, r=spastorino

Eliminate ConstnessAnd again Closes rust-lang#91489. Closes rust-lang#89432. Reverts rust-lang#91491. Reverts rust-lang#89450. r? `@spastorino`
flip1995 · Dec 12, 2021 · 41c48bd · 41c48bd
2 parents 603b865 + adf8c38
commit 41c48bd
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/clippy_lints/src/future_not_send.rs b/clippy_lints/src/future_not_send.rs
@@ -68,8 +68,8 @@ impl<'tcx> LateLintPass<'tcx> for FutureNotSend {
             let mut is_future = false;
             for &(p, _span) in preds {
                 let p = p.subst(cx.tcx, subst);
-                if let Some(trait_ref) = p.to_opt_poly_trait_ref() {
-                    if Some(trait_ref.value.def_id()) == cx.tcx.lang_items().future_trait() {
+                if let Some(trait_pred) = p.to_opt_poly_trait_pred() {
+                    if Some(trait_pred.skip_binder().trait_ref.def_id) == cx.tcx.lang_items().future_trait() {
                         is_future = true;
                         break;
                     }