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

Use snippet, pprust methods expand AST

Browse source
This commit is contained in:
Manish Goregaokar 2015-08-12 15:19:57 +05:30
parent 0481d04d6f
commit ca3b4330f1
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/collapsible_if.rs
View file

@ -18,8 +18,7 @@ use rustc::middle::def::*;
use syntax::ast::*;
use syntax::ptr::P;
use syntax::codemap::{Span, Spanned, ExpnInfo};
use syntax::print::pprust::{block_to_string, expr_to_string};
use utils::{in_macro, span_help_and_lint};
use utils::{in_macro, span_help_and_lint, snippet};
declare_lint! {
pub COLLAPSIBLE_IF,
@ -50,8 +49,8 @@ fn check_expr_expd(cx: &Context, e: &Expr, info: Option<&ExpnInfo>) {
span_help_and_lint(cx, COLLAPSIBLE_IF, e.span,
"this if statement can be collapsed",
&format!("try\nif {} && {} {}",
check_to_string(check), check_to_string(check_inner),
block_to_string(&*content)));
check_to_string(cx, check), check_to_string(cx, check_inner),
snippet(cx, content.span, "..")));
}
}
}
@ -63,11 +62,11 @@ fn requires_brackets(e: &Expr) -> bool {
}
}
fn check_to_string(e: &Expr) -> String {
fn check_to_string(cx: &Context, e: &Expr) -> String {
if requires_brackets(e) {
format!("({})", expr_to_string(e))
format!("({})", snippet(cx, e.span, ".."))
} else {
format!("{}", expr_to_string(e))
format!("{}", snippet(cx, e.span, ".."))
}
}