Normalize layout test to protect against android alignment differences · rust-lang/rust@18ff131 (original) (raw)

`@@ -2,7 +2,7 @@ error: layout_of(NonZero) = Layout {

`

2

2

` size: Size(4 bytes),

`

3

3

` align: AbiAndPrefAlign {

`

4

4

` abi: Align(4 bytes),

`

5

``

`-

pref: Align(8 bytes),

`

``

5

`+

pref: $SOME_ALIGN,

`

6

6

` },

`

7

7

` abi: Scalar(

`

8

8

` Initialized {

`

`@@ -37,7 +37,7 @@ error: layout_of(NonZero) = Layout {

`

37

37

` max_repr_align: None,

`

38

38

` unadjusted_abi_align: Align(4 bytes),

`

39

39

` }

`

40

``

`-

--> $DIR/range_patterns.rs:9:1

`

``

40

`+

--> $DIR/range_patterns.rs:11:1

`

41

41

` |

`

42

42

`LL | type X = std::num::NonZeroU32;

`

43

43

` | ^^^^^^

`

`@@ -46,7 +46,7 @@ error: layout_of((u32) is 1..=) = Layout {

`

46

46

` size: Size(4 bytes),

`

47

47

` align: AbiAndPrefAlign {

`

48

48

` abi: Align(4 bytes),

`

49

``

`-

pref: Align(4 bytes),

`

``

49

`+

pref: $SOME_ALIGN,

`

50

50

` },

`

51

51

` abi: Scalar(

`

52

52

` Initialized {

`

`@@ -74,7 +74,7 @@ error: layout_of((u32) is 1..=) = Layout {

`

74

74

` max_repr_align: None,

`

75

75

` unadjusted_abi_align: Align(4 bytes),

`

76

76

` }

`

77

``

`-

--> $DIR/range_patterns.rs:11:1

`

``

77

`+

--> $DIR/range_patterns.rs:13:1

`

78

78

` |

`

79

79

`LL | type Y = pattern_type!(u32 is 1..);

`

80

80

` | ^^^^^^

`

`@@ -83,7 +83,7 @@ error: layout_of(Option<(u32) is 1..=>) = Layout {

`

83

83

` size: Size(4 bytes),

`

84

84

` align: AbiAndPrefAlign {

`

85

85

` abi: Align(4 bytes),

`

86

``

`-

pref: Align(8 bytes),

`

``

86

`+

pref: $SOME_ALIGN,

`

87

87

` },

`

88

88

` abi: Scalar(

`

89

89

` Initialized {

`

`@@ -122,7 +122,7 @@ error: layout_of(Option<(u32) is 1..=>) = Layout {

`

122

122

` size: Size(0 bytes),

`

123

123

` align: AbiAndPrefAlign {

`

124

124

` abi: Align(1 bytes),

`

125

``

`-

pref: Align(8 bytes),

`

``

125

`+

pref: $SOME_ALIGN,

`

126

126

` },

`

127

127

` abi: Aggregate {

`

128

128

` sized: true,

`

`@@ -142,7 +142,7 @@ error: layout_of(Option<(u32) is 1..=>) = Layout {

`

142

142

` size: Size(4 bytes),

`

143

143

` align: AbiAndPrefAlign {

`

144

144

` abi: Align(4 bytes),

`

145

``

`-

pref: Align(8 bytes),

`

``

145

`+

pref: $SOME_ALIGN,

`

146

146

` },

`

147

147

` abi: Scalar(

`

148

148

` Initialized {

`

`@@ -182,7 +182,7 @@ error: layout_of(Option<(u32) is 1..=>) = Layout {

`

182

182

` max_repr_align: None,

`

183

183

` unadjusted_abi_align: Align(4 bytes),

`

184

184

` }

`

185

``

`-

--> $DIR/range_patterns.rs:13:1

`

``

185

`+

--> $DIR/range_patterns.rs:15:1

`

186

186

` |

`

187

187

`LL | type Z = Option<pattern_type!(u32 is 1..)>;

`

188

188

` | ^^^^^^

`

`@@ -191,7 +191,7 @@ error: layout_of(Option<NonZero>) = Layout {

`

191

191

` size: Size(4 bytes),

`

192

192

` align: AbiAndPrefAlign {

`

193

193

` abi: Align(4 bytes),

`

194

``

`-

pref: Align(8 bytes),

`

``

194

`+

pref: $SOME_ALIGN,

`

195

195

` },

`

196

196

` abi: Scalar(

`

197

197

` Initialized {

`

`@@ -230,7 +230,7 @@ error: layout_of(Option<NonZero>) = Layout {

`

230

230

` size: Size(0 bytes),

`

231

231

` align: AbiAndPrefAlign {

`

232

232

` abi: Align(1 bytes),

`

233

``

`-

pref: Align(8 bytes),

`

``

233

`+

pref: $SOME_ALIGN,

`

234

234

` },

`

235

235

` abi: Aggregate {

`

236

236

` sized: true,

`

`@@ -250,7 +250,7 @@ error: layout_of(Option<NonZero>) = Layout {

`

250

250

` size: Size(4 bytes),

`

251

251

` align: AbiAndPrefAlign {

`

252

252

` abi: Align(4 bytes),

`

253

``

`-

pref: Align(8 bytes),

`

``

253

`+

pref: $SOME_ALIGN,

`

254

254

` },

`

255

255

` abi: Scalar(

`

256

256

` Initialized {

`

`@@ -290,7 +290,7 @@ error: layout_of(Option<NonZero>) = Layout {

`

290

290

` max_repr_align: None,

`

291

291

` unadjusted_abi_align: Align(4 bytes),

`

292

292

` }

`

293

``

`-

--> $DIR/range_patterns.rs:15:1

`

``

293

`+

--> $DIR/range_patterns.rs:17:1

`

294

294

` |

`

295

295

`LL | type A = Optionstd::num::NonZeroU32;

`

296

296

` | ^^^^^^

`

`@@ -299,7 +299,7 @@ error: layout_of(NonZeroU32New) = Layout {

`

299

299

` size: Size(4 bytes),

`

300

300

` align: AbiAndPrefAlign {

`

301

301

` abi: Align(4 bytes),

`

302

``

`-

pref: Align(8 bytes),

`

``

302

`+

pref: $SOME_ALIGN,

`

303

303

` },

`

304

304

` abi: Scalar(

`

305

305

` Initialized {

`

`@@ -334,7 +334,7 @@ error: layout_of(NonZeroU32New) = Layout {

`

334

334

` max_repr_align: None,

`

335

335

` unadjusted_abi_align: Align(4 bytes),

`

336

336

` }

`

337

``

`-

--> $DIR/range_patterns.rs:17:1

`

``

337

`+

--> $DIR/range_patterns.rs:19:1

`

338

338

` |

`

339

339

`LL | struct NonZeroU32New(pattern_type!(u32 is 1..));

`

340

340

` | ^^^^^^^^^^^^^^^^^^^^

`