Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2024-11-23 21:23:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Ignore bodies containing todo!() in clippy::if_same_then_else

Browse source
This commit is contained in:
Dany Marcoux 2022-05-18 20:28:11 +02:00 committed by kyoto7250
parent 844c06a7c7
commit 9306e9a4df
2 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
clippy_lints/src/copies.rs
View file

@ -12,7 +12,7 @@ use rustc_lint::{LateContext, LateLintPass};
use rustc_session::{declare_lint_pass, declare_tool_lint};
use rustc_span::hygiene::walk_chain;
use rustc_span::source_map::SourceMap;
use rustc_span::{BytePos, Span, Symbol};
use rustc_span::{sym, BytePos, Span, Symbol};
use std::borrow::Cow;
declare_clippy_lint! {
@ -365,6 +365,21 @@ fn eq_stmts(
.all(|b| get_stmt(b).map_or(false, |s| eq.eq_stmt(s, stmt)))
}
fn block_contains_todo_macro(cx: &LateContext<'_>, block: &Block<'_>) -> bool {
dbg!(block);
if let Some(macro_def_id) = block.span.ctxt().outer_expn_data().macro_def_id {
dbg!(macro_def_id);
if let Some(diagnostic_name) = cx.tcx.get_diagnostic_name(macro_def_id) {
dbg!(diagnostic_name);
diagnostic_name == sym::todo_macro
} else {
false
}
} else {
false
}
}
fn scan_block_for_eq(cx: &LateContext<'_>, _conds: &[&Expr<'_>], block: &Block<'_>, blocks: &[&Block<'_>]) -> BlockEq {
let mut eq = SpanlessEq::new(cx);
let mut eq = eq.inter_expr();
@ -398,6 +413,7 @@ fn scan_block_for_eq(cx: &LateContext<'_>, _conds: &[&Expr<'_>], block: &Block<'
moved_locals,
};
}
let end_search_start = block.stmts[start_end_eq..]
.iter()
.rev()

3
tests/ui/if_same_then_else.rs
View file

@ -126,6 +126,9 @@ fn if_same_then_else() {
_ => 4,
};
}
// Issue #8836
if true { todo!() } else { todo!() }
}
// Issue #2423. This was causing an ICE.