Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-05-21 17:52:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

higher: use get_diagnostic_name

Browse Source
This commit is contained in:
Ada Alakbarova
2025-08-20 10:59:02 +02:00
parent 02bc3c94d2
commit abb89608af
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clippy_utils/src/higher.rs
+17 -16
View File
@@ -288,22 +288,23 @@ pub fn hir(cx: &LateContext<'_>, expr: &'a Expr<'_>) -> Option<VecArgs<'a>> {
&& is_expn_of(fun.span, sym::vec).is_some()
&& let Some(fun_def_id) = cx.qpath_res(qpath, fun.hir_id).opt_def_id()
{
return if cx.tcx.is_diagnostic_item(sym::vec_from_elem, fun_def_id) && args.len() == 2 {
// `vec![elem; size]` case
Some(VecArgs::Repeat(&args[0], &args[1]))
} else if cx.tcx.is_diagnostic_item(sym::slice_into_vec, fun_def_id) && args.len() == 1 {
// `vec![a, b, c]` case
if let ExprKind::Call(_, [arg]) = &args[0].kind
&& let ExprKind::Array(args) = arg.kind
{
Some(VecArgs::Vec(args))
} else {
None
}
} else if cx.tcx.is_diagnostic_item(sym::vec_new, fun_def_id) && args.is_empty() {
Some(VecArgs::Vec(&[]))
} else {
None
return match (cx.tcx.get_diagnostic_name(fun_def_id), args.len()) {
(Some(sym::vec_from_elem), 2) => {
// `vec![elem; size]` case
Some(VecArgs::Repeat(&args[0], &args[1]))
},
(Some(sym::slice_into_vec), 1) => {
// `vec![a, b, c]` case
if let ExprKind::Call(_, [arg]) = &args[0].kind
&& let ExprKind::Array(args) = arg.kind
{
Some(VecArgs::Vec(args))
} else {
None
}
},
(Some(sym::vec_new), 0) => Some(VecArgs::Vec(&[])),
_ => None,
};
}