Skip to content

Commit b36924b

Browse files
committed
Clarify Layout interning.
`Layout` is another type that is sometimes interned, sometimes not, and we always use references to refer to it so we can't take any advantage of the uniqueness properties for hashing or equality checks. This commit renames `Layout` as `LayoutS`, and then introduces a new `Layout` that is a newtype around an `Interned<LayoutS>`. It also interns more layouts than before. Previously layouts within layouts (via the `variants` field) were never interned, but now they are. Hence the lifetime on the new `Layout` type. Unlike other interned types, these ones are in `rustc_target` instead of `rustc_middle`. This reflects the existing structure of the code, which does layout-specific stuff in `rustc_target` while `TyAndLayout` is generic over the `Ty`, allowing the type-specific stuff to occur in `rustc_middle`. The commit also adds a `HashStable` impl for `Interned`, which was needed. It hashes the contents, unlike the `Hash` impl which hashes the pointer.
1 parent 96eb116 commit b36924b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

clippy_lints/src/transmute/transmute_undefined_repr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ fn is_zero_sized_ty<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'tcx>) -> bool {
326326
if let Ok(ty) = cx.tcx.try_normalize_erasing_regions(cx.param_env, ty);
327327
if let Ok(layout) = cx.tcx.layout_of(cx.param_env.and(ty));
328328
then {
329-
layout.layout.size.bytes() == 0
329+
layout.layout.size().bytes() == 0
330330
} else {
331331
false
332332
}

0 commit comments

Comments
 (0)