Skip to content

Commit 58e6431

Browse files
committed
Auto merge of #4240 - alex:uninit-intrinsic-prep, r=Manishearth
Removed use of intrinsics::uninit from tests. This is in preperation for rust-lang/rust#62150 Also allows deprecations in preperations for intrinsics::init being deprecated, which is a planned future step. changelog: none
2 parents e3cb40e + fffdbc0 commit 58e6431

File tree

2 files changed

+8
-21
lines changed

2 files changed

+8
-21
lines changed

tests/ui/invalid_ref.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
#![allow(unused)]
1+
#![allow(deprecated, unused)]
22
#![feature(core_intrinsics)]
33

44
extern crate core;
5-
use std::intrinsics::{init, uninit};
5+
use std::intrinsics::init;
66

77
fn main() {
88
let x = 1;
@@ -12,7 +12,6 @@ fn main() {
1212
ref_to_zeroed_intr(&x);
1313
ref_to_uninit_std(&x);
1414
ref_to_uninit_core(&x);
15-
ref_to_uninit_intr(&x);
1615
some_ref();
1716
std_zeroed_no_ref();
1817
core_zeroed_no_ref();
@@ -40,10 +39,6 @@ unsafe fn ref_to_uninit_core<T: ?Sized>(t: &T) {
4039
let ref_uninit: &T = core::mem::uninitialized(); // warning
4140
}
4241

43-
unsafe fn ref_to_uninit_intr<T: ?Sized>(t: &T) {
44-
let ref_uninit: &T = std::intrinsics::uninit(); // warning
45-
}
46-
4742
fn some_ref() {
4843
let some_ref = &1;
4944
}

tests/ui/invalid_ref.stderr

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: reference to zeroed memory
2-
--> $DIR/invalid_ref.rs:24:24
2+
--> $DIR/invalid_ref.rs:23:24
33
|
44
LL | let ref_zero: &T = std::mem::zeroed(); // warning
55
| ^^^^^^^^^^^^^^^^^^
@@ -8,44 +8,36 @@ LL | let ref_zero: &T = std::mem::zeroed(); // warning
88
= help: Creation of a null reference is undefined behavior; see https://doc.rust-lang.org/reference/behavior-considered-undefined.html
99

1010
error: reference to zeroed memory
11-
--> $DIR/invalid_ref.rs:28:24
11+
--> $DIR/invalid_ref.rs:27:24
1212
|
1313
LL | let ref_zero: &T = core::mem::zeroed(); // warning
1414
| ^^^^^^^^^^^^^^^^^^^
1515
|
1616
= help: Creation of a null reference is undefined behavior; see https://doc.rust-lang.org/reference/behavior-considered-undefined.html
1717

1818
error: reference to zeroed memory
19-
--> $DIR/invalid_ref.rs:32:24
19+
--> $DIR/invalid_ref.rs:31:24
2020
|
2121
LL | let ref_zero: &T = std::intrinsics::init(); // warning
2222
| ^^^^^^^^^^^^^^^^^^^^^^^
2323
|
2424
= help: Creation of a null reference is undefined behavior; see https://doc.rust-lang.org/reference/behavior-considered-undefined.html
2525

2626
error: reference to uninitialized memory
27-
--> $DIR/invalid_ref.rs:36:26
27+
--> $DIR/invalid_ref.rs:35:26
2828
|
2929
LL | let ref_uninit: &T = std::mem::uninitialized(); // warning
3030
| ^^^^^^^^^^^^^^^^^^^^^^^^^
3131
|
3232
= help: Creation of a null reference is undefined behavior; see https://doc.rust-lang.org/reference/behavior-considered-undefined.html
3333

3434
error: reference to uninitialized memory
35-
--> $DIR/invalid_ref.rs:40:26
35+
--> $DIR/invalid_ref.rs:39:26
3636
|
3737
LL | let ref_uninit: &T = core::mem::uninitialized(); // warning
3838
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
3939
|
4040
= help: Creation of a null reference is undefined behavior; see https://doc.rust-lang.org/reference/behavior-considered-undefined.html
4141

42-
error: reference to uninitialized memory
43-
--> $DIR/invalid_ref.rs:44:26
44-
|
45-
LL | let ref_uninit: &T = std::intrinsics::uninit(); // warning
46-
| ^^^^^^^^^^^^^^^^^^^^^^^^^
47-
|
48-
= help: Creation of a null reference is undefined behavior; see https://doc.rust-lang.org/reference/behavior-considered-undefined.html
49-
50-
error: aborting due to 6 previous errors
42+
error: aborting due to 5 previous errors
5143

0 commit comments

Comments
 (0)