Skip to content

Commit 836c249

Browse files
the8472the8472
committed
adjust UI tests
1 parent 7d0cc5f commit 836c249

31 files changed

+239
-64
lines changed

‎tests/ui/abi/c-zst.aarch64-darwin.stderr‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
2222
},
2323
max_repr_align: None,
2424
unadjusted_abi_align: $SOME_ALIGN,
25+
randomization_seed: 0,
2526
},
2627
},
2728
mode: Ignore,
@@ -49,6 +50,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
4950
},
5051
max_repr_align: None,
5152
unadjusted_abi_align: $SOME_ALIGN,
53+
randomization_seed: 0,
5254
},
5355
},
5456
mode: Ignore,

‎tests/ui/abi/c-zst.powerpc-linux.stderr‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
2222
},
2323
max_repr_align: None,
2424
unadjusted_abi_align: $SOME_ALIGN,
25+
randomization_seed: 0,
2526
},
2627
},
2728
mode: Indirect {
@@ -60,6 +61,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
6061
},
6162
max_repr_align: None,
6263
unadjusted_abi_align: $SOME_ALIGN,
64+
randomization_seed: 0,
6365
},
6466
},
6567
mode: Ignore,

‎tests/ui/abi/c-zst.s390x-linux.stderr‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
2222
},
2323
max_repr_align: None,
2424
unadjusted_abi_align: $SOME_ALIGN,
25+
randomization_seed: 0,
2526
},
2627
},
2728
mode: Indirect {
@@ -60,6 +61,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
6061
},
6162
max_repr_align: None,
6263
unadjusted_abi_align: $SOME_ALIGN,
64+
randomization_seed: 0,
6365
},
6466
},
6567
mode: Ignore,

‎tests/ui/abi/c-zst.sparc64-linux.stderr‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
2222
},
2323
max_repr_align: None,
2424
unadjusted_abi_align: $SOME_ALIGN,
25+
randomization_seed: 0,
2526
},
2627
},
2728
mode: Indirect {
@@ -60,6 +61,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
6061
},
6162
max_repr_align: None,
6263
unadjusted_abi_align: $SOME_ALIGN,
64+
randomization_seed: 0,
6365
},
6466
},
6567
mode: Ignore,

‎tests/ui/abi/c-zst.x86_64-linux.stderr‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
2222
},
2323
max_repr_align: None,
2424
unadjusted_abi_align: $SOME_ALIGN,
25+
randomization_seed: 0,
2526
},
2627
},
2728
mode: Ignore,
@@ -49,6 +50,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
4950
},
5051
max_repr_align: None,
5152
unadjusted_abi_align: $SOME_ALIGN,
53+
randomization_seed: 0,
5254
},
5355
},
5456
mode: Ignore,

‎tests/ui/abi/c-zst.x86_64-pc-windows-gnu.stderr‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
2222
},
2323
max_repr_align: None,
2424
unadjusted_abi_align: $SOME_ALIGN,
25+
randomization_seed: 0,
2526
},
2627
},
2728
mode: Indirect {
@@ -60,6 +61,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
6061
},
6162
max_repr_align: None,
6263
unadjusted_abi_align: $SOME_ALIGN,
64+
randomization_seed: 0,
6365
},
6466
},
6567
mode: Ignore,

‎tests/ui/abi/debug.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
//@ normalize-stderr: "(abi|pref|unadjusted_abi_align): Align\([1-8] bytes\)" -> "$1: $$SOME_ALIGN"
2+
//@ normalize-stderr: "randomization_seed: \d+" -> "randomization_seed: $$SEED"
23
//@ normalize-stderr: "(size): Size\([48] bytes\)" -> "$1: $$SOME_SIZE"
34
//@ normalize-stderr: "(can_unwind): (true|false)" -> "$1: $$SOME_BOOL"
45
//@ normalize-stderr: "(valid_range): 0\.\.=(4294967295|18446744073709551615)" -> "$1: $$FULL"

‎tests/ui/abi/debug.stderr‎

