Skip to content

Commit 41fedad

Browse files
gssergegsserge
authored
Enable clippy::float_equality_without_abs lint (#1305)
1 parent 6ee1fda commit 41fedad

File tree

7 files changed

+29
-31
lines changed

7 files changed

+29
-31
lines changed

‎arrow/src/array/array_union.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ mod tests {
666666
.downcast_ref::<Float64Array>()
667667
.unwrap()
668668
.value(0);
669-
assert!(10.0 - value < f64::EPSILON);
669+
assert_eq!(10.0, value);
670670

671671
let slot = array.value(4);
672672
let value = slot
@@ -771,7 +771,7 @@ mod tests {
771771
let slot = slot.as_any().downcast_ref::<Float64Array>().unwrap();
772772
assert_eq!(slot.len(), 1);
773773
let value = slot.value(0);
774-
assert!(value - 3_f64 < f64::EPSILON);
774+
assert_eq!(value, 3_f64);
775775
}
776776
2 => {
777777
let slot = slot.as_any().downcast_ref::<Int32Array>().unwrap();
@@ -783,7 +783,7 @@ mod tests {
783783
let slot = slot.as_any().downcast_ref::<Float64Array>().unwrap();
784784
assert_eq!(slot.len(), 1);
785785
let value = slot.value(0);
786-
assert!(5_f64 - value < f64::EPSILON);
786+
assert_eq!(5_f64, value);
787787
}
788788
4 => {
789789
let slot = slot.as_any().downcast_ref::<Int32Array>().unwrap();
@@ -835,7 +835,7 @@ mod tests {
835835
assert!(!union.is_null(i));
836836
assert_eq!(slot.len(), 1);
837837
let value = slot.value(0);
838-
assert!(value - 3_f64 < f64::EPSILON);
838+
assert_eq!(value, 3_f64);
839839
}
840840
3 => {
841841
let slot = slot.as_any().downcast_ref::<Int32Array>().unwrap();
@@ -872,7 +872,7 @@ mod tests {
872872
assert!(!new_union.is_null(i));
873873
assert_eq!(slot.len(), 1);
874874
let value = slot.value(0);
875-
assert!(value - 3_f64 < f64::EPSILON);
875+
assert_eq!(value, 3_f64);
876876
}
877877
2 => assert!(new_union.is_null(i)),
878878
3 => {

‎arrow/src/compute/kernels/aggregate.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ mod tests {
641641
#[test]
642642
fn test_primitive_array_float_sum() {
643643
let a = Float64Array::from(vec![1.1, 2.2, 3.3, 4.4, 5.5]);
644-
assert!(16.5 - sum(&a).unwrap() < f64::EPSILON);
644+
assert_eq!(16.5, sum(&a).unwrap());
645645
}
646646

647647
#[test]

‎arrow/src/compute/kernels/arithmetic.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,9 +1020,9 @@ mod tests {
10201020
let a = Float64Array::from(vec![15.0, 15.0, 8.0]);
10211021
let b = Float64Array::from(vec![5.0, 6.0, 8.0]);
10221022
let c = divide(&a, &b).unwrap();
1023-
assert!(3.0 - c.value(0) < f64::EPSILON);
1024-
assert!(2.5 - c.value(1) < f64::EPSILON);
1025-
assert!(1.0 - c.value(2) < f64::EPSILON);
1023+
assert_eq!(3.0, c.value(0));
1024+
assert_eq!(2.5, c.value(1));
1025+
assert_eq!(1.0, c.value(2));
10261026
}
10271027

10281028
#[test]

‎arrow/src/compute/kernels/cast.rs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2357,11 +2357,11 @@ mod tests {
23572357
let array = Arc::new(a) as ArrayRef;
23582358
let b = cast(&array, &DataType::Float64).unwrap();
23592359
let c = b.as_any().downcast_ref::<Float64Array>().unwrap();
2360-
assert!(5.0 - c.value(0) < f64::EPSILON);
2361-
assert!(6.0 - c.value(1) < f64::EPSILON);
2362-
assert!(7.0 - c.value(2) < f64::EPSILON);
2363-
assert!(8.0 - c.value(3) < f64::EPSILON);
2364-
assert!(9.0 - c.value(4) < f64::EPSILON);
2360+
assert_eq!(5.0, c.value(0));
2361+
assert_eq!(6.0, c.value(1));
2362+
assert_eq!(7.0, c.value(2));
2363+
assert_eq!(8.0, c.value(3));
2364+
assert_eq!(9.0, c.value(4));
23652365
}
23662366

23672367
#[test]
@@ -2483,10 +2483,10 @@ mod tests {
24832483
let values = arr.values();
24842484
let c = values.as_any().downcast_ref::<Float64Array>().unwrap();
24852485
assert_eq!(1, c.null_count());
2486-
assert!(7.0 - c.value(0) < f64::EPSILON);
2487-
assert!(8.0 - c.value(1) < f64::EPSILON);
2486+
assert_eq!(7.0, c.value(0));
2487+
assert_eq!(8.0, c.value(1));
24882488
assert!(!c.is_valid(2));
2489-
assert!(10.0 - c.value(3) < f64::EPSILON);
2489+
assert_eq!(10.0, c.value(3));
24902490
}
24912491

24922492
#[test]
@@ -2535,8 +2535,8 @@ mod tests {
25352535
let array = Arc::new(a) as ArrayRef;
25362536
let b = cast(&array, &DataType::Float64).unwrap();
25372537
let c = b.as_any().downcast_ref::<Float64Array>().unwrap();
2538-
assert!(1.0 - c.value(0) < f64::EPSILON);
2539-
assert!(0.0 - c.value(1) < f64::EPSILON);
2538+
assert_eq!(1.0, c.value(0));
2539+
assert_eq!(0.0, c.value(1));
25402540
assert!(!c.is_valid(2));
25412541
}
25422542

‎arrow/src/csv/reader.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1269,7 +1269,7 @@ mod tests {
12691269
.as_any()
12701270
.downcast_ref::<Float64Array>()
12711271
.unwrap();
1272-
assert!(57.653484 - lat.value(0) < f64::EPSILON);
1272+
assert_eq!(57.653484, lat.value(0));
12731273

12741274
// access data from a string array (ListArray<u8>)
12751275
let city = batch
@@ -1400,7 +1400,7 @@ mod tests {
14001400
.as_any()
14011401
.downcast_ref::<Float64Array>()
14021402
.unwrap();
1403-
assert!(57.653484 - lat.value(0) < f64::EPSILON);
1403+
assert_eq!(57.653484, lat.value(0));
14041404

14051405
// access data from a string array (ListArray<u8>)
14061406
let city = batch
@@ -1438,7 +1438,7 @@ mod tests {
14381438
.as_any()
14391439
.downcast_ref::<Float64Array>()
14401440
.unwrap();
1441-
assert!(57.653484 - lat.value(0) < f64::EPSILON);
1441+
assert_eq!(57.653484, lat.value(0));
14421442

14431443
// access data from a string array (ListArray<u8>)
14441444
let city = batch

‎arrow/src/json/reader.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1750,8 +1750,8 @@ mod tests {
17501750
.as_any()
17511751
.downcast_ref::<Float64Array>()
17521752
.unwrap();
1753-
assert!(2.0 - bb.value(0) < f64::EPSILON);
1754-
assert!(-3.5 - bb.value(1) < f64::EPSILON);
1753+
assert_eq!(2.0, bb.value(0));
1754+
assert_eq!(-3.5, bb.value(1));
17551755
let cc = batch
17561756
.column(c.0)
17571757
.as_any()
@@ -1873,8 +1873,8 @@ mod tests {
18731873
.as_any()
18741874
.downcast_ref::<Float32Array>()
18751875
.unwrap();
1876-
assert!(2.0 - bb.value(0) < f32::EPSILON);
1877-
assert!(-3.5 - bb.value(1) < f32::EPSILON);
1876+
assert_eq!(2.0, bb.value(0));
1877+
assert_eq!(-3.5, bb.value(1));
18781878
}
18791879

18801880
#[test]
@@ -1962,8 +1962,8 @@ mod tests {
19621962
let bb = bb.values();
19631963
let bb = bb.as_any().downcast_ref::<Float64Array>().unwrap();
19641964
assert_eq!(9, bb.len());
1965-
assert!(2.0 - bb.value(0) < f64::EPSILON);
1966-
assert!(-6.1 - bb.value(5) < f64::EPSILON);
1965+
assert_eq!(2.0, bb.value(0));
1966+
assert_eq!(-6.1, bb.value(5));
19671967
assert!(!bb.is_valid(7));
19681968

19691969
let cc = batch
@@ -2094,7 +2094,7 @@ mod tests {
20942094
let bb = bb.values();
20952095
let bb = bb.as_any().downcast_ref::<Float64Array>().unwrap();
20962096
assert_eq!(10, bb.len());
2097-
assert!(4.0 - bb.value(9) < f64::EPSILON);
2097+
assert_eq!(4.0, bb.value(9));
20982098

20992099
let cc = batch
21002100
.column(c.0)

‎arrow/src/lib.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,6 @@
131131
#![allow(non_camel_case_types)]
132132
#![deny(clippy::redundant_clone)]
133133
#![allow(
134-
// introduced to ignore lint errors when upgrading from 2020-04-22 to 2020-11-14
135-
clippy::float_equality_without_abs,
136134
clippy::type_complexity,
137135
// upper_case_acronyms lint was introduced in Rust 1.51.
138136
// It is triggered in the ffi module, and ipc::gen, which we have no control over

0 commit comments

Comments
 (0)