diff options
| author | bors <bors@rust-lang.org> | 2022-09-07 23:40:06 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-09-07 23:40:06 +0000 |
| commit | 512bd84f51ba6963c84506f408840e5341abe499 (patch) | |
| tree | f1c82de1bcea080bf93b98d6a40c2ddd5f503d63 /compiler/rustc_errors/src | |
| parent | c2804e6ec2c29a5c7368600ea173b890e2655c3d (diff) | |
| parent | d7a750b50436fbd228b176f6438566625e235990 (diff) | |
| download | rust-512bd84f51ba6963c84506f408840e5341abe499.tar.gz rust-512bd84f51ba6963c84506f408840e5341abe499.zip | |
Auto merge of #94075 - mikebenfield:wip-enum, r=oli-obk
Use niche-filling optimization even when multiple variants have data. Fixes #46213
Diffstat (limited to 'compiler/rustc_errors/src')
| -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 37ff6dcff7d..513225e1606 100644 --- a/compiler/rustc_errors/src/lib.rs +++ b/compiler/rustc_errors/src/lib.rs @@ -69,8 +69,8 @@ pub type PResult<'a, T> = Result<T, DiagnosticBuilder<'a, ErrorGuaranteed>>; // (See also the comment on `DiagnosticBuilder`'s `diagnostic` field.) #[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))] rustc_data_structures::static_assert_size!(PResult<'_, ()>, 16); -#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))] -rustc_data_structures::static_assert_size!(PResult<'_, bool>, 24); +#[cfg(all(target_arch = "x86_64", target_pointer_width = "64", not(bootstrap)))] +rustc_data_structures::static_assert_size!(PResult<'_, bool>, 16); #[derive(Debug, PartialEq, Eq, Clone, Copy, Hash, Encodable, Decodable)] pub enum SuggestionStyle { |