Lines changed: 35 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ error: fn_abi_of(test) = FnAbi {
2525
},
2626
max_repr_align: None,
2727
unadjusted_abi_align: $SOME_ALIGN,
28+
randomization_seed: $SEED,
2829
},
2930
},
3031
mode: Direct(
@@ -71,6 +72,7 @@ error: fn_abi_of(test) = FnAbi {
7172
},
7273
max_repr_align: None,
7374
unadjusted_abi_align: $SOME_ALIGN,
75+
randomization_seed: $SEED,
7476
},
7577
},
7678
mode: Direct(
@@ -87,7 +89,7 @@ error: fn_abi_of(test) = FnAbi {
8789
conv: Rust,
8890
can_unwind: $SOME_BOOL,
8991
}
90-
--> $DIR/debug.rs:15:1
92+
--> $DIR/debug.rs:16:1
9193
|
9294
LL | fn test(_x: u8) -> bool { true }
9395
| ^^^^^^^^^^^^^^^^^^^^^^^
@@ -128,6 +130,7 @@ error: fn_abi_of(TestFnPtr) = FnAbi {
128130
},
129131
max_repr_align: None,
130132
unadjusted_abi_align: $SOME_ALIGN,
133+
randomization_seed: $SEED,
131134
},
132135
},
133136
mode: Direct(
@@ -165,6 +168,7 @@ error: fn_abi_of(TestFnPtr) = FnAbi {
165168
},
166169
max_repr_align: None,
167170
unadjusted_abi_align: $SOME_ALIGN,
171+
randomization_seed: $SEED,
168172
},
169173
},
170174
mode: Direct(
@@ -181,7 +185,7 @@ error: fn_abi_of(TestFnPtr) = FnAbi {
181185
conv: Rust,
182186
can_unwind: $SOME_BOOL,
183187
}
184-
--> $DIR/debug.rs:18:1
188+
--> $DIR/debug.rs:19:1
185189
|
186190
LL | type TestFnPtr = fn(bool) -> u8;
187191
| ^^^^^^^^^^^^^^
@@ -214,6 +218,7 @@ error: fn_abi_of(test_generic) = FnAbi {
214218
},
215219
max_repr_align: None,
216220
unadjusted_abi_align: $SOME_ALIGN,
221+
randomization_seed: $SEED,
217222
},
218223
},
219224
mode: Direct(
@@ -248,6 +253,7 @@ error: fn_abi_of(test_generic) = FnAbi {
248253
},
249254
max_repr_align: None,
250255
unadjusted_abi_align: $SOME_ALIGN,
256+
randomization_seed: $SEED,
251257
},
252258
},
253259
mode: Ignore,
@@ -257,13 +263,13 @@ error: fn_abi_of(test_generic) = FnAbi {
257263
conv: Rust,
258264
can_unwind: $SOME_BOOL,
259265
}
260-
--> $DIR/debug.rs:21:1
266+
--> $DIR/debug.rs:22:1
261267
|
262268
LL | fn test_generic<T>(_x: *const T) { }
263269
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
264270

