Rustup to rust-lang/rust#87375

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

src/translate.rs

@@ -382,7 +382,7 @@ impl<'a, 'tcx> TranslationContext<'a, 'tcx> {
 
         Some(
             match predicate.kind().skip_binder() {
-                PredicateKind::Trait(pred, constness) => PredicateKind::Trait(
+                PredicateKind::Trait(pred) => PredicateKind::Trait(
                     if let Some((target_def_id, target_substs)) = self.translate_orig_substs(
                         index_map,
                         pred.trait_ref.def_id,
@@ -393,11 +393,11 @@ impl<'a, 'tcx> TranslationContext<'a, 'tcx> {
                                 def_id: target_def_id,
                                 substs: target_substs,
                             },
+                            constness: pred.constness,
                         }
                     } else {
                         return None;
                     },
-                    constness,
                 ),
                 PredicateKind::RegionOutlives(pred) => PredicateKind::RegionOutlives({
                     let l = self.translate_region(pred.0);

src/traverse.rs

@@ -590,7 +590,7 @@ fn diff_traits<'tcx>(
     let old_param_env = tcx.param_env(old);
 
     for bound in old_param_env.caller_bounds() {
-        if let PredicateKind::Trait(pred, _) = bound.kind().skip_binder() {
+        if let PredicateKind::Trait(pred) = bound.kind().skip_binder() {
             let trait_ref = pred.trait_ref;
 
             debug!("trait_ref substs (old): {:?}", trait_ref.substs);

src/typeck.rs

@@ -75,12 +75,10 @@ impl<'a, 'tcx> BoundContext<'a, 'tcx> {
         use rustc_hir::Constness;
         use rustc_middle::ty::{ToPredicate, TraitPredicate};
 
-        let predicate = PredicateKind::Trait(
-            TraitPredicate {
-                trait_ref: checked_trait_ref,
-            },
-            Constness::NotConst,
-        )
+        let predicate = PredicateKind::Trait(TraitPredicate {
+            trait_ref: checked_trait_ref,
+            constness: Constness::NotConst,
+        })
         .to_predicate(self.infcx.tcx);
         let obligation = Obligation::new(ObligationCause::dummy(), self.given_param_env, predicate);
         self.fulfill_cx