Skip to content

Commit e58775b

Browse files
committed
Auto merge of #124008 - nnethercote:simpler-static_assert_size, r=Nilstrieb
Simplify `static_assert_size`s. We want to run them on all 64-bit platforms. r? `@ghost`
2 parents e84e0bd + 1302a4b commit e58775b

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/machine.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -241,12 +241,12 @@ pub enum ProvenanceExtra {
241241
Wildcard,
242242
}
243243

244-
#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
244+
#[cfg(target_pointer_width = "64")]
245245
static_assert_size!(Pointer<Provenance>, 24);
246246
// FIXME: this would with in 24bytes but layout optimizations are not smart enough
247-
// #[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
247+
// #[cfg(target_pointer_width = "64")]
248248
//static_assert_size!(Pointer<Option<Provenance>>, 24);
249-
#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
249+
#[cfg(target_pointer_width = "64")]
250250
static_assert_size!(Scalar<Provenance>, 32);
251251

252252
impl fmt::Debug for Provenance {

0 commit comments

Comments
 (0)