265271
error: `#[rustc_abi]` can only be applied to function items, type aliases, and associated functions
266-
--> $DIR/debug.rs:24:1
272+
--> $DIR/debug.rs:25:1
267273
|
268274
LL | const C: () = ();
269275
| ^^^^^^^^^^^
@@ -296,6 +302,7 @@ error: ABIs are not compatible
296302
},
297303
max_repr_align: None,
298304
unadjusted_abi_align: $SOME_ALIGN,
305+
randomization_seed: $SEED,
299306
},
300307
},
301308
mode: Direct(
@@ -330,6 +337,7 @@ error: ABIs are not compatible
330337
},
331338
max_repr_align: None,
332339
unadjusted_abi_align: $SOME_ALIGN,
340+
randomization_seed: $SEED,
333341
},
334342
},
335343
mode: Ignore,
@@ -366,6 +374,7 @@ error: ABIs are not compatible
366374
},
367375
max_repr_align: None,
368376
unadjusted_abi_align: $SOME_ALIGN,
377+
randomization_seed: $SEED,
369378
},
370379
},
371380
mode: Direct(
@@ -400,6 +409,7 @@ error: ABIs are not compatible
400409
},
401410
max_repr_align: None,
402411
unadjusted_abi_align: $SOME_ALIGN,
412+
randomization_seed: $SEED,
403413
},
404414
},
405415
mode: Ignore,
@@ -409,7 +419,7 @@ error: ABIs are not compatible
409419
conv: Rust,
410420
can_unwind: $SOME_BOOL,
411421
}
412-
--> $DIR/debug.rs:40:1
422+
--> $DIR/debug.rs:41:1
413423
|
414424
LL | type TestAbiNe = (fn(u8), fn(u32));
415425
| ^^^^^^^^^^^^^^
@@ -439,6 +449,7 @@ error: ABIs are not compatible
439449
},
440450
max_repr_align: None,
441451
unadjusted_abi_align: $SOME_ALIGN,
452+
randomization_seed: $SEED,
442453
},
443454
},
444455
mode: Indirect {
@@ -477,6 +488,7 @@ error: ABIs are not compatible
477488
},
478489
max_repr_align: None,
479490
unadjusted_abi_align: $SOME_ALIGN,
491+
randomization_seed: $SEED,
480492
},
481493
},
482494
mode: Ignore,
@@ -510,6 +522,7 @@ error: ABIs are not compatible
510522
},
511523
max_repr_align: None,
512524
unadjusted_abi_align: $SOME_ALIGN,
525+
randomization_seed: $SEED,
513526
},
514527
},
515528
mode: Indirect {
@@ -548,6 +561,7 @@ error: ABIs are not compatible
548561
},
549562
max_repr_align: None,
550563
unadjusted_abi_align: $SOME_ALIGN,
564+
randomization_seed: $SEED,
551565
},
552566
},
553567
mode: Ignore,
@@ -557,7 +571,7 @@ error: ABIs are not compatible
557571
conv: Rust,
558572
can_unwind: $SOME_BOOL,
559573
}
560-
--> $DIR/debug.rs:43:1
574+
--> $DIR/debug.rs:44:1
561575
|
562576
LL | type TestAbiNeLarger = (fn([u8; 32]), fn([u32; 32]));
563577
| ^^^^^^^^^^^^^^^^^^^^
@@ -589,6 +603,7 @@ error: ABIs are not compatible
589603
},
590604
max_repr_align: None,
591605
unadjusted_abi_align: $SOME_ALIGN,
606+
randomization_seed: $SEED,
592607
},
593608
},
594609
mode: Direct(
@@ -623,6 +638,7 @@ error: ABIs are not compatible
623638
},
624639
max_repr_align: None,
625640
unadjusted_abi_align: $SOME_ALIGN,
641+
randomization_seed: $SEED,
626642
},
627643
},
628644
mode: Ignore,
@@ -659,6 +675,7 @@ error: ABIs are not compatible
659675
},
660676
max_repr_align: None,
661677
unadjusted_abi_align: $SOME_ALIGN,
678+
randomization_seed: $SEED,
662679
},
663680
},
664681
mode: Direct(
@@ -693,6 +710,7 @@ error: ABIs are not compatible
693710
},
694711
max_repr_align: None,
695712
unadjusted_abi_align: $SOME_ALIGN,
713+
randomization_seed: $SEED,
696714
},
697715
},
698716
mode: Ignore,
@@ -702,7 +720,7 @@ error: ABIs are not compatible
702720
conv: Rust,
703721
can_unwind: $SOME_BOOL,
704722
}
705-
--> $DIR/debug.rs:46:1
723+
--> $DIR/debug.rs:47:1
706724
|
707725
LL | type TestAbiNeFloat = (fn(f32), fn(u32));
708726
| ^^^^^^^^^^^^^^^^^^^
@@ -735,6 +753,7 @@ error: ABIs are not compatible
735753
},
736754
max_repr_align: None,
737755
unadjusted_abi_align: $SOME_ALIGN,
756+
randomization_seed: $SEED,
738757
},
739758
},
740759
mode: Direct(
@@ -769,6 +788,7 @@ error: ABIs are not compatible
769788
},
770789
max_repr_align: None,
771790
unadjusted_abi_align: $SOME_ALIGN,
791+
randomization_seed: $SEED,
772792
},
773793
},
774794
mode: Ignore,
@@ -805,6 +825,7 @@ error: ABIs are not compatible
805825
},
806826
max_repr_align: None,
807827
unadjusted_abi_align: $SOME_ALIGN,
828+
randomization_seed: $SEED,
808829
},
809830
},
810831
mode: Direct(
@@ -839,6 +860,7 @@ error: ABIs are not compatible
839860
},
840861
max_repr_align: None,
841862
unadjusted_abi_align: $SOME_ALIGN,
863+
randomization_seed: $SEED,
842864
},
843865
},
844866
mode: Ignore,
@@ -848,13 +870,13 @@ error: ABIs are not compatible
848870
conv: Rust,
849871
can_unwind: $SOME_BOOL,
850872
}
851-
--> $DIR/debug.rs:50:1
873+
--> $DIR/debug.rs:51:1
852874
|
853875
LL | type TestAbiNeSign = (fn(i32), fn(u32));
854876
| ^^^^^^^^^^^^^^^^^^
855877

856878
error[E0277]: the size for values of type `str` cannot be known at compilation time
857-
--> $DIR/debug.rs:53:46
879+
--> $DIR/debug.rs:54:46
858880
|
859881
LL | type TestAbiEqNonsense = (fn((str, str)), fn((str, str)));
860882
| ^^^^^^^^^^ doesn't have a size known at compile-time
@@ -863,7 +885,7 @@ LL | type TestAbiEqNonsense = (fn((str, str)), fn((str, str)));
863885
= note: only the last element of a tuple may have a dynamically sized type
864886

865887
error: `#[rustc_abi]` can only be applied to function items, type aliases, and associated functions
866-
--> $DIR/debug.rs:28:5
888+
--> $DIR/debug.rs:29:5
867889
|
868890
LL | const C: () = ();
869891
| ^^^^^^^^^^^
@@ -906,6 +928,7 @@ error: fn_abi_of(assoc_test) = FnAbi {
906928
},
907929
max_repr_align: None,
908930
unadjusted_abi_align: $SOME_ALIGN,
931+
randomization_seed: $SEED,
909932
},
910933
},
911934
mode: Direct(
@@ -942,6 +965,7 @@ error: fn_abi_of(assoc_test) = FnAbi {
942965
},
943966
max_repr_align: None,
944967
unadjusted_abi_align: $SOME_ALIGN,
968+
randomization_seed: $SEED,
945969
},
946970
},
947971
mode: Ignore,
@@ -951,7 +975,7 @@ error: fn_abi_of(assoc_test) = FnAbi {
951975
conv: Rust,
952976
can_unwind: $SOME_BOOL,
953977
}
954-
--> $DIR/debug.rs:33:5
978+
--> $DIR/debug.rs:34:5
955979
|
956980
LL | fn assoc_test(&self) { }
957981
| ^^^^^^^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)