Skip to content

Commit

Permalink
add new lint non_std_lazy_statics
Browse files Browse the repository at this point in the history
detect usage of `once_cell::sync::Lazy` and `lazy_static!`,
recommending usage of `std::sync::LazyLock` instead
  • Loading branch information
J-ZhengLi authored and pitaj committed Dec 1, 2024
1 parent 650e0c8 commit 17237b6
Show file tree
Hide file tree
Showing 15 changed files with 718 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5859,6 +5859,7 @@ Released 2018-09-13
[`non_minimal_cfg`]: https://rust-lang.github.io/rust-clippy/master/index.html#non_minimal_cfg
[`non_octal_unix_permissions`]: https://rust-lang.github.io/rust-clippy/master/index.html#non_octal_unix_permissions
[`non_send_fields_in_send_ty`]: https://rust-lang.github.io/rust-clippy/master/index.html#non_send_fields_in_send_ty
[`non_std_lazy_statics`]: https://rust-lang.github.io/rust-clippy/master/index.html#non_std_lazy_statics
[`non_zero_suggestions`]: https://rust-lang.github.io/rust-clippy/master/index.html#non_zero_suggestions
[`nonminimal_bool`]: https://rust-lang.github.io/rust-clippy/master/index.html#nonminimal_bool
[`nonsensical_open_options`]: https://rust-lang.github.io/rust-clippy/master/index.html#nonsensical_open_options
Expand Down
1 change: 1 addition & 0 deletions book/src/lint_configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -725,6 +725,7 @@ The minimum rust version that the project supports. Defaults to the `rust-versio
* [`mem_replace_with_default`](https://rust-lang.github.io/rust-clippy/master/index.html#mem_replace_with_default)
* [`missing_const_for_fn`](https://rust-lang.github.io/rust-clippy/master/index.html#missing_const_for_fn)
* [`needless_borrow`](https://rust-lang.github.io/rust-clippy/master/index.html#needless_borrow)
* [`non_std_lazy_statics`](https://rust-lang.github.io/rust-clippy/master/index.html#non_std_lazy_statics)
* [`option_as_ref_deref`](https://rust-lang.github.io/rust-clippy/master/index.html#option_as_ref_deref)
* [`option_map_unwrap_or`](https://rust-lang.github.io/rust-clippy/master/index.html#option_map_unwrap_or)
* [`ptr_as_ptr`](https://rust-lang.github.io/rust-clippy/master/index.html#ptr_as_ptr)
Expand Down
1 change: 1 addition & 0 deletions clippy_config/src/conf.rs
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,7 @@ define_Conf! {
mem_replace_with_default,
missing_const_for_fn,
needless_borrow,
non_std_lazy_statics,
option_as_ref_deref,
option_map_unwrap_or,
ptr_as_ptr,
Expand Down
1 change: 1 addition & 0 deletions clippy_lints/src/declared_lints.rs
Original file line number Diff line number Diff line change
Expand Up @@ -568,6 +568,7 @@ pub static LINTS: &[&crate::LintInfo] = &[
crate::non_expressive_names::SIMILAR_NAMES_INFO,
crate::non_octal_unix_permissions::NON_OCTAL_UNIX_PERMISSIONS_INFO,
crate::non_send_fields_in_send_ty::NON_SEND_FIELDS_IN_SEND_TY_INFO,
crate::non_std_lazy_statics::NON_STD_LAZY_STATICS_INFO,
crate::non_zero_suggestions::NON_ZERO_SUGGESTIONS_INFO,
crate::nonstandard_macro_braces::NONSTANDARD_MACRO_BRACES_INFO,
crate::octal_escapes::OCTAL_ESCAPES_INFO,
Expand Down
2 changes: 2 additions & 0 deletions clippy_lints/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ mod non_copy_const;
mod non_expressive_names;
mod non_octal_unix_permissions;
mod non_send_fields_in_send_ty;
mod non_std_lazy_statics;
mod non_zero_suggestions;
mod nonstandard_macro_braces;
mod octal_escapes;
Expand Down Expand Up @@ -963,5 +964,6 @@ pub fn register_lints(store: &mut rustc_lint::LintStore, conf: &'static Conf) {
store.register_late_pass(|_| Box::new(manual_ignore_case_cmp::ManualIgnoreCaseCmp));
store.register_late_pass(|_| Box::new(unnecessary_literal_bound::UnnecessaryLiteralBound));
store.register_late_pass(move |_| Box::new(arbitrary_source_item_ordering::ArbitrarySourceItemOrdering::new(conf)));
store.register_late_pass(move |_| Box::new(non_std_lazy_statics::NonStdLazyStatic::new(conf)));
// add lints here, do not remove this comment, it's used in `new_lint`
}
272 changes: 272 additions & 0 deletions clippy_lints/src/non_std_lazy_statics.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,272 @@
use clippy_config::Conf;
use clippy_utils::diagnostics::{span_lint, span_lint_and_then};
use clippy_utils::msrvs::Msrv;
use clippy_utils::visitors::for_each_expr;
use clippy_utils::{def_path_def_ids, fn_def_id, match_def_path, path_def_id};
use rustc_data_structures::fx::FxIndexMap;
use rustc_errors::Applicability;
use rustc_hir::def::{DefKind, Res};
use rustc_hir::def_id::DefId;
use rustc_hir::{self as hir, BodyId, Expr, ExprKind, Item, ItemKind};
use rustc_lint::{LateContext, LateLintPass, LintContext};
use rustc_middle::lint::in_external_macro;
use rustc_session::impl_lint_pass;
use rustc_span::Span;

declare_clippy_lint! {
/// ### What it does
/// Lints when `once_cell::sync::Lazy` or `lazy_static!` are used to define a static variable,
/// and suggests replacing such cases with `std::sync::LazyLock` instead.
///
/// Note: This lint will not trigger in crate with `no_std` context, or with MSRV < 1.80.0.
///
/// ### Why restrict this?
/// - Reduces the need for an extra dependency
/// - Enforce convention of using standard library types when possible
///
/// ### Example
/// ```ignore
/// lazy_static! {
/// static ref FOO: String = "foo".to_uppercase();
/// }
/// static BAR: once_cell::sync::Lazy<String> = once_cell::sync::Lazy::new(|| "BAR".to_lowercase());
/// ```
/// Use instead:
/// ```ignore
/// static FOO: std::sync::LazyLock<String> = std::sync::LazyLock::new(|| "FOO".to_lowercase());
/// static BAR: std::sync::LazyLock<String> = std::sync::LazyLock::new(|| "BAR".to_lowercase());
/// ```
#[clippy::version = "1.81.0"]
pub NON_STD_LAZY_STATICS,
restriction,
"lazy static that could be replaced by `std::sync::LazyLock`"
}

