diff options
| author | bors <bors@rust-lang.org> | 2024-04-18 09:47:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-04-18 09:47:45 +0000 |
| commit | c25473ff62a99541426423e8ef41c63d71e0a4a0 (patch) | |
| tree | 46ca631c35429db07d94ab05061a17206664caf9 /compiler/rustc_trait_selection/src | |
| parent | ecd45472f800ee946e23cd68361f4ce5ccaf9433 (diff) | |
| parent | 0d97669a171d3d5c9c9c2d3437421d2d35d9bbb5 (diff) | |
| download | rust-c25473ff62a99541426423e8ef41c63d71e0a4a0.tar.gz rust-c25473ff62a99541426423e8ef41c63d71e0a4a0.zip | |
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`
Diffstat (limited to 'compiler/rustc_trait_selection/src')
| -rw-r--r-- | compiler/rustc_trait_selection/src/lib.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_trait_selection/src/traits/fulfill.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_trait_selection/src/lib.rs b/compiler/rustc_trait_selection/src/lib.rs index 057d00aeae8..d54f714b22c 100644 --- a/compiler/rustc_trait_selection/src/lib.rs +++ b/compiler/rustc_trait_selection/src/lib.rs @@ -31,7 +31,7 @@ #[macro_use] extern crate rustc_macros; -#[cfg(all(any(target_arch = "x86_64", target_arch = "aarch64"), target_pointer_width = "64"))] +#[cfg(target_pointer_width = "64")] #[macro_use] extern crate rustc_data_structures; #[macro_use] diff --git a/compiler/rustc_trait_selection/src/traits/fulfill.rs b/compiler/rustc_trait_selection/src/traits/fulfill.rs index a04a3bc6ebe..fbff78304ac 100644 --- a/compiler/rustc_trait_selection/src/traits/fulfill.rs +++ b/compiler/rustc_trait_selection/src/traits/fulfill.rs @@ -72,7 +72,7 @@ pub struct PendingPredicateObligation<'tcx> { } // `PendingPredicateObligation` 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!(PendingPredicateObligation<'_>, 72); impl<'tcx> FulfillmentContext<'tcx> { |