From 42b267d22137218588d75708ad99a5d9acefa9ab Mon Sep 17 00:00:00 2001
From: Jack Huey <jack.huey@umassmed.edu>
Date: Fri, 11 Dec 2020 15:02:46 -0500
Subject: [PATCH] Move binder for dyn to each list item
---
src/value_and_place.rs | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/value_and_place.rs b/src/value_and_place.rs
index cb40d4ed9a6..5bcb11fd515 100644
--- a/src/value_and_place.rs
+++ b/src/value_and_place.rs
@@ -480,17 +480,19 @@ impl<'tcx> CPlace<'tcx> {
// fn(&T) -> for<'l> fn(&'l T) is allowed
}
(&ty::Dynamic(from_traits, _), &ty::Dynamic(to_traits, _)) => {
- let from_traits = fx
- .tcx
- .normalize_erasing_late_bound_regions(ParamEnv::reveal_all(), from_traits);
- let to_traits = fx
- .tcx
- .normalize_erasing_late_bound_regions(ParamEnv::reveal_all(), to_traits);
- assert_eq!(
- from_traits, to_traits,
- "Can't write trait object of incompatible traits {:?} to place with traits {:?}\n\n{:#?}",
- from_traits, to_traits, fx,
- );
+ for (from, to) in from_traits.iter().zip(to_traits) {
+ let from = fx
+ .tcx
+ .normalize_erasing_late_bound_regions(ParamEnv::reveal_all(), from);
+ let to = fx
+ .tcx
+ .normalize_erasing_late_bound_regions(ParamEnv::reveal_all(), to);
+ assert_eq!(
+ from, to,
+ "Can't write trait object of incompatible traits {:?} to place with traits {:?}\n\n{:#?}",
+ from_traits, to_traits, fx,
+ );
+ }
// dyn for<'r> Trait<'r> -> dyn Trait<'_> is allowed
}
_ => {