Skip to content

Commit c094967

Browse files
committed
1 parent 25c9243 commit c094967

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

rust-toolchain

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2020-07-07
1+
nightly-2020-07-15

src/translate.rs

+8-4
Original file line numberDiff line numberDiff line change
@@ -494,10 +494,14 @@ impl<'a, 'tcx> TranslationContext<'a, 'tcx> {
494494
orig_def_id: DefId,
495495
param_env: ParamEnv<'tcx>,
496496
) -> Option<ParamEnv<'tcx>> {
497-
self.translate_predicates(orig_def_id, param_env.caller_bounds)
498-
.map(|target_preds| ParamEnv {
499-
caller_bounds: self.tcx.intern_predicates(&target_preds),
500-
..param_env
497+
self.translate_predicates(orig_def_id, param_env.caller_bounds())
498+
.map(|target_preds| {
499+
ParamEnv::new(
500+
self.tcx.intern_predicates(&target_preds),
501+
param_env.reveal(),
502+
param_env.def_id,
503+
504+
)
501505
})
502506
}
503507

src/traverse.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ fn diff_traits<'tcx>(
591591
let mut old_sealed = false;
592592
let old_param_env = tcx.param_env(old);
593593

594-
for bound in old_param_env.caller_bounds {
594+
for bound in old_param_env.caller_bounds() {
595595
if let PredicateKind::Trait(pred, _) = *bound.kind() {
596596
let trait_ref = pred.skip_binder().trait_ref;
597597

0 commit comments

Comments
 (0)