@@ -505,7 +505,8 @@ impl PartialEq for ScalarValue {
505505 ( Boolean ( _) , _) => false ,
506506 ( Float32 ( v1) , Float32 ( v2) ) => match ( v1, v2) {
507507 ( Some ( f1) , Some ( f2) ) => {
508- * f1 == 0.0 && * f2 == 0.0 || f1. to_bits ( ) == f2. to_bits ( )
508+ let ( b1, b2) = ( f1. to_bits ( ) , f2. to_bits ( ) ) ;
509+ ( ( b1 << 1 ) == 0 && ( b2 << 1 ) == 0 ) || b1 == b2
509510 }
510511 _ => v1. eq ( v2) ,
511512 } ,
@@ -520,7 +521,8 @@ impl PartialEq for ScalarValue {
520521 ( Float16 ( _) , _) => false ,
521522 ( Float64 ( v1) , Float64 ( v2) ) => match ( v1, v2) {
522523 ( Some ( f1) , Some ( f2) ) => {
523- * f1 == 0.0 && * f2 == 0.0 || f1. to_bits ( ) == f2. to_bits ( )
524+ let ( b1, b2) = ( f1. to_bits ( ) , f2. to_bits ( ) ) ;
525+ ( ( b1 << 1 ) == 0 && ( b2 << 1 ) == 0 ) || b1 == b2
524526 }
525527 _ => v1. eq ( v2) ,
526528 } ,
@@ -667,11 +669,13 @@ impl PartialOrd for ScalarValue {
667669 ( Boolean ( v1) , Boolean ( v2) ) => v1. partial_cmp ( v2) ,
668670 ( Boolean ( _) , _) => None ,
669671 ( Float32 ( v1) , Float32 ( v2) ) => match ( v1, v2) {
670- ( Some ( a) , Some ( b) ) => Some ( if * a == 0.0 && * b == 0.0 {
671- Ordering :: Equal
672- } else {
673- a. total_cmp ( b)
674- } ) ,
672+ ( Some ( a) , Some ( b) ) => {
673+ Some ( if a. to_bits ( ) << 1 == 0 && b. to_bits ( ) << 1 == 0 {
674+ Ordering :: Equal
675+ } else {
676+ a. total_cmp ( b)
677+ } )
678+ }
675679 _ => v1. partial_cmp ( v2) ,
676680 } ,
677681 ( Float16 ( v1) , Float16 ( v2) ) => match ( v1, v2) {
@@ -687,11 +691,13 @@ impl PartialOrd for ScalarValue {
687691 ( Float32 ( _) , _) => None ,
688692 ( Float16 ( _) , _) => None ,
689693 ( Float64 ( v1) , Float64 ( v2) ) => match ( v1, v2) {
690- ( Some ( a) , Some ( b) ) => Some ( if * a == 0.0 && * b == 0.0 {
691- Ordering :: Equal
692- } else {
693- a. total_cmp ( b)
694- } ) ,
694+ ( Some ( a) , Some ( b) ) => {
695+ Some ( if a. to_bits ( ) << 1 == 0 && b. to_bits ( ) << 1 == 0 {
696+ Ordering :: Equal
697+ } else {
698+ a. total_cmp ( b)
699+ } )
700+ }
695701 _ => v1. partial_cmp ( v2) ,
696702 } ,
697703 ( Float64 ( _) , _) => None ,
0 commit comments