From 681bce925f92eaebc5ae3fc40a6a4a8720e46790 Mon Sep 17 00:00:00 2001 From: llogiq Date: Fri, 11 Sep 2015 15:30:08 +0200 Subject: [PATCH] less false positives for approx_const and float_cmp --- src/approx_const.rs | 10 +++++++++- src/misc.rs | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/approx_const.rs b/src/approx_const.rs index a132bc903..9a3d46c14 100644 --- a/src/approx_const.rs +++ b/src/approx_const.rs @@ -1,8 +1,9 @@ use rustc::lint::*; +use rustc::metadata::cstore::crate_metadata; use rustc_front::hir::*; use syntax::codemap::Span; +use std::borrow::Borrow; use std::f64::consts as f64; - use utils::span_lint; declare_lint! { @@ -31,6 +32,13 @@ impl LintPass for ApproxConstant { fn check_expr(&mut self, cx: &Context, e: &Expr) { if let &ExprLit(ref lit) = &e.node { + if let Some(res) = cx.tcx.def_map.borrow().get(&e.id) { + let krate = res.def_id().krate; + let cdata = &cx.sess().cstore.get_crate_data(krate); + let crate_data : &crate_metadata = cdata.borrow(); + let name = &crate_data.name; + if name == "f32" || name == "f64" { return; } + } check_lit(cx, lit, e.span); } } diff --git a/src/misc.rs b/src/misc.rs index 8891b000b..2cd6babb9 100644 --- a/src/misc.rs +++ b/src/misc.rs @@ -93,7 +93,7 @@ impl LintPass for FloatCmp { return; } if let Some(name) = get_item_name(cx, expr) { - if name == "eq" || name == "ne" || + if name == "eq" || name == "ne" || name == "is_nan" || name.as_str().starts_with("eq_") || name.as_str().ends_with("_eq") { return;