From b6ab3eecec3ac81350c2ff9485744601da32f7b4 Mon Sep 17 00:00:00 2001
From: Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de>
Date: Mon, 8 Apr 2024 10:55:18 +0000
Subject: [PATCH] Normalize layout test to protect against android alignment
 differences

---
 tests/ui/type/pattern_types/range_patterns.rs |  2 ++
 .../type/pattern_types/range_patterns.stderr  | 28 +++++++++----------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/tests/ui/type/pattern_types/range_patterns.rs b/tests/ui/type/pattern_types/range_patterns.rs
index dc58b59650864..d1fd055dbab92 100644
--- a/tests/ui/type/pattern_types/range_patterns.rs
+++ b/tests/ui/type/pattern_types/range_patterns.rs
@@ -3,6 +3,8 @@
 #![feature(core_pattern_types)]
 #![allow(incomplete_features)]
 
+//@ normalize-stderr-test "pref: Align\([1-8] bytes\)" -> "pref: $$SOME_ALIGN"
+
 use std::pat::pattern_type;
 
 #[rustc_layout(debug)]
diff --git a/tests/ui/type/pattern_types/range_patterns.stderr b/tests/ui/type/pattern_types/range_patterns.stderr
index e253525e07379..8465e1b7ff275 100644
--- a/tests/ui/type/pattern_types/range_patterns.stderr
+++ b/tests/ui/type/pattern_types/range_patterns.stderr
@@ -2,7 +2,7 @@ error: layout_of(NonZero<u32>) = Layout {
            size: Size(4 bytes),
            align: AbiAndPrefAlign {
                abi: Align(4 bytes),
-               pref: Align(8 bytes),
+               pref: $SOME_ALIGN,
            },
            abi: Scalar(
                Initialized {
@@ -37,7 +37,7 @@ error: layout_of(NonZero<u32>) = Layout {
            max_repr_align: None,
            unadjusted_abi_align: Align(4 bytes),
        }
-  --> $DIR/range_patterns.rs:9:1
+  --> $DIR/range_patterns.rs:11:1
    |
 LL | type X = std::num::NonZeroU32;
    | ^^^^^^
@@ -46,7 +46,7 @@ error: layout_of((u32) is 1..=) = Layout {
            size: Size(4 bytes),
            align: AbiAndPrefAlign {
                abi: Align(4 bytes),
-               pref: Align(4 bytes),
+               pref: $SOME_ALIGN,
            },
            abi: Scalar(
                Initialized {
@@ -74,7 +74,7 @@ error: layout_of((u32) is 1..=) = Layout {
            max_repr_align: None,
            unadjusted_abi_align: Align(4 bytes),
        }
-  --> $DIR/range_patterns.rs:11:1
+  --> $DIR/range_patterns.rs:13:1
    |
 LL | type Y = pattern_type!(u32 is 1..);
    | ^^^^^^
@@ -83,7 +83,7 @@ error: layout_of(Option<(u32) is 1..=>) = Layout {
            size: Size(4 bytes),
            align: AbiAndPrefAlign {
                abi: Align(4 bytes),
-               pref: Align(8 bytes),
+               pref: $SOME_ALIGN,
            },
            abi: Scalar(
                Initialized {
@@ -122,7 +122,7 @@ error: layout_of(Option<(u32) is 1..=>) = Layout {
                        size: Size(0 bytes),
                        align: AbiAndPrefAlign {
                            abi: Align(1 bytes),
-                           pref: Align(8 bytes),
+                           pref: $SOME_ALIGN,
                        },
                        abi: Aggregate {
                            sized: true,
@@ -142,7 +142,7 @@ error: layout_of(Option<(u32) is 1..=>) = Layout {
                        size: Size(4 bytes),
                        align: AbiAndPrefAlign {
                            abi: Align(4 bytes),
-                           pref: Align(8 bytes),
+                           pref: $SOME_ALIGN,
                        },
                        abi: Scalar(
                            Initialized {
@@ -182,7 +182,7 @@ error: layout_of(Option<(u32) is 1..=>) = Layout {
            max_repr_align: None,
            unadjusted_abi_align: Align(4 bytes),
        }
-  --> $DIR/range_patterns.rs:13:1
+  --> $DIR/range_patterns.rs:15:1
    |
 LL | type Z = Option<pattern_type!(u32 is 1..)>;
    | ^^^^^^
@@ -191,7 +191,7 @@ error: layout_of(Option<NonZero<u32>>) = Layout {
            size: Size(4 bytes),
            align: AbiAndPrefAlign {
                abi: Align(4 bytes),
-               pref: Align(8 bytes),
+               pref: $SOME_ALIGN,
            },
            abi: Scalar(
                Initialized {
@@ -230,7 +230,7 @@ error: layout_of(Option<NonZero<u32>>) = Layout {
                        size: Size(0 bytes),
                        align: AbiAndPrefAlign {
                            abi: Align(1 bytes),
-                           pref: Align(8 bytes),
+                           pref: $SOME_ALIGN,
                        },
                        abi: Aggregate {
                            sized: true,
@@ -250,7 +250,7 @@ error: layout_of(Option<NonZero<u32>>) = Layout {
                        size: Size(4 bytes),
                        align: AbiAndPrefAlign {
                            abi: Align(4 bytes),
-                           pref: Align(8 bytes),
+                           pref: $SOME_ALIGN,
                        },
                        abi: Scalar(
                            Initialized {
@@ -290,7 +290,7 @@ error: layout_of(Option<NonZero<u32>>) = Layout {
            max_repr_align: None,
            unadjusted_abi_align: Align(4 bytes),
        }
-  --> $DIR/range_patterns.rs:15:1
+  --> $DIR/range_patterns.rs:17:1
    |
 LL | type A = Option<std::num::NonZeroU32>;
    | ^^^^^^
@@ -299,7 +299,7 @@ error: layout_of(NonZeroU32New) = Layout {
            size: Size(4 bytes),
            align: AbiAndPrefAlign {
                abi: Align(4 bytes),
-               pref: Align(8 bytes),
+               pref: $SOME_ALIGN,
            },
            abi: Scalar(
                Initialized {
@@ -334,7 +334,7 @@ error: layout_of(NonZeroU32New) = Layout {
            max_repr_align: None,
            unadjusted_abi_align: Align(4 bytes),
        }
-  --> $DIR/range_patterns.rs:17:1
+  --> $DIR/range_patterns.rs:19:1
    |
 LL | struct NonZeroU32New(pattern_type!(u32 is 1..));
    | ^^^^^^^^^^^^^^^^^^^^