Skip to content

Commit 25f3a7e

Browse files
ArhanChaudharyArhanChaudhary
committed
improve tests
1 parent f22f163 commit 25f3a7e

3 files changed

Lines changed: 151 additions & 86 deletions

File tree

‎tests/ui/nonnull_unchecked_on_box_ptr.fixed‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,59 +33,48 @@ fn lint() {
3333
fn basic() {
3434
let one = Box::new(1);
3535
let _ = NonNull::from_mut(Box::leak(one));
36-
//~^ nonnull_unchecked_on_box_ptr
3736

3837
let one = Box::new(1);
3938
let _ = NonNull::from_mut(Box::leak(identity(one)));
40-
//~^ nonnull_unchecked_on_box_ptr
4139
}
4240

4341
fn qualifiers() {
4442
let one = Box::new(1);
4543
let _ = NonNull::from_mut(Box::leak(one));
46-
//~^ nonnull_unchecked_on_box_ptr
4744

4845
{
4946
use Box as Box2;
5047
use NonNull as NonNull2;
51-
let one = Box2::new(1);
48+
let one = Box::new(1);
5249
let _ = NonNull::from_mut(Box::leak(one));
53-
//~^ nonnull_unchecked_on_box_ptr
5450
}
5551

5652
{
5753
type Box2<T> = Box<T>;
5854
type NonNull2<T> = NonNull<T>;
59-
let one = Box2::new(1);
55+
let one = Box::new(1);
6056
let _ = NonNull::from_mut(Box::leak(one));
61-
//~^ nonnull_unchecked_on_box_ptr
6257
}
6358
}
6459

6560
fn macros() {
6661
let one = Box::new(1);
6762
let _ = NonNull::from_mut(Box::leak(one));
68-
//~^ nonnull_unchecked_on_box_ptr
6963

7064
let one = Box::new(1);
7165
let _ = identity!(NonNull::from_mut(Box::leak(one)));
72-
//~^ nonnull_unchecked_on_box_ptr
7366

7467
let one = Box::new(1);
7568
let _ = NonNull::from_mut(Box::leak(one));
76-
//~^ nonnull_unchecked_on_box_ptr
7769

7870
let one = Box::new(1);
7971
let _ = NonNull::from_mut(Box::leak(one));
80-
//~^ nonnull_unchecked_on_box_ptr
8172

8273
let one = Box::new(1);
8374
let _ = NonNull::from_mut(Box::leak(one));
84-
//~^ nonnull_unchecked_on_box_ptr
8575

8676
let one = Box::new(1);
8777
let _ = NonNull::from_mut(Box::leak(weird!(one)));
88-
//~^ nonnull_unchecked_on_box_ptr
8978
}
9079

9180
fn keep_unsafe_block() {
@@ -156,14 +145,12 @@ fn msrv_1_25() {
156145
fn msrv_1_26() {
157146
let one = Box::new(1);
158147
let _ = NonNull::from(Box::leak(one));
159-
//~^ nonnull_unchecked_on_box_ptr
160148
}
161149

162150
#[clippy::msrv = "1.89"]
163151
fn msrv_1_89() {
164152
let one = Box::new(1);
165153
let _ = NonNull::from_mut(Box::leak(one));
166-
//~^ nonnull_unchecked_on_box_ptr
167154
}
168155

169156
fn main() {}

‎tests/ui/nonnull_unchecked_on_box_ptr.rs‎

Lines changed: 54 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -32,60 +32,82 @@ unsafe fn unsafe_identity<T>(x: T) -> T {
3232
fn lint() {
3333
fn basic() {
3434
let one = Box::new(1);
35-
let _ = unsafe { NonNull::new_unchecked(Box::into_raw(one)) };
36-
//~^ nonnull_unchecked_on_box_ptr
35+
let _ = unsafe {
36+
//~^ nonnull_unchecked_on_box_ptr
37+
NonNull::new_unchecked(Box::into_raw(one))
38+
};
3739

3840
let one = Box::new(1);
39-
let _ = unsafe { NonNull::new_unchecked(Box::into_raw(identity(one))) };
40-
//~^ nonnull_unchecked_on_box_ptr
41+
let _ = unsafe {
42+
//~^ nonnull_unchecked_on_box_ptr
43+
NonNull::new_unchecked(Box::into_raw(identity(one)))
44+
};
4145
}
4246

4347
fn qualifiers() {
4448
let one = Box::new(1);
45-
let _ = unsafe { std::ptr::NonNull::new_unchecked(std::boxed::Box::into_raw(one)) };
46-
//~^ nonnull_unchecked_on_box_ptr
49+
let _ = unsafe {
50+
//~^ nonnull_unchecked_on_box_ptr
51+
std::ptr::NonNull::new_unchecked(std::boxed::Box::into_raw(one))
52+
};
4753

4854
{
4955
use Box as Box2;
5056
use NonNull as NonNull2;
51-
let one = Box2::new(1);
52-
let _ = unsafe { NonNull2::new_unchecked(Box2::into_raw(one)) };
53-
//~^ nonnull_unchecked_on_box_ptr
57+
let one = Box::new(1);
58+
let _ = unsafe {
59+
//~^ nonnull_unchecked_on_box_ptr
60+
NonNull2::new_unchecked(Box2::into_raw(one))
61+
};
5462
}
5563

5664
{
5765
type Box2<T> = Box<T>;
5866
type NonNull2<T> = NonNull<T>;
59-
let one = Box2::new(1);
60-
let _ = unsafe { NonNull2::new_unchecked(Box2::into_raw(one)) };
61-
//~^ nonnull_unchecked_on_box_ptr
67+
let one = Box::new(1);
68+
let _ = unsafe {
69+
//~^ nonnull_unchecked_on_box_ptr
70+
NonNull2::new_unchecked(Box2::into_raw(one))
71+
};
6272
}
6373
}
6474

6575
fn macros() {
6676
let one = Box::new(1);
67-
let _ = unsafe { NonNull::new_unchecked(Box::into_raw(identity!(one))) };
68-
//~^ nonnull_unchecked_on_box_ptr
77+
let _ = unsafe {
78+
//~^ nonnull_unchecked_on_box_ptr
79+
NonNull::new_unchecked(Box::into_raw(identity!(one)))
80+
};
6981

7082
let one = Box::new(1);
71-
let _ = identity!(unsafe { NonNull::new_unchecked(Box::into_raw(one)) });
72-
//~^ nonnull_unchecked_on_box_ptr
83+
let _ = identity!(unsafe {
84+
//~^ nonnull_unchecked_on_box_ptr
85+
NonNull::new_unchecked(Box::into_raw(one))
86+
});
7387

7488
let one = Box::new(1);
75-
let _ = unsafe { identity!(NonNull::new_unchecked(Box::into_raw(one))) };
76-
//~^ nonnull_unchecked_on_box_ptr
89+
let _ = unsafe {
90+
//~^ nonnull_unchecked_on_box_ptr
91+
identity!(NonNull::new_unchecked(Box::into_raw(one)))
92+
};
7793

7894
let one = Box::new(1);
79-
let _ = unsafe { NonNull::new_unchecked(identity!(Box::into_raw(one))) };
80-
//~^ nonnull_unchecked_on_box_ptr
95+
let _ = unsafe {
96+
//~^ nonnull_unchecked_on_box_ptr
97+
NonNull::new_unchecked(identity!(Box::into_raw(one)))
98+
};
8199

82100
let one = Box::new(1);
83-
let _ = unsafe { NonNull::new_unchecked(identity!(Box::into_raw(identity!(one)))) };
84-
//~^ nonnull_unchecked_on_box_ptr
101+
let _ = unsafe {
102+
//~^ nonnull_unchecked_on_box_ptr
103+
NonNull::new_unchecked(identity!(Box::into_raw(identity!(one))))
104+
};
85105

86106
let one = Box::new(1);
87-
let _ = unsafe { NonNull::new_unchecked(Box::into_raw(weird!(one))) };
88-
//~^ nonnull_unchecked_on_box_ptr
107+
let _ = unsafe {
108+
//~^ nonnull_unchecked_on_box_ptr
109+
NonNull::new_unchecked(Box::into_raw(weird!(one)))
110+
};
89111
}
90112

91113
fn keep_unsafe_block() {
@@ -155,15 +177,19 @@ fn msrv_1_25() {
155177
#[clippy::msrv = "1.26"]
156178
fn msrv_1_26() {
157179
let one = Box::new(1);
158-
let _ = unsafe { NonNull::new_unchecked(Box::into_raw(one)) };
159-
//~^ nonnull_unchecked_on_box_ptr
180+
let _ = unsafe {
181+
//~^ nonnull_unchecked_on_box_ptr
182+
NonNull::new_unchecked(Box::into_raw(one))
183+
};
160184
}
161185

162186
#[clippy::msrv = "1.89"]
163187
fn msrv_1_89() {
164188
let one = Box::new(1);
165-
let _ = unsafe { NonNull::new_unchecked(Box::into_raw(one)) };
166-
//~^ nonnull_unchecked_on_box_ptr
189+
let _ = unsafe {
190+
//~^ nonnull_unchecked_on_box_ptr
191+
NonNull::new_unchecked(Box::into_raw(one))
192+
};
167193
}
168194

169195
fn main() {}

0 commit comments

Comments
 (0)