/// A list containing functions with coresponding replacements in `LazyLock`.
///
/// Some functions could be replaced as well if we have replaced `Lazy` to `LazyLock`,
/// therefore after suggesting replace the type, we need to make sure the function calls can be
/// replaced, otherwise the suggestions cannot be applied thus the applicability should be
/// `Unspecified` or `MaybeIncorret`.
static FUNCTION_REPLACEMENTS: &[(&str, Option<&str>)] = &[
("once_cell::sync::Lazy::force", Some("std::sync::LazyLock::force")),
("once_cell::sync::Lazy::get", None),
("once_cell::sync::Lazy::new", Some("std::sync::LazyLock::new")),
// Note: `Lazy::{into_value, get_mut, force_mut}` are not in the list.
// Because the lint only checks for `static`s, and using these functions with statics
// will either be a hard error or triggers `static_mut_ref` that will be hard errors.
// But keep in mind that if somehow we decide to expand this lint to catch non-statics,
// add those functions into the list.
];

pub struct NonStdLazyStatic {
msrv: Msrv,
sugg_map: FxIndexMap<DefId, Option<String>>,
lazy_type_defs: FxIndexMap<DefId, LazyInfo>,
}

impl NonStdLazyStatic {
#[must_use]
pub fn new(conf: &'static Conf) -> Self {
Self {
msrv: conf.msrv.clone(),
sugg_map: FxIndexMap::default(),
lazy_type_defs: FxIndexMap::default(),
}
}
}

impl_lint_pass!(NonStdLazyStatic => [NON_STD_LAZY_STATICS]);

/// Return if current MSRV does not meet the requirement for `lazy_cell` feature,
/// or current context has `no_std` attribute.
macro_rules! ensure_prerequisite {
($msrv:expr, $cx:ident) => {
if !$msrv.meets(clippy_utils::msrvs::LAZY_CELL) || clippy_utils::is_no_std_crate($cx) {
return;
}
};
}

