Skip to content

Try to fix #1928 #1929

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 6, 2017
Merged

Try to fix #1928 #1929

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 28 additions & 10 deletions clippy_lints/src/misc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use utils::{get_item_name, get_parent_expr, implements_trait, in_macro, is_integ
span_lint, span_lint_and_then, walk_ptrs_ty, last_path_segment, iter_input_pats, in_constant,
match_trait_method, paths};
use utils::sugg::Sugg;
use syntax::ast::{LitKind, CRATE_NODE_ID};
use syntax::ast::{LitKind, CRATE_NODE_ID, FloatTy};

/// **What it does:** Checks for function arguments and let bindings denoted as `ref`.
///
Expand Down Expand Up @@ -403,23 +403,41 @@ fn is_allowed(cx: &LateContext, expr: &Expr) -> bool {
let res = ConstContext::new(cx.tcx, cx.param_env.and(substs), cx.tables).eval(expr);
if let Ok(ConstVal::Float(val)) = res {
use std::cmp::Ordering;
match val {
val @ ConstFloat::F32(_) => {
let zero = ConstFloat::F32(0.0);
match val.ty {
FloatTy::F32 => {
let zero = ConstFloat {
ty: FloatTy::F32,
bits: 0.0f32.to_bits() as u128,
};

let infinity = ConstFloat::F32(::std::f32::INFINITY);
let infinity = ConstFloat {
ty: FloatTy::F32,
bits: ::std::f32::INFINITY.to_bits() as u128,
};

let neg_infinity = ConstFloat::F32(::std::f32::NEG_INFINITY);
let neg_infinity = ConstFloat {
ty: FloatTy::F32,
bits: ::std::f32::NEG_INFINITY.to_bits() as u128,
};

val.try_cmp(zero) == Ok(Ordering::Equal) || val.try_cmp(infinity) == Ok(Ordering::Equal) ||
val.try_cmp(neg_infinity) == Ok(Ordering::Equal)
},
val @ ConstFloat::F64(_) => {
let zero = ConstFloat::F64(0.0);
FloatTy::F64 => {
let zero = ConstFloat {
ty: FloatTy::F64,
bits: 0.0f64.to_bits() as u128,
};

let infinity = ConstFloat::F64(::std::f64::INFINITY);
let infinity = ConstFloat {
ty: FloatTy::F64,
bits: ::std::f64::INFINITY.to_bits() as u128,
};

let neg_infinity = ConstFloat::F64(::std::f64::NEG_INFINITY);
let neg_infinity = ConstFloat {
ty: FloatTy::F64,
bits: ::std::f64::NEG_INFINITY.to_bits() as u128,
};

val.try_cmp(zero) == Ok(Ordering::Equal) || val.try_cmp(infinity) == Ok(Ordering::Equal) ||
val.try_cmp(neg_infinity) == Ok(Ordering::Equal)
Expand Down