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`

Author: bors

compiler/rustc_ast/src/ast.rs

@@ -3367,7 +3367,7 @@ impl TryFrom<ItemKind> for ForeignItemKind {
 pubtypeForeignItem = Item<ForeignItemKind>;
 
 // Some nodes are used a lot. Make sure they don't unintentionally get bigger.
-#[cfg(all(any(target_arch = "x86_64", target_arch = "aarch64"),target_pointer_width = "64"))]
+#[cfg(target_pointer_width = "64")]
 mod size_asserts {
 usesuper::*;
 use rustc_data_structures::static_assert_size;

compiler/rustc_ast/src/token.rs

@@ -1023,7 +1023,7 @@ where
 }
 
 // Some types are used a lot. Make sure they don't unintentionally get bigger.
-#[cfg(all(any(target_arch = "x86_64", target_arch = "aarch64"),target_pointer_width = "64"))]
+#[cfg(target_pointer_width = "64")]
 mod size_asserts {
 usesuper::*;
 use rustc_data_structures::static_assert_size;

compiler/rustc_ast/src/tokenstream.rs

@@ -768,7 +768,7 @@ impl DelimSpacing {
 }
 
 // Some types are used a lot. Make sure they don't unintentionally get bigger.
-#[cfg(all(any(target_arch = "x86_64", target_arch = "aarch64"),target_pointer_width = "64"))]
+#[cfg(target_pointer_width = "64")]
 mod size_asserts {
 usesuper::*;
 use rustc_data_structures::static_assert_size;

compiler/rustc_const_eval/src/interpret/operand.rs

@@ -792,7 +792,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
 }
 
 // Some nodes are used a lot. Make sure they don't unintentionally get bigger.
-#[cfg(all(any(target_arch = "x86_64", target_arch = "aarch64"),target_pointer_width = "64"))]
+#[cfg(target_pointer_width = "64")]
 mod size_asserts {
 usesuper::*;
 use rustc_data_structures::static_assert_size;

compiler/rustc_const_eval/src/interpret/place.rs

@@ -1058,7 +1058,7 @@ where
 }
 
 // Some nodes are used a lot. Make sure they don't unintentionally get bigger.
-#[cfg(all(any(target_arch = "x86_64", target_arch = "aarch64"),target_pointer_width = "64"))]
+#[cfg(target_pointer_width = "64")]
 mod size_asserts {
 usesuper::*;
 use rustc_data_structures::static_assert_size;

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(any(target_arch = "x86_64", target_arch = "aarch64"),target_pointer_width = "64"))]
+#[cfg(target_pointer_width = "64")]
 rustc_data_structures::static_assert_size!(PResult<'_,()>,16);
-#[cfg(all(any(target_arch = "x86_64", target_arch = "aarch64"),target_pointer_width = "64"))]
+#[cfg(target_pointer_width = "64")]
 rustc_data_structures::static_assert_size!(PResult<'_,bool>,16);
 
 #[derive(Debug,PartialEq,Eq,Clone,Copy,Hash,Encodable,Decodable)]

compiler/rustc_expand/src/mbe/macro_parser.rs

@@ -266,7 +266,7 @@ struct MatcherPos {
 }
 
 // This type is used a lot. Make sure it doesn't unintentionally get bigger.
-#[cfg(all(any(target_arch = "x86_64", target_arch = "aarch64"),target_pointer_width = "64"))]
+#[cfg(target_pointer_width = "64")]
 rustc_data_structures::static_assert_size!(MatcherPos,16);
 
 implMatcherPos{

compiler/rustc_hir/src/hir.rs

@@ -3786,7 +3786,7 @@ impl<'hir> Node<'hir> {
 }
 
 // Some nodes are used a lot. Make sure they don't unintentionally get bigger.
-#[cfg(all(any(target_arch = "x86_64", target_arch = "aarch64"),target_pointer_width = "64"))]
+#[cfg(target_pointer_width = "64")]
 mod size_asserts {
 usesuper::*;
 // tidy-alphabetical-start

compiler/rustc_index/src/bit_set.rs

@@ -400,7 +400,7 @@ enum Chunk {
 }
 
 // This type is used a lot. Make sure it doesn't unintentionally get bigger.
-#[cfg(all(any(target_arch = "x86_64", target_arch = "aarch64"),target_pointer_width = "64"))]
+#[cfg(target_pointer_width = "64")]
 crate::static_assert_size!(Chunk,16);
 
 impl<T>ChunkedBitSet<T>{

compiler/rustc_infer/src/infer/mod.rs

@@ -477,7 +477,7 @@ pub enum SubregionOrigin<'tcx> {
 }
 
 // `SubregionOrigin` is used a lot. Make sure it doesn't unintentionally get bigger.
-#[cfg(all(any(target_arch = "x86_64", target_arch = "aarch64"),target_pointer_width = "64"))]
+#[cfg(target_pointer_width = "64")]
 static_assert_size!(SubregionOrigin<'_>,32);
 
 impl<'tcx>SubregionOrigin<'tcx>{