impl<'hir> LateLintPass<'hir> for NonStdLazyStatic {
extract_msrv_attr!(LateContext);

fn check_crate(&mut self, cx: &LateContext<'hir>) {
// Do not lint if current crate does not support `LazyLock`.
ensure_prerequisite!(self.msrv, cx);

// Convert hardcoded fn replacement list into a map with def_id
for (path, sugg) in FUNCTION_REPLACEMENTS {
let path_vec: Vec<&str> = path.split("::").collect();
for did in def_path_def_ids(cx.tcx, &path_vec) {
self.sugg_map.insert(did, sugg.map(ToOwned::to_owned));
}
}
}

fn check_item(&mut self, cx: &LateContext<'hir>, item: &Item<'hir>) {
ensure_prerequisite!(self.msrv, cx);

if let ItemKind::Static(..) = item.kind
&& let Some(macro_call) = clippy_utils::macros::root_macro_call(item.span)
&& match_def_path(cx, macro_call.def_id, &["lazy_static", "lazy_static"])
{
span_lint(
cx,
NON_STD_LAZY_STATICS,
macro_call.span,
"this macro has been superceded by `std::sync::LazyLock`",
);
return;
}

if in_external_macro(cx.sess(), item.span) {
return;
}

if let Some(lazy_info) = LazyInfo::from_item(cx, item) {
self.lazy_type_defs.insert(item.owner_id.to_def_id(), lazy_info);
}
}

fn check_expr(&mut self, cx: &LateContext<'hir>, expr: &Expr<'hir>) {
ensure_prerequisite!(self.msrv, cx);

// All functions in the `FUNCTION_REPLACEMENTS` have only one args
if let ExprKind::Call(callee, [arg]) = expr.kind
&& let Some(call_def_id) = fn_def_id(cx, expr)
&& self.sugg_map.contains_key(&call_def_id)
&& let ExprKind::Path(qpath) = arg.peel_borrows().kind
&& let Some(arg_def_id) = cx.typeck_results().qpath_res(&qpath, arg.hir_id).opt_def_id()
&& let Some(lazy_info) = self.lazy_type_defs.get_mut(&arg_def_id)
{
lazy_info.calls_span_and_id.insert(callee.span, call_def_id);
}
}

fn check_crate_post(&mut self, cx: &LateContext<'hir>) {
ensure_prerequisite!(self.msrv, cx);

for (_, lazy_info) in &self.lazy_type_defs {
lazy_info.lint(cx, &self.sugg_map);
}

self.sugg_map = FxIndexMap::default();
}
}

struct LazyInfo {
/// Span of the [`hir::Ty`] without including args.
/// i.e.:
/// ```ignore
/// static FOO: Lazy<String> = Lazy::new(...);
/// // ^^^^
/// ```
ty_span_no_args: Span,
/// `Span` and `DefId` of calls on `Lazy` type.
/// i.e.:
/// ```ignore
/// static FOO: Lazy<String> = Lazy::new(...);
/// // ^^^^^^^^^
/// ```
calls_span_and_id: FxIndexMap<Span, DefId>,
}

impl LazyInfo {
fn from_item(cx: &LateContext<'_>, item: &Item<'_>) -> Option<Self> {
// Check if item is a `once_cell:sync::Lazy` static.
if let ItemKind::Static(ty, _, body_id) = item.kind
&& let Some(path_def_id) = path_def_id(cx, ty)
&& let hir::TyKind::Path(hir::QPath::Resolved(_, path)) = ty.kind
&& match_def_path(cx, path_def_id, &["once_cell", "sync", "Lazy"])
{
let ty_span_no_args = path_span_without_args(path);
let body = cx.tcx.hir().body(body_id);

// visit body to collect `Lazy::new` calls
let mut new_fn_calls = FxIndexMap::default();
for_each_expr::<(), ()>(cx, body, |ex| {
if let Some((fn_did, call_span)) = fn_def_id_and_span_from_body(cx, ex, body_id)
&& match_def_path(cx, fn_did, &["once_cell", "sync", "Lazy", "new"])
{
new_fn_calls.insert(call_span, fn_did);
}
std::ops::ControlFlow::Continue(())
});

Some(LazyInfo {
ty_span_no_args,
calls_span_and_id: new_fn_calls,
})
} else {
None
}
}

fn lint(&self, cx: &LateContext<'_>, sugg_map: &FxIndexMap<DefId, Option<String>>) {
// Applicability might get adjusted to `Unspecified` later if any calls
// in `calls_span_and_id` are not replaceable judging by the `sugg_map`.
let mut appl = Applicability::MachineApplicable;
let mut suggs = vec![(self.ty_span_no_args, "std::sync::LazyLock".to_string())];

for (span, def_id) in &self.calls_span_and_id {
let maybe_sugg = sugg_map.get(def_id).cloned().flatten();
if let Some(sugg) = maybe_sugg {
suggs.push((*span, sugg));
} else {
// If NO suggested replacement, not machine applicable
appl = Applicability::Unspecified;
}
}

span_lint_and_then(
cx,
NON_STD_LAZY_STATICS,
self.ty_span_no_args,
"this type has been superceded by `LazyLock` in the standard library",
|diag| {
diag.multipart_suggestion("use `std::sync::LazyLock` instead", suggs, appl);
},
);
}
}

