Rustup to rust-lang/rust#88149 and rust-lang/rust#87280

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-08-16` toolchain.
-You can install it by using `rustup install nightly-2021-08-16` if you already have rustup.
+It's recommended to use `nightly-2021-08-31` toolchain.
+You can install it by using `rustup install nightly-2021-08-31` if you already have rustup.
 Then you can do:
 
 ```sh
-$ rustup component add rustc-dev llvm-tools-preview --toolchain nightly-2021-08-16
-$ cargo +nightly-2021-08-16 install --git https://github.com/rust-lang/rust-semverver
+$ rustup component add rustc-dev llvm-tools-preview --toolchain nightly-2021-08-31
+$ cargo +nightly-2021-08-31 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-08-16"
+channel = "nightly-2021-08-31"
 components = ["llvm-tools-preview", "rustc-dev"]

src/translate.rs

@@ -8,7 +8,7 @@ use rustc_infer::infer::InferCtxt;
 use rustc_middle::ty::{
     fold::{BottomUpFolder, TypeFoldable, TypeFolder},
     subst::{GenericArg, InternalSubsts, SubstsRef},
-    GenericParamDefKind, ParamEnv, Predicate, Region, TraitRef, Ty, TyCtxt,
+    GenericParamDefKind, ParamEnv, Predicate, Region, TraitRef, Ty, TyCtxt, Unevaluated,
 };
 use std::collections::HashMap;
 
@@ -376,8 +376,8 @@ impl<'a, 'tcx> TranslationContext<'a, 'tcx> {
         predicate: Predicate<'tcx>,
     ) -> Option<Predicate<'tcx>> {
         use rustc_middle::ty::{
-            OutlivesPredicate, PredicateKind, ProjectionPredicate, ProjectionTy, SubtypePredicate,
-            ToPredicate, TraitPredicate, WithOptConstParam,
+            CoercePredicate, OutlivesPredicate, PredicateKind, ProjectionPredicate, ProjectionTy,
+            SubtypePredicate, ToPredicate, TraitPredicate, WithOptConstParam,
         };
 
         Some(
@@ -446,14 +446,22 @@ impl<'a, 'tcx> TranslationContext<'a, 'tcx> {
                         b: r,
                     }
                 }),
-                PredicateKind::ConstEvaluatable(param, orig_substs) => {
+                PredicateKind::Coerce(pred) => PredicateKind::Coerce({
+                    let a = self.translate(index_map, pred.a);
+                    let b = self.translate(index_map, pred.b);
+                    CoercePredicate { a, b }
+                }),
+                PredicateKind::ConstEvaluatable(uv) => {
                     if let Some((target_def_id, target_substs)) =
-                        self.translate_orig_substs(index_map, param.did, orig_substs)
+                        self.translate_orig_substs(index_map, uv.def.did, uv.substs(self.tcx))
                     {
                         // TODO: We could probably use translated version for
                         // `WithOptConstParam::const_param_did`
                         let const_param = WithOptConstParam::unknown(target_def_id);
-                        PredicateKind::ConstEvaluatable(const_param, target_substs)
+                        PredicateKind::ConstEvaluatable(Unevaluated::new(
+                            const_param,
+                            target_substs,
+                        ))
                     } else {
                         return None;
                     }

src/typeck.rs

@@ -72,12 +72,11 @@ 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_hir::Constness;
-        use rustc_middle::ty::{ToPredicate, TraitPredicate};
+        use rustc_middle::ty::{BoundConstness, ToPredicate, TraitPredicate};
 
         let predicate = PredicateKind::Trait(TraitPredicate {
             trait_ref: checked_trait_ref,
-            constness: Constness::NotConst,
+            constness: BoundConstness::NotConst,
         })
         .to_predicate(self.infcx.tcx);
         let obligation = Obligation::new(ObligationCause::dummy(), self.given_param_env, predicate);