mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Call diag.multipart_suggestion instead

Browse Source
This commit is contained in:
Hirochika Matsumoto 2020-09-23 03:42:58 +09:00
parent 3ed8902623
commit c775856727
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
clippy_lints/src/unnecessary_wrap.rs
View File

@ -1,5 +1,5 @@
use crate::utils::{
is_type_diagnostic_item, match_qpath, multispan_sugg_with_applicability, paths, return_ty, snippet,
is_type_diagnostic_item, match_qpath, paths, return_ty, snippet,
span_lint_and_then,
};
use if_chain::if_chain;
@ -102,10 +102,8 @@ impl<'tcx> LateLintPass<'tcx> for UnnecessaryWrap {
span,
"this function returns unnecessarily wrapping data",
move |diag| {
multispan_sugg_with_applicability(
diag,
diag.multipart_suggestion(
"factor this out to",
Applicability::MachineApplicable,
suggs.into_iter().chain({
let inner_ty = return_ty(cx, hir_id)
.walk()
@ -116,7 +114,8 @@ impl<'tcx> LateLintPass<'tcx> for UnnecessaryWrap {
_ => None,
});
inner_ty.map(|inner_ty| (fn_decl.output.span(), inner_ty))
}),
}).collect(),
Applicability::MachineApplicable,
);
},
);