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

Refactor booleans

Browse Source 
Inline `snip (..)` function
This commit is contained in:
Michael Wright 2019-09-25 06:20:40 +02:00
parent 0cc48ad9f9
commit 89cdd26e71
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
clippy_lints/src/booleans.rs
View File

@ -183,7 +183,7 @@ fn recurse(&mut self, suggestion: &Bool) -> Option<()> {
self.output.push_str(&str)
} else {
self.output.push('!');
let snip = snip(self.cx, terminal)?;
let snip = snippet_opt(self.cx, terminal.span)?;
self.output.push_str(&snip);
}
},
@ -215,7 +215,7 @@ fn recurse(&mut self, suggestion: &Bool) -> Option<()> {
}
},
&Term(n) => {
let snip = snip(self.cx, self.terminals[n as usize])?;
let snip = snippet_opt(self.cx, self.terminals[n as usize].span)?;
self.output.push_str(&snip);
},
}
@ -223,10 +223,6 @@ fn recurse(&mut self, suggestion: &Bool) -> Option<()> {
}
}
fn snip(cx: &LateContext<'_, '_>, e: &Expr) -> Option<String> {
snippet_opt(cx, e.span)
}
fn simplify_not(cx: &LateContext<'_, '_>, expr: &Expr) -> Option<String> {
match &expr.node {
ExprKind::Binary(binop, lhs, rhs) => {
@ -243,7 +239,14 @@ fn simplify_not(cx: &LateContext<'_, '_>, expr: &Expr) -> Option<String> {
BinOpKind::Ge => Some(" < "),
_ => None,
}
.and_then(|op| Some(format!("{}{}{}", snip(cx, lhs)?, op, snip(cx, rhs)?)))
.and_then(|op| {
Some(format!(
"{}{}{}",
snippet_opt(cx, lhs.span)?,
op,
snippet_opt(cx, rhs.span)?
))
})
},
ExprKind::MethodCall(path, _, args) if args.len() == 1 => {
let type_of_receiver = cx.tables.expr_ty(&args[0]);
@ -255,7 +258,7 @@ fn simplify_not(cx: &LateContext<'_, '_>, expr: &Expr) -> Option<String> {
.cloned()
.flat_map(|(a, b)| vec![(a, b), (b, a)])
.find(|&(a, _)| a == path.ident.name.as_str())
.and_then(|(_, neg_method)| Some(format!("{}.{}()", snip(cx, &args[0])?, neg_method)))
.and_then(|(_, neg_method)| Some(format!("{}.{}()", snippet_opt(cx, args[0].span)?, neg_method)))
},
_ => None,
}