From ebf7aba7cc540fbf43e4f08a40ede15465feceaf Mon Sep 17 00:00:00 2001
From: Igor Matuszewski <xanewok@gmail.com>
Date: Tue, 17 Nov 2020 19:40:13 +0100
Subject: [PATCH] WIP: Fix breakage due to rust-lang/rust#76244

See https://github.com/rust-lang/rust/pull/76244
---
 rust-toolchain   | 2 +-
 src/translate.rs | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/rust-toolchain b/rust-toolchain
index 641cabd5..7a3e5d19 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2020-09-10
+nightly-2020-09-15
diff --git a/src/translate.rs b/src/translate.rs
index 8eb491d4..ccbb1d84 100644
--- a/src/translate.rs
+++ b/src/translate.rs
@@ -464,6 +464,8 @@ impl<'a, 'tcx> TranslationContext<'a, 'tcx> {
                 self.translate(index_map, &c2),
             )
             .to_predicate(self.tcx),
+            // NOTE: Only used for Chalk trait solver
+            PredicateAtom::TypeWellFormedFromEnv(_) => return None,
         })
     }
 
@@ -498,7 +500,6 @@ impl<'a, 'tcx> TranslationContext<'a, 'tcx> {
                 ParamEnv::new(
                     self.tcx.intern_predicates(&target_preds),
                     param_env.reveal(),
-                    Some(orig_def_id),
                 )
             })
     }