diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-02-26 16:06:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-26 16:06:05 +0100 |
| commit | 81eddb3dac4836ece0b7180b6672786fbe5e08b5 (patch) | |
| tree | 1742f1f71be6b711488af9695840d2ff2ad45b7d | |
| parent | 218be2771d89907ff704b9a3561c3fa96899a991 (diff) | |
| parent | 297abc35b3625335a6aa9c3541be040ac040cbe9 (diff) | |
| download | rust-81eddb3dac4836ece0b7180b6672786fbe5e08b5.tar.gz rust-81eddb3dac4836ece0b7180b6672786fbe5e08b5.zip | |
Rollup merge of #121629 - RalfJung:field-shuffle-seed, r=oli-obk
fix some references to no-longer-existing ReprOptions.layout_seed Seems like the field got renamed but some comments not updated.
| -rw-r--r-- | compiler/rustc_abi/src/layout.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_abi/src/lib.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_abi/src/layout.rs b/compiler/rustc_abi/src/layout.rs index ec3ab828b71..28e148bddb2 100644 --- a/compiler/rustc_abi/src/layout.rs +++ b/compiler/rustc_abi/src/layout.rs @@ -958,7 +958,7 @@ fn univariant< #[cfg(feature = "randomize")] { use rand::{seq::SliceRandom, SeedableRng}; - // `ReprOptions.layout_seed` is a deterministic seed we can use to randomize field + // `ReprOptions.field_shuffle_seed` is a deterministic seed we can use to randomize field // ordering. let mut rng = rand_xoshiro::Xoshiro128StarStar::seed_from_u64(repr.field_shuffle_seed); diff --git a/compiler/rustc_abi/src/lib.rs b/compiler/rustc_abi/src/lib.rs index c45a4a410f9..297dbf89029 100644 --- a/compiler/rustc_abi/src/lib.rs +++ b/compiler/rustc_abi/src/lib.rs @@ -41,7 +41,7 @@ bitflags! { // Internal only for now. If true, don't reorder fields. const IS_LINEAR = 1 << 3; // If true, the type's layout can be randomized using - // the seed stored in `ReprOptions.layout_seed` + // the seed stored in `ReprOptions.field_shuffle_seed` const RANDOMIZE_LAYOUT = 1 << 4; // Any of these flags being set prevent field reordering optimisation. const IS_UNOPTIMISABLE = ReprFlags::IS_C.bits() |