From: Ralf Jung <post@ralfj.de>
Date: Thu, 2 Apr 2020 07:19:56 +0000 (+0200)
Subject: fix for FieldPlacement rename
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=5ce2466892126a3ea92138df67f09243a22dcb96;p=rust.git

fix for FieldPlacement rename
---

diff --git a/src/helpers.rs b/src/helpers.rs
index 827bf1f9dde..7b1ac1aacfc 100644
--- a/src/helpers.rs
+++ b/src/helpers.rs
@@ -324,19 +324,19 @@ fn visit_aggregate(
                 fields: impl Iterator<Item = InterpResult<'tcx, MPlaceTy<'tcx, Tag>>>,
             ) -> InterpResult<'tcx> {
                 match place.layout.fields {
-                    layout::FieldPlacement::Array { .. } => {
+                    layout::FieldsShape::Array { .. } => {
                         // For the array layout, we know the iterator will yield sorted elements so
                         // we can avoid the allocation.
                         self.walk_aggregate(place, fields)
                     }
-                    layout::FieldPlacement::Arbitrary { .. } => {
+                    layout::FieldsShape::Arbitrary { .. } => {
                         // Gather the subplaces and sort them before visiting.
                         let mut places =
                             fields.collect::<InterpResult<'tcx, Vec<MPlaceTy<'tcx, Tag>>>>()?;
                         places.sort_by_key(|place| place.ptr.assert_ptr().offset);
                         self.walk_aggregate(place, places.into_iter().map(Ok))
                     }
-                    layout::FieldPlacement::Union { .. } => {
+                    layout::FieldsShape::Union { .. } => {
                         // Uh, what?
                         bug!("a union is not an aggregate we should ever visit")
                     }