/// Return the span of a given `Path` without including any of its args.
///
/// NB: Re-write of a private function `rustc_lint::non_local_def::path_span_without_args`.
fn path_span_without_args(path: &hir::Path<'_>) -> Span {
path.segments
.last()
.and_then(|seg| seg.args)
.map_or(path.span, |args| path.span.until(args.span_ext))
}

/// Returns the `DefId` and `Span` of the callee if the given expression is a function call.
///
/// NB: Modified from [`clippy_utils::fn_def_id`], to support calling in an static `Item`'s body.
fn fn_def_id_and_span_from_body(cx: &LateContext<'_>, expr: &Expr<'_>, body_id: BodyId) -> Option<(DefId, Span)> {
// FIXME: find a way to cache the result.
let typeck = cx.tcx.typeck_body(body_id);
match &expr.kind {
ExprKind::Call(
Expr {
kind: ExprKind::Path(qpath),
hir_id: path_hir_id,
span,
..
},
..,
) => {
// Only return Fn-like DefIds, not the DefIds of statics/consts/etc that contain or
// deref to fn pointers, dyn Fn, impl Fn - #8850
if let Res::Def(DefKind::Fn | DefKind::Ctor(..) | DefKind::AssocFn, id) =
typeck.qpath_res(qpath, *path_hir_id)
{
Some((id, *span))
} else {
None
}
},
_ => None,
}
}
2 changes: 1 addition & 1 deletion clippy_utils/src/msrvs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ msrv_aliases! {
1,83,0 { CONST_EXTERN_FN, CONST_FLOAT_BITS_CONV, CONST_FLOAT_CLASSIFY }
1,82,0 { IS_NONE_OR, REPEAT_N }
1,81,0 { LINT_REASONS_STABILIZATION }
1,80,0 { BOX_INTO_ITER}
1,80,0 { BOX_INTO_ITER, LAZY_CELL }
1,77,0 { C_STR_LITERALS }
1,76,0 { PTR_FROM_REF, OPTION_RESULT_INSPECT }
1,73,0 { MANUAL_DIV_CEIL }
Expand Down
20 changes: 20 additions & 0 deletions tests/ui/non_std_lazy_static/auxiliary/lazy_static.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
//! **FAKE** lazy_static crate.
#[macro_export]
macro_rules! lazy_static {
(static ref $N:ident : $T:ty = $e:expr; $($t:tt)*) => {
static $N : &::core::marker::PhantomData<$T> = &::core::marker::PhantomData;

$crate::lazy_static! { $($t)* }
};
() => ()
}

#[macro_export]
macro_rules! external {
() => {
$crate::lazy_static! {
static ref LZ_DERP: u32 = 12;
}
};
}
46 changes: 46 additions & 0 deletions tests/ui/non_std_lazy_static/auxiliary/once_cell.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
//! **FAKE** once_cell crate.
pub mod sync {
use std::marker::PhantomData;

pub struct Lazy<T, F = fn() -> T> {
cell: PhantomData<T>,
init: F,
}
unsafe impl<T, F: Send> Sync for Lazy<T, F> {}
impl<T, F> Lazy<T, F> {
pub const fn new(f: F) -> Lazy<T, F> {
Lazy {
cell: PhantomData,
init: f,
}
}

pub fn into_value(this: Lazy<T, F>) -> Result<T, F> {
unimplemented!()
}

pub fn force(_this: &Lazy<T, F>) -> &T {
unimplemented!()
}

pub fn force_mut(_this: &mut Lazy<T, F>) -> &mut T {
unimplemented!()
}

pub fn get(_this: &Lazy<T, F>) -> Option<&T> {
unimplemented!()
}

pub fn get_mut(_this: &mut Lazy<T, F>) -> Option<&mut T> {
unimplemented!()
}
}
}

#[macro_export]
macro_rules! external {
() => {
static OC_DERP: $crate::sync::Lazy<u32> = $crate::sync::Lazy::new(|| 12);
};
}
Loading

0 comments on commit 17237b6

Please sign in to comment.