Skip to content

Commit af3283f

Browse files
committed
Fixed incorrectly marked unsafe functions
1 parent ad245a3 commit af3283f

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

src/tools/rust-analyzer/crates/hir-ty/src/consteval/tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2528,7 +2528,7 @@ fn anonymous_const_block() {
25282528
check_number(
25292529
r#"
25302530
#[rustc_intrinsic]
2531-
pub unsafe fn size_of<T>() -> usize;
2531+
pub fn size_of<T>() -> usize;
25322532
25332533
const fn f<T>() -> usize {
25342534
let r = const { size_of::<T>() };

src/tools/rust-analyzer/crates/hir-ty/src/consteval/tests/intrinsics.rs

+20-20
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ fn size_of() {
55
check_number(
66
r#"
77
#[rustc_intrinsic]
8-
pub unsafe fn size_of<T>() -> usize;
8+
pub fn size_of<T>() -> usize;
99
1010
const GOAL: usize = size_of::<i32>();
1111
"#,
@@ -19,7 +19,7 @@ fn size_of_val() {
1919
r#"
2020
//- minicore: coerce_unsized
2121
#[rustc_intrinsic]
22-
pub unsafe fn size_of_val<T: ?Sized>(_: *const T) -> usize;
22+
pub fn size_of_val<T: ?Sized>(_: *const T) -> usize;
2323
2424
struct X(i32, u8);
2525
@@ -31,7 +31,7 @@ fn size_of_val() {
3131
r#"
3232
//- minicore: coerce_unsized
3333
#[rustc_intrinsic]
34-
pub unsafe fn size_of_val<T: ?Sized>(_: *const T) -> usize;
34+
pub fn size_of_val<T: ?Sized>(_: *const T) -> usize;
3535
3636
const GOAL: usize = {
3737
let it: &[i32] = &[1, 2, 3];
@@ -46,7 +46,7 @@ fn size_of_val() {
4646
use core::mem::transmute;
4747
4848
#[rustc_intrinsic]
49-
pub unsafe fn size_of_val<T: ?Sized>(_: *const T) -> usize;
49+
pub fn size_of_val<T: ?Sized>(_: *const T) -> usize;
5050
5151
struct X {
5252
x: i64,
@@ -67,7 +67,7 @@ fn size_of_val() {
6767
use core::mem::transmute;
6868
6969
#[rustc_intrinsic]
70-
pub unsafe fn size_of_val<T: ?Sized>(_: *const T) -> usize;
70+
pub fn size_of_val<T: ?Sized>(_: *const T) -> usize;
7171
7272
struct X {
7373
x: i32,
@@ -86,7 +86,7 @@ fn size_of_val() {
8686
r#"
8787
//- minicore: coerce_unsized, fmt, builtin_impls, dispatch_from_dyn
8888
#[rustc_intrinsic]
89-
pub unsafe fn size_of_val<T: ?Sized>(_: *const T) -> usize;
89+
pub fn size_of_val<T: ?Sized>(_: *const T) -> usize;
9090
9191
const GOAL: usize = {
9292
let x: &i16 = &5;
@@ -101,7 +101,7 @@ fn size_of_val() {
101101
r#"
102102
//- minicore: coerce_unsized
103103
#[rustc_intrinsic]
104-
pub unsafe fn size_of_val<T: ?Sized>(_: *const T) -> usize;
104+
pub fn size_of_val<T: ?Sized>(_: *const T) -> usize;
105105
106106
const GOAL: usize = {
107107
size_of_val("salam")
@@ -117,7 +117,7 @@ fn min_align_of_val() {
117117
r#"
118118
//- minicore: coerce_unsized
119119
#[rustc_intrinsic]
120-
pub unsafe fn min_align_of_val<T: ?Sized>(_: *const T) -> usize;
120+
pub fn min_align_of_val<T: ?Sized>(_: *const T) -> usize;
121121
122122
struct X(i32, u8);
123123
@@ -129,7 +129,7 @@ fn min_align_of_val() {
129129
r#"
130130
//- minicore: coerce_unsized
131131
#[rustc_intrinsic]
132-
pub unsafe fn min_align_of_val<T: ?Sized>(_: *const T) -> usize;
132+
pub fn min_align_of_val<T: ?Sized>(_: *const T) -> usize;
133133
134134
const GOAL: usize = {
135135
let x: &[i32] = &[1, 2, 3];
@@ -145,7 +145,7 @@ fn type_name() {
145145
check_str(
146146
r#"
147147
#[rustc_intrinsic]
148-
pub unsafe fn type_name<T: ?Sized>() -> &'static str;
148+
pub fn type_name<T: ?Sized>() -> &'static str;
149149
150150
const GOAL: &str = type_name::<i32>();
151151
"#,
@@ -154,7 +154,7 @@ fn type_name() {
154154
check_str(
155155
r#"
156156
#[rustc_intrinsic]
157-
pub unsafe fn type_name<T: ?Sized>() -> &'static str;
157+
pub fn type_name<T: ?Sized>() -> &'static str;
158158
159159
mod mod1 {
160160
pub mod mod2 {
@@ -173,7 +173,7 @@ fn transmute() {
173173
check_number(
174174
r#"
175175
#[rustc_intrinsic]
176-
pub unsafe fn transmute<T, U>(e: T) -> U;
176+
pub fn transmute<T, U>(e: T) -> U;
177177
178178
const GOAL: i32 = transmute((1i16, 1i16));
179179
"#,
@@ -186,9 +186,9 @@ fn read_via_copy() {
186186
check_number(
187187
r#"
188188
#[rustc_intrinsic]
189-
pub unsafe fn read_via_copy<T>(e: *const T) -> T;
189+
pub fn read_via_copy<T>(e: *const T) -> T;
190190
#[rustc_intrinsic]
191-
pub unsafe fn volatile_load<T>(e: *const T) -> T;
191+
pub fn volatile_load<T>(e: *const T) -> T;
192192
193193
const GOAL: i32 = {
194194
let x = 2;
@@ -385,12 +385,12 @@ fn likely() {
385385
check_number(
386386
r#"
387387
#[rustc_intrinsic]
388-
pub const unsafe fn likely(b: bool) -> bool {
388+
pub const fn likely(b: bool) -> bool {
389389
b
390390
}
391391
392392
#[rustc_intrinsic]
393-
pub const unsafe fn unlikely(b: bool) -> bool {
393+
pub const fn unlikely(b: bool) -> bool {
394394
b
395395
}
396396
@@ -719,7 +719,7 @@ fn rotate() {
719719
check_number(
720720
r#"
721721
#[rustc_intrinsic]
722-
pub unsafe fn rotate_right<T: Copy>(x: T, y: T) -> T;
722+
pub fn rotate_right<T: Copy>(x: T, y: T) -> T;
723723
724724
const GOAL: i32 = rotate_right(10006016, 1020315);
725725
"#,
@@ -735,7 +735,7 @@ fn simd() {
735735
i8,i8,i8,i8,i8,i8,i8,i8,i8,i8,i8,i8,i8,i8,i8,i8,
736736
);
737737
#[rustc_intrinsic]
738-
pub unsafe fn simd_bitmask<T, U>(x: T) -> U;
738+
pub fn simd_bitmask<T, U>(x: T) -> U;
739739
const GOAL: u16 = simd_bitmask(i8x16(
740740
0, 1, 0, 0, 2, 255, 100, 0, 50, 0, 1, 1, 0, 0, 0, 0
741741
));
@@ -748,9 +748,9 @@ fn simd() {
748748
i8,i8,i8,i8,i8,i8,i8,i8,i8,i8,i8,i8,i8,i8,i8,i8,
749749
);
750750
#[rustc_intrinsic]
751-
pub unsafe fn simd_lt<T, U>(x: T, y: T) -> U;
751+
pub fn simd_lt<T, U>(x: T, y: T) -> U;
752752
#[rustc_intrinsic]
753-
pub unsafe fn simd_bitmask<T, U>(x: T) -> U;
753+
pub fn simd_bitmask<T, U>(x: T) -> U;
754754
const GOAL: u16 = simd_bitmask(simd_lt::<i8x16, i8x16>(
755755
i8x16(
756756
-105, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10

0 commit comments

Comments
 (0)