mirror of
https://github.com/rust-lang/rust-analyzer.git
synced 2025-10-01 11:31:15 +00:00
Auto merge of #15424 - lnicola:remove-remove-dbg-unwrap, r=lnicola
minor: Remove `unwrap` from `Remove dbg!` Part of #15398.
This commit is contained in:
commit
de28baf874
@ -39,14 +39,11 @@ pub(crate) fn remove_dbg(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<(
|
|||||||
|
|
||||||
let replacements =
|
let replacements =
|
||||||
macro_calls.into_iter().filter_map(compute_dbg_replacement).collect::<Vec<_>>();
|
macro_calls.into_iter().filter_map(compute_dbg_replacement).collect::<Vec<_>>();
|
||||||
if replacements.is_empty() {
|
|
||||||
return None;
|
|
||||||
}
|
|
||||||
|
|
||||||
acc.add(
|
acc.add(
|
||||||
AssistId("remove_dbg", AssistKind::Refactor),
|
AssistId("remove_dbg", AssistKind::Refactor),
|
||||||
"Remove dbg!()",
|
"Remove dbg!()",
|
||||||
replacements.iter().map(|&(range, _)| range).reduce(|acc, range| acc.cover(range)).unwrap(),
|
replacements.iter().map(|&(range, _)| range).reduce(|acc, range| acc.cover(range))?,
|
||||||
|builder| {
|
|builder| {
|
||||||
for (range, expr) in replacements {
|
for (range, expr) in replacements {
|
||||||
if let Some(expr) = expr {
|
if let Some(expr) = expr {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user