Skip to content

Commit 64bec0f

Browse files
workingjubileeworkingjubilee
committed
Fix tests/ui/abi/debug.rs to cross-compile for riscv64
1 parent 57d989b commit 64bec0f

File tree

3 files changed

+32
-31
lines changed

3 files changed

+32
-31
lines changed

‎tests/ui/abi/debug.generic.stderr

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ error: fn_abi_of(test) = FnAbi {
8989
conv: Rust,
9090
can_unwind: $SOME_BOOL,
9191
}
92-
--> $DIR/debug.rs:19:1
92+
--> $DIR/debug.rs:27:1
9393
|
94-
LL | fn test(_x: u8) -> bool { true }
94+
LL | fn test(_x: u8) -> bool {
9595
| ^^^^^^^^^^^^^^^^^^^^^^^
9696

9797
error: fn_abi_of(TestFnPtr) = FnAbi {
@@ -185,7 +185,7 @@ error: fn_abi_of(TestFnPtr) = FnAbi {
185185
conv: Rust,
186186
can_unwind: $SOME_BOOL,
187187
}
188-
--> $DIR/debug.rs:22:1
188+
--> $DIR/debug.rs:33:1
189189
|
190190
LL | type TestFnPtr = fn(bool) -> u8;
191191
| ^^^^^^^^^^^^^^
@@ -263,13 +263,13 @@ error: fn_abi_of(test_generic) = FnAbi {
263263
conv: Rust,
264264
can_unwind: $SOME_BOOL,
265265
}
266-
--> $DIR/debug.rs:25:1
266+
--> $DIR/debug.rs:36:1
267267
|
268-
LL | fn test_generic<T>(_x: *const T) { }
268+
LL | fn test_generic<T>(_x: *const T) {}
269269
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
270270

271271
error: `#[rustc_abi]` can only be applied to function items, type aliases, and associated functions
272-
--> $DIR/debug.rs:28:1
272+
--> $DIR/debug.rs:39:1
273273
|
274274
LL | const C: () = ();
275275
| ^^^^^^^^^^^
@@ -419,7 +419,7 @@ error: ABIs are not compatible
419419
conv: Rust,
420420
can_unwind: $SOME_BOOL,
421421
}
422-
--> $DIR/debug.rs:44:1
422+
--> $DIR/debug.rs:55:1
423423
|
424424
LL | type TestAbiNe = (fn(u8), fn(u32));
425425
| ^^^^^^^^^^^^^^
@@ -571,7 +571,7 @@ error: ABIs are not compatible
571571
conv: Rust,
572572
can_unwind: $SOME_BOOL,
573573
}
574-
--> $DIR/debug.rs:47:1
574+
--> $DIR/debug.rs:58:1
575575
|
576576
LL | type TestAbiNeLarger = (fn([u8; 32]), fn([u32; 32]));
577577
| ^^^^^^^^^^^^^^^^^^^^
@@ -720,7 +720,7 @@ error: ABIs are not compatible
720720
conv: Rust,
721721
can_unwind: $SOME_BOOL,
722722
}
723-
--> $DIR/debug.rs:50:1
723+
--> $DIR/debug.rs:61:1
724724
|
725725
LL | type TestAbiNeFloat = (fn(f32), fn(u32));
726726
| ^^^^^^^^^^^^^^^^^^^
@@ -870,13 +870,13 @@ error: ABIs are not compatible
870870
conv: Rust,
871871
can_unwind: $SOME_BOOL,
872872
}
873-
--> $DIR/debug.rs:54:1
873+
--> $DIR/debug.rs:65:1
874874
|
875875
LL | type TestAbiNeSign = (fn(i32), fn(u32));
876876
| ^^^^^^^^^^^^^^^^^^
877877

878878
error[E0277]: the size for values of type `str` cannot be known at compilation time
879-
--> $DIR/debug.rs:57:46
879+
--> $DIR/debug.rs:68:46
880880
|
881881
LL | type TestAbiEqNonsense = (fn((str, str)), fn((str, str)));
882882
| ^^^^^^^^^^ doesn't have a size known at compile-time
@@ -885,13 +885,13 @@ LL | type TestAbiEqNonsense = (fn((str, str)), fn((str, str)));
885885
= note: only the last element of a tuple may have a dynamically sized type
886886

887887
error: unrecognized argument
888-
--> $DIR/debug.rs:59:13
888+
--> $DIR/debug.rs:70:13
889889
|
890890
LL | #[rustc_abi("assert_eq")]
891891
| ^^^^^^^^^^^
892892

893893
error: `#[rustc_abi]` can only be applied to function items, type aliases, and associated functions
894-
--> $DIR/debug.rs:32:5
894+
--> $DIR/debug.rs:43:5
895895
|
896896
LL | const C: () = ();
897897
| ^^^^^^^^^^^
@@ -981,9 +981,9 @@ error: fn_abi_of(assoc_test) = FnAbi {
981981
conv: Rust,
982982
can_unwind: $SOME_BOOL,
983983
}
984-
--> $DIR/debug.rs:37:5
984+
--> $DIR/debug.rs:48:5
985985
|
986-
LL | fn assoc_test(&self) { }
986+
LL | fn assoc_test(&self) {}
987987
| ^^^^^^^^^^^^^^^^^^^^
988988

989989
error: aborting due to 12 previous errors

‎tests/ui/abi/debug.riscv64.stderr

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ error: fn_abi_of(test) = FnAbi {
8989
conv: Rust,
9090
can_unwind: $SOME_BOOL,
9191
}
92-
--> $DIR/debug.rs:19:1
92+
--> $DIR/debug.rs:27:1
9393
|
94-
LL | fn test(_x: u8) -> bool { true }
94+
LL | fn test(_x: u8) -> bool {
9595
| ^^^^^^^^^^^^^^^^^^^^^^^
9696

9797
error: fn_abi_of(TestFnPtr) = FnAbi {
@@ -185,7 +185,7 @@ error: fn_abi_of(TestFnPtr) = FnAbi {
185185
conv: Rust,
186186
can_unwind: $SOME_BOOL,
187187
}
188-
--> $DIR/debug.rs:22:1
188+
--> $DIR/debug.rs:33:1
189189
|
190190
LL | type TestFnPtr = fn(bool) -> u8;
191191
| ^^^^^^^^^^^^^^
@@ -263,13 +263,13 @@ error: fn_abi_of(test_generic) = FnAbi {
263263
conv: Rust,
264264
can_unwind: $SOME_BOOL,
265265
}
266-
--> $DIR/debug.rs:25:1
266+
--> $DIR/debug.rs:36:1
267267
|
268-
LL | fn test_generic<T>(_x: *const T) { }
268+
LL | fn test_generic<T>(_x: *const T) {}
269269
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
270270

271271
error: `#[rustc_abi]` can only be applied to function items, type aliases, and associated functions
272-
--> $DIR/debug.rs:28:1
272+
--> $DIR/debug.rs:39:1
273273
|
274274
LL | const C: () = ();
275275
| ^^^^^^^^^^^
@@ -419,7 +419,7 @@ error: ABIs are not compatible
419419
conv: Rust,
420420
can_unwind: $SOME_BOOL,
421421
}
422-
--> $DIR/debug.rs:44:1
422+
--> $DIR/debug.rs:55:1
423423
|
424424
LL | type TestAbiNe = (fn(u8), fn(u32));
425425
| ^^^^^^^^^^^^^^
@@ -571,7 +571,7 @@ error: ABIs are not compatible
571571
conv: Rust,
572572
can_unwind: $SOME_BOOL,
573573
}
574-
--> $DIR/debug.rs:47:1
574+
--> $DIR/debug.rs:58:1
575575
|
576576
LL | type TestAbiNeLarger = (fn([u8; 32]), fn([u32; 32]));
577577
| ^^^^^^^^^^^^^^^^^^^^
@@ -720,7 +720,7 @@ error: ABIs are not compatible
720720
conv: Rust,
721721
can_unwind: $SOME_BOOL,
722722
}
723-
--> $DIR/debug.rs:50:1
723+
--> $DIR/debug.rs:61:1
724724
|
725725
LL | type TestAbiNeFloat = (fn(f32), fn(u32));
726726
| ^^^^^^^^^^^^^^^^^^^
@@ -870,13 +870,13 @@ error: ABIs are not compatible
870870
conv: Rust,
871871
can_unwind: $SOME_BOOL,
872872
}
873-
--> $DIR/debug.rs:54:1
873+
--> $DIR/debug.rs:65:1
874874
|
875875
LL | type TestAbiNeSign = (fn(i32), fn(u32));
876876
| ^^^^^^^^^^^^^^^^^^
877877

878878
error[E0277]: the size for values of type `str` cannot be known at compilation time
879-
--> $DIR/debug.rs:57:46
879+
--> $DIR/debug.rs:68:46
880880
|
881881
LL | type TestAbiEqNonsense = (fn((str, str)), fn((str, str)));
882882
| ^^^^^^^^^^ doesn't have a size known at compile-time
@@ -885,13 +885,13 @@ LL | type TestAbiEqNonsense = (fn((str, str)), fn((str, str)));
885885
= note: only the last element of a tuple may have a dynamically sized type
886886

887887
error: unrecognized argument
888-
--> $DIR/debug.rs:59:13
888+
--> $DIR/debug.rs:70:13
889889
|
890890
LL | #[rustc_abi("assert_eq")]
891891
| ^^^^^^^^^^^
892892

893893
error: `#[rustc_abi]` can only be applied to function items, type aliases, and associated functions
894-
--> $DIR/debug.rs:32:5
894+
--> $DIR/debug.rs:43:5
895895
|
896896
LL | const C: () = ();
897897
| ^^^^^^^^^^^
@@ -981,9 +981,9 @@ error: fn_abi_of(assoc_test) = FnAbi {
981981
conv: Rust,
982982
can_unwind: $SOME_BOOL,
983983
}
984-
--> $DIR/debug.rs:37:5
984+
--> $DIR/debug.rs:48:5
985985
|
986-
LL | fn assoc_test(&self) { }
986+
LL | fn assoc_test(&self) {}
987987
| ^^^^^^^^^^^^^^^^^^^^
988988

989989
error: aborting due to 12 previous errors

‎tests/ui/abi/debug.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
// Some attributes are only computed for release builds:
1010
//@ compile-flags: -O
1111
//@ revisions: generic riscv64
12-
//@ [riscv64] only-riscv64
12+
//@ [riscv64] compile-flags: --target riscv64gc-unknown-linux-gnu
13+
//@ [riscv64] needs-llvm-components: riscv
1314
//@ [generic] ignore-riscv64
1415
#![feature(rustc_attrs)]
1516
#![crate_type = "lib"]

0 commit comments

Comments
 (0)