Skip to content

Commit 41ca9b7

Browse files
committed
Auto merge of #135319 - matthiaskrgr:rollup-un5lol6, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #133088 (`-Zrandomize-layout` harder. `Foo<T> != Foo<U>`) - #134619 (Improve prose around `as_slice` example of IterMut) - #134855 (Add `default_field_values` entry to unstable book) - #134908 (Fix `ptr::from_ref` documentation example comment) - #135275 (Add Pin::as_deref_mut to 1.84 relnotes) - #135294 (Make `bare-fn-no-impl-fn-ptr-99875` test less dependent on path width) - #135304 (Add tests cases from review of #132289) - #135308 (Make sure to walk into nested const blocks in `RegionResolutionVisitor`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents f22e634 + ef67bf2 commit 41ca9b7

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

crates/hir-ty/src/layout.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ fn layout_of_simd_ty(
197197
align,
198198
max_repr_align: None,
199199
unadjusted_abi_align: align.abi,
200+
randomization_seed: 0,
200201
}))
201202
}
202203

@@ -313,6 +314,7 @@ pub fn layout_of_ty_query(
313314
size,
314315
max_repr_align: None,
315316
unadjusted_abi_align: element.align.abi,
317+
randomization_seed: 0,
316318
}
317319
}
318320
TyKind::Slice(element) => {
@@ -326,6 +328,7 @@ pub fn layout_of_ty_query(
326328
size: Size::ZERO,
327329
max_repr_align: None,
328330
unadjusted_abi_align: element.align.abi,
331+
randomization_seed: 0,
329332
}
330333
}
331334
TyKind::Str => Layout {
@@ -337,6 +340,7 @@ pub fn layout_of_ty_query(
337340
size: Size::ZERO,
338341
max_repr_align: None,
339342
unadjusted_abi_align: dl.i8_align.abi,
343+
randomization_seed: 0,
340344
},
341345
// Potentially-wide pointers.
342346
TyKind::Ref(_, _, pointee) | TyKind::Raw(_, pointee) => {

0 commit comments

Comments
 (0)