Rustup to rust-lang/rust#89001

Author: JohnTitor

README.md

@@ -27,13 +27,13 @@ repository and compiled from source or installed from
 of the nightly toolchain is supported at any given time.
 
 <!-- NOTE: Keep in sync with nightly date on rust-toolchain. -->
-It's recommended to use `nightly-2021-09-20` toolchain.
-You can install it by using `rustup install nightly-2021-09-20` if you already have rustup.
+It's recommended to use `nightly-2021-09-30` toolchain.
+You can install it by using `rustup install nightly-2021-09-30` if you already have rustup.
 Then you can do:
 
 ```sh
-$ rustup component add rustc-dev llvm-tools-preview --toolchain nightly-2021-09-20
-$ cargo +nightly-2021-09-20 install --git https://github.com/rust-lang/rust-semverver
+$ rustup component add rustc-dev llvm-tools-preview --toolchain nightly-2021-09-30
+$ cargo +nightly-2021-09-30 install --git https://github.com/rust-lang/rust-semverver
 ```
 
 You'd also need `cmake` for some dependencies, and a few common libraries (if you hit

rust-toolchain

@@ -1,4 +1,4 @@
 # NOTE: Keep in sync with nightly date on README
 [toolchain]
-channel = "nightly-2021-09-20"
+channel = "nightly-2021-09-30"
 components = ["llvm-tools-preview", "rustc-dev"]

src/translate.rs

@@ -377,11 +377,10 @@ impl<'a, 'tcx> TranslationContext<'a, 'tcx> {
     ) -> Option<Predicate<'tcx>> {
         use rustc_middle::ty::{
             CoercePredicate, OutlivesPredicate, PredicateKind, ProjectionPredicate, ProjectionTy,
-            SubtypePredicate, ToPredicate, TraitPredicate, WithOptConstParam,
+            self, SubtypePredicate, ToPredicate, TraitPredicate, WithOptConstParam,
         };
 
-        Some(
-            match predicate.kind().skip_binder() {
+        let pred = match predicate.kind().skip_binder() {
                 PredicateKind::Trait(pred) => PredicateKind::Trait(
                     if let Some((target_def_id, target_substs)) = self.translate_orig_substs(
                         index_map,
@@ -472,9 +471,9 @@ impl<'a, 'tcx> TranslationContext<'a, 'tcx> {
                 ),
                 // NOTE: Only used for Chalk trait solver
                 PredicateKind::TypeWellFormedFromEnv(_) => unimplemented!(),
-            }
-            .to_predicate(self.tcx),
-        )
+            };
+
+        Some(ty::Binder::dummy(pred).to_predicate(self.tcx))
     }
 
     /// Translate a slice of predicates in the context of an item.

src/typeck.rs

@@ -72,12 +72,12 @@ impl<'a, 'tcx> BoundContext<'a, 'tcx> {
 
     /// Register the trait bound represented by a `TraitRef`.
     pub fn register_trait_ref(&mut self, checked_trait_ref: TraitRef<'tcx>) {
-        use rustc_middle::ty::{BoundConstness, ToPredicate, TraitPredicate};
+        use rustc_middle::ty::{BoundConstness, self, ToPredicate, TraitPredicate};
 
-        let predicate = PredicateKind::Trait(TraitPredicate {
+        let predicate = ty::Binder::dummy(PredicateKind::Trait(TraitPredicate {
             trait_ref: checked_trait_ref,
             constness: BoundConstness::NotConst,
-        })
+        }))
         .to_predicate(self.infcx.tcx);
         let obligation = Obligation::new(ObligationCause::dummy(), self.given_param_env, predicate);
         self.fulfill_cx