Skip to content
/ rust Public
forked from rust-lang/rust

Commit 109def5

Browse files
authored
Rollup merge of rust-lang#135936 - RalfJung:reify-intrinsic, r=oli-obk
fix reify-intrinsic test These are no longer `extern "rust-intrinsic"` functions so it no longer makes sense to try to cast them to that type. r? `@oli-obk`
2 parents 556d901 + b88dea2 commit 109def5

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

tests/ui/intrinsics/reify-intrinsic.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
#![feature(core_intrinsics, intrinsics)]
44

55
fn a() {
6-
let _: unsafe extern "rust-intrinsic" fn(isize) -> usize = std::mem::transmute;
6+
let _: unsafe fn(isize) -> usize = std::mem::transmute;
77
//~^ ERROR cannot coerce
88
}
99

1010
fn b() {
11-
let _ = std::mem::transmute as unsafe extern "rust-intrinsic" fn(isize) -> usize;
11+
let _ = std::mem::transmute as unsafe fn(isize) -> usize;
1212
//~^ ERROR casting
1313
}
1414

1515
fn c() {
16-
let _: [unsafe extern "rust-intrinsic" fn(f32) -> f32; 2] = [
16+
let _: [unsafe fn(f32) -> f32; 2] = [
1717
std::intrinsics::floorf32, //~ ERROR cannot coerce
1818
std::intrinsics::log2f32,
1919
];

tests/ui/intrinsics/reify-intrinsic.stderr

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
error[E0308]: cannot coerce intrinsics to function pointers
2-
--> $DIR/reify-intrinsic.rs:6:64
2+
--> $DIR/reify-intrinsic.rs:6:40
33
|
4-
LL | let _: unsafe extern "rust-intrinsic" fn(isize) -> usize = std::mem::transmute;
5-
| ------------------------------------------------- ^^^^^^^^^^^^^^^^^^^ cannot coerce intrinsics to function pointers
4+
LL | let _: unsafe fn(isize) -> usize = std::mem::transmute;
5+
| ------------------------- ^^^^^^^^^^^^^^^^^^^ cannot coerce intrinsics to function pointers
66
| |
77
| expected due to this
88
|
9-
= note: expected fn pointer `unsafe extern "rust-intrinsic" fn(isize) -> usize`
9+
= note: expected fn pointer `unsafe fn(isize) -> usize`
1010
found fn item `unsafe fn(_) -> _ {std::intrinsics::transmute::<_, _>}`
1111

12-
error[E0606]: casting `unsafe fn(_) -> _ {std::intrinsics::transmute::<_, _>}` as `unsafe extern "rust-intrinsic" fn(isize) -> usize` is invalid
12+
error[E0606]: casting `unsafe fn(_) -> _ {std::intrinsics::transmute::<_, _>}` as `unsafe fn(isize) -> usize` is invalid
1313
--> $DIR/reify-intrinsic.rs:11:13
1414
|
15-
LL | let _ = std::mem::transmute as unsafe extern "rust-intrinsic" fn(isize) -> usize;
16-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
15+
LL | let _ = std::mem::transmute as unsafe fn(isize) -> usize;
16+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1717

1818
error[E0308]: cannot coerce intrinsics to function pointers
1919
--> $DIR/reify-intrinsic.rs:17:9
2020
|
2121
LL | std::intrinsics::floorf32,
2222
| ^^^^^^^^^^^^^^^^^^^^^^^^^ cannot coerce intrinsics to function pointers
2323
|
24-
= note: expected fn pointer `unsafe extern "rust-intrinsic" fn(_) -> _`
24+
= note: expected fn pointer `unsafe fn(_) -> _`
2525
found fn item `unsafe fn(_) -> _ {floorf32}`
2626

2727
error: aborting due to 3 previous errors

0 commit comments

Comments
 (0)