Skip to content

Commit bb2b65a

Browse files
committed
Special-case suggestions for null pointers constness cast
1 parent d9c4523 commit bb2b65a

File tree

5 files changed

+103
-19
lines changed

5 files changed

+103
-19
lines changed

clippy_lints/src/casts/mod.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -410,19 +410,23 @@ declare_clippy_lint! {
410410
/// ### Why is this bad?
411411
/// Though `as` casts between raw pointers are not terrible, `pointer::cast_mut` and
412412
/// `pointer::cast_const` are safer because they cannot accidentally cast the pointer to another
413-
/// type.
413+
/// type. Or, when null pointers are involved, `null()` and `null_mut()` can be used directly.
414414
///
415415
/// ### Example
416416
/// ```no_run
417417
/// let ptr: *const u32 = &42_u32;
418418
/// let mut_ptr = ptr as *mut u32;
419419
/// let ptr = mut_ptr as *const u32;
420+
/// let ptr = std::ptr::null::<u32>() as *mut u32;
421+
/// let ptr = std::ptr::null_mut::<u32>() as *const u32;
420422
/// ```
421423
/// Use instead:
422424
/// ```no_run
423425
/// let ptr: *const u32 = &42_u32;
424426
/// let mut_ptr = ptr.cast_mut();
425427
/// let ptr = mut_ptr.cast_const();
428+
/// let ptr = std::ptr::null_mut::<u32>();
429+
/// let ptr = std::ptr::null::<u32>();
426430
/// ```
427431
#[clippy::version = "1.72.0"]
428432
pub PTR_CAST_CONSTNESS,

clippy_lints/src/casts/ptr_cast_constness.rs

+51-17
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ use clippy_config::msrvs::{self, Msrv};
22
use clippy_utils::diagnostics::span_lint_and_sugg;
33
use clippy_utils::sugg::Sugg;
44
use rustc_errors::Applicability;
5-
use rustc_hir::{Expr, Mutability};
5+
use rustc_hir::{Expr, ExprKind, Mutability, QPath};
66
use rustc_lint::LateContext;
77
use rustc_middle::ty::{self, Ty, TypeVisitableExt};
8+
use rustc_span::sym;
89

910
use super::PTR_CAST_CONSTNESS;
1011

@@ -16,8 +17,7 @@ pub(super) fn check<'tcx>(
1617
cast_to: Ty<'tcx>,
1718
msrv: &Msrv,
1819
) {
19-
if msrv.meets(msrvs::POINTER_CAST_CONSTNESS)
20-
&& let ty::RawPtr(from_ty, from_mutbl) = cast_from.kind()
20+
if let ty::RawPtr(from_ty, from_mutbl) = cast_from.kind()
2121
&& let ty::RawPtr(to_ty, to_mutbl) = cast_to.kind()
2222
&& matches!(
2323
(from_mutbl, to_mutbl),
@@ -26,20 +26,54 @@ pub(super) fn check<'tcx>(
2626
&& from_ty == to_ty
2727
&& !from_ty.has_erased_regions()
2828
{
29-
let sugg = Sugg::hir(cx, cast_expr, "_");
30-
let constness = match *to_mutbl {
31-
Mutability::Not => "const",
32-
Mutability::Mut => "mut",
33-
};
29+
if let ExprKind::Call(func, []) = cast_expr.kind
30+
&& let ExprKind::Path(QPath::Resolved(None, path)) = func.kind
31+
&& let Some(method_defid) = path.res.opt_def_id()
32+
{
33+
let mut app = Applicability::MachineApplicable;
34+
let sugg = Sugg::hir_with_applicability(cx, cast_expr, "_", &mut app).to_string();
35+
if cx.tcx.is_diagnostic_item(sym::ptr_null, method_defid) {
36+
span_lint_and_sugg(
37+
cx,
38+
PTR_CAST_CONSTNESS,
39+
expr.span,
40+
"`as` casting to make a const null pointer into a mutable null pointer",
41+
"use `null_mut()` directly instead",
42+
sugg.replace("null", "null_mut"),
43+
app,
44+
);
45+
return;
46+
}
47+
if cx.tcx.is_diagnostic_item(sym::ptr_null_mut, method_defid) {
48+
span_lint_and_sugg(
49+
cx,
50+
PTR_CAST_CONSTNESS,
51+
expr.span,
52+
"`as` casting to make a mutable null pointer into an immutable null pointer",
53+
"use `null()` directly instead",
54+
sugg.replace("null_mut", "null"),
55+
app,
56+
);
57+
return;
58+
}
59+
}
3460

35-
span_lint_and_sugg(
36-
cx,
37-
PTR_CAST_CONSTNESS,
38-
expr.span,
39-
"`as` casting between raw pointers while changing only its constness",
40-
format!("try `pointer::cast_{constness}`, a safer alternative"),
41-
format!("{}.cast_{constness}()", sugg.maybe_par()),
42-
Applicability::MachineApplicable,
43-
);
61+
if msrv.meets(msrvs::POINTER_CAST_CONSTNESS) {
62+
let sugg = Sugg::hir(cx, cast_expr, "_");
63+
let constness = match *to_mutbl {
64+
Mutability::Not => "const",
65+
Mutability::Mut => "mut",
66+
};
67+
68+
span_lint_and_sugg(
69+
cx,
70+
PTR_CAST_CONSTNESS,
71+
expr.span,
72+
"`as` casting between raw pointers while changing only its constness",
73+
format!("try `pointer::cast_{constness}`, a safer alternative"),
74+
format!("{}.cast_{constness}()", sugg.maybe_par()),
75+
Applicability::MachineApplicable,
76+
);
77+
}
4478
}
4579
}

tests/ui/ptr_cast_constness.fixed

+13
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,16 @@ fn _msrv_1_65() {
6868
let _ = ptr.cast_mut();
6969
let _ = mut_ptr.cast_const();
7070
}
71+
72+
#[inline_macros]
73+
fn null_pointers() {
74+
use std::ptr;
75+
let _ = ptr::null_mut::<String>();
76+
let _ = ptr::null::<u32>();
77+
78+
// Make sure the lint is triggered inside a macro
79+
let _ = inline!(ptr::null_mut::<u32>());
80+
81+
// Do not lint inside macros from external crates
82+
let _ = external!(ptr::null::<u32>() as *mut u32);
83+
}

tests/ui/ptr_cast_constness.rs

+13
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,16 @@ fn _msrv_1_65() {
6868
let _ = ptr as *mut u32;
6969
let _ = mut_ptr as *const u32;
7070
}
71+
72+
#[inline_macros]
73+
fn null_pointers() {
74+
use std::ptr;
75+
let _ = ptr::null::<String>() as *mut String;
76+
let _ = ptr::null_mut::<u32>() as *const u32;
77+
78+
// Make sure the lint is triggered inside a macro
79+
let _ = inline!(ptr::null::<u32>() as *mut u32);
80+
81+
// Do not lint inside macros from external crates
82+
let _ = external!(ptr::null::<u32>() as *mut u32);
83+
}

tests/ui/ptr_cast_constness.stderr

+21-1
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,25 @@ error: `as` casting between raw pointers while changing only its constness
4343
LL | let _ = mut_ptr as *const u32;
4444
| ^^^^^^^^^^^^^^^^^^^^^ help: try `pointer::cast_const`, a safer alternative: `mut_ptr.cast_const()`
4545

46-
error: aborting due to 7 previous errors
46+
error: `as` casting to make a const null pointer into a mutable null pointer
47+
--> tests/ui/ptr_cast_constness.rs:75:13
48+
|
49+
LL | let _ = ptr::null::<String>() as *mut String;
50+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use `null_mut()` directly instead: `ptr::null_mut::<String>()`
51+
52+
error: `as` casting to make a mutable null pointer into an immutable null pointer
53+
--> tests/ui/ptr_cast_constness.rs:76:13
54+
|
55+
LL | let _ = ptr::null_mut::<u32>() as *const u32;
56+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use `null()` directly instead: `ptr::null::<u32>()`
57+
58+
error: `as` casting to make a const null pointer into a mutable null pointer
59+
--> tests/ui/ptr_cast_constness.rs:79:21
60+
|
61+
LL | let _ = inline!(ptr::null::<u32>() as *mut u32);
62+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use `null_mut()` directly instead: `ptr::null_mut::<u32>()`
63+
|
64+
= note: this error originates in the macro `__inline_mac_fn_null_pointers` (in Nightly builds, run with -Z macro-backtrace for more info)
65+
66+
error: aborting due to 10 previous errors
4767

0 commit comments

Comments
 (0)