diff options
| author | bors <bors@rust-lang.org> | 2024-04-04 02:11:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-04-04 02:11:23 +0000 |
| commit | 0accf4ec4c07d23aa86f6a97aeb8797941abc30e (patch) | |
| tree | ab849cc7c6e716b055a495d0a690b4965738bb73 /compiler/rustc_errors | |
| parent | b4acbe4233b97ec51605c513ce6b215470574f80 (diff) | |
| parent | 4332498a6daff23e4403d9bce43d97ed63cad382 (diff) | |
| download | rust-0accf4ec4c07d23aa86f6a97aeb8797941abc30e.tar.gz rust-0accf4ec4c07d23aa86f6a97aeb8797941abc30e.zip | |
Auto merge of #123440 - jhpratt:rollup-yat6crk, r=jhpratt
Rollup of 4 pull requests Successful merges: - #122356 (std::rand: fix dragonflybsd after #121942.) - #123093 (Add a nice header to our README.md) - #123307 (Fix f16 and f128 feature gating on different editions) - #123401 (Check `x86_64` size assertions on `aarch64`, too) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_errors')
| -rw-r--r-- | compiler/rustc_errors/src/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_errors/src/lib.rs b/compiler/rustc_errors/src/lib.rs index bcfe451d308..b4107bd4a2b 100644 --- a/compiler/rustc_errors/src/lib.rs +++ b/compiler/rustc_errors/src/lib.rs @@ -102,9 +102,9 @@ pub type PResult<'a, T> = Result<T, PErr<'a>>; rustc_fluent_macro::fluent_messages! { "../messages.ftl" } // `PResult` is used a lot. Make sure it doesn't unintentionally get bigger. -#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))] +#[cfg(all(any(target_arch = "x86_64", target_arch = "aarch64"), target_pointer_width = "64"))] rustc_data_structures::static_assert_size!(PResult<'_, ()>, 16); -#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))] +#[cfg(all(any(target_arch = "x86_64", target_arch = "aarch64"), target_pointer_width = "64"))] rustc_data_structures::static_assert_size!(PResult<'_, bool>, 16); #[derive(Debug, PartialEq, Eq, Clone, Copy, Hash, Encodable, Decodable)] |