Rollup of 8 pull requests

compiler/rustc_borrowck/src/type_check/mod.rs

@@ -584,6 +584,7 @@ impl<'a, 'b, 'tcx> TypeVerifier<'a, 'b, 'tcx> {
  // modify their locations.
  let all_facts = &mut None;
  let mut constraints = Default::default();
+ let mut type_tests = Default::default();
  let mut closure_bounds = Default::default();
  let mut liveness_constraints =
  LivenessValues::new(Rc::new(RegionValueElements::new(&promoted_body)));
@@ -595,6 +596,7 @@ impl<'a, 'b, 'tcx> TypeVerifier<'a, 'b, 'tcx> {
  &mut this.cx.borrowck_context.constraints.outlives_constraints,
  &mut constraints,
  );
+ mem::swap(&mut this.cx.borrowck_context.constraints.type_tests, &mut type_tests);
  mem::swap(
  &mut this.cx.borrowck_context.constraints.closure_bounds_mapping,
  &mut closure_bounds,
@@ -619,6 +621,13 @@ impl<'a, 'b, 'tcx> TypeVerifier<'a, 'b, 'tcx> {
  swap_constraints(self);
 
  let locations = location.to_locations();
+
+ // Use location of promoted const in collected constraints
+ for type_test in type_tests.iter() {
+ let mut type_test = type_test.clone();
+ type_test.locations = locations;
+ self.cx.borrowck_context.constraints.type_tests.push(type_test)
+ }
  for constraint in constraints.outlives().iter() {
  let mut constraint = constraint.clone();
  constraint.locations = locations;

compiler/rustc_error_messages/locales/en-US/middle.ftl

@@ -18,3 +18,12 @@ middle_limit_invalid =
 
 middle_const_eval_non_int =
  constant evaluation of enum discriminant resulted in non-integer
+
+middle_unknown_layout =
+ the type `{$ty}` has an unknown layout
+
+middle_values_too_big =
+ values of the type `{$ty}` are too big for the current architecture
+
+middle_cannot_be_normalized =
+ unable to determine layout for `{$ty}` because `{$failure_ty}` cannot be normalized