Skip to content

Commit 0295999

Browse files
ruancomelliruancomelli
committed
test: fix tests after upstream simplification of how float tests are run
1 parent c494cd5 commit 0295999

File tree

1 file changed

+44
-44
lines changed
  • library/coretests/tests/num

1 file changed

+44
-44
lines changed

‎library/coretests/tests/num/mod.rs‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -960,13 +960,13 @@ macro_rules! test_float {
960960
$fassert!((0.5 as $fty).floor(), 0.0);
961961
$fassert!((-0.5 as $fty).floor(), -1.0);
962962
$fassert!((1.5 as $fty).floor(), 1.0);
963-
$fassert!(($max as $fty).floor(), $max);
964-
$fassert!(($min as $fty).floor(), $min);
965-
$fassert!(($min_pos as $fty).floor(), 0.0);
966-
$fassert!((-$min_pos as $fty).floor(), -1.0);
967-
$fassert!(($nan as $fty).floor().is_nan());
968-
$fassert!(($inf as $fty).floor(), $inf);
969-
$fassert!(($neginf as $fty).floor(), $neginf);
963+
$fassert!(<$fty>::MAX.floor(), <$fty>::MAX);
964+
$fassert!(<$fty>::MIN.floor(), <$fty>::MIN);
965+
$fassert!(<$fty>::MIN_POSITIVE.floor(), 0.0);
966+
$fassert!((-<$fty>::MIN_POSITIVE).floor(), -1.0);
967+
$fassert!(<$fty>::NAN.floor().is_nan());
968+
$fassert!(<$fty>::INFINITY.floor(), <$fty>::INFINITY);
969+
$fassert!(<$fty>::NEG_INFINITY.floor(), <$fty>::NEG_INFINITY);
970970
}
971971
#[test]
972972
#[cfg(not(bootstrap))]
@@ -977,13 +977,13 @@ macro_rules! test_float {
977977
$fassert!((-0.0 as $fty).ceil().is_sign_negative());
978978
$fassert!((0.5 as $fty).ceil(), 1.0);
979979
$fassert!((-0.5 as $fty).ceil(), 0.0);
980-
$fassert!(($max as $fty).ceil(), $max);
981-
$fassert!(($min as $fty).ceil(), $min);
982-
$fassert!(($min_pos as $fty).ceil(), 1.0);
983-
$fassert!((-$min_pos as $fty).ceil(), 0.0);
984-
$fassert!(($nan as $fty).ceil().is_nan());
985-
$fassert!(($inf as $fty).ceil(), $inf);
986-
$fassert!(($neginf as $fty).ceil(), $neginf);
980+
$fassert!(<$fty>::MAX.ceil(), <$fty>::MAX);
981+
$fassert!(<$fty>::MIN.ceil(), <$fty>::MIN);
982+
$fassert!(<$fty>::MIN_POSITIVE.ceil(), 1.0);
983+
$fassert!((-<$fty>::MIN_POSITIVE).ceil(), 0.0);
984+
$fassert!(<$fty>::NAN.ceil().is_nan());
985+
$fassert!(<$fty>::INFINITY.ceil(), <$fty>::INFINITY);
986+
$fassert!(<$fty>::NEG_INFINITY.ceil(), <$fty>::NEG_INFINITY);
987987
}
988988
#[test]
989989
#[cfg(not(bootstrap))]
@@ -994,13 +994,13 @@ macro_rules! test_float {
994994
$fassert!((-0.0 as $fty).round().is_sign_negative());
995995
$fassert!((0.5 as $fty).round(), 1.0);
996996
$fassert!((-0.5 as $fty).round(), -1.0);
997-
$fassert!(($max as $fty).round(), $max);
998-
$fassert!(($min as $fty).round(), $min);
999-
$fassert!(($min_pos as $fty).round(), 0.0);
1000-
$fassert!((-$min_pos as $fty).round(), 0.0);
1001-
$fassert!(($nan as $fty).round().is_nan());
1002-
$fassert!(($inf as $fty).round(), $inf);
1003-
$fassert!(($neginf as $fty).round(), $neginf);
997+
$fassert!(<$fty>::MAX.round(), <$fty>::MAX);
998+
$fassert!(<$fty>::MIN.round(), <$fty>::MIN);
999+
$fassert!(<$fty>::MIN_POSITIVE.round(), 0.0);
1000+
$fassert!((-<$fty>::MIN_POSITIVE).round(), 0.0);
1001+
$fassert!(<$fty>::NAN.round().is_nan());
1002+
$fassert!(<$fty>::INFINITY.round(), <$fty>::INFINITY);
1003+
$fassert!(<$fty>::NEG_INFINITY.round(), <$fty>::NEG_INFINITY);
10041004
}
10051005
#[test]
10061006
#[cfg(not(bootstrap))]
@@ -1013,13 +1013,13 @@ macro_rules! test_float {
10131013
$fassert!((0.5 as $fty).round_ties_even().is_sign_positive());
10141014
$fassert!((-0.5 as $fty).round_ties_even(), -0.0);
10151015
$fassert!((-0.5 as $fty).round_ties_even().is_sign_negative());
1016-
$fassert!(($max as $fty).round_ties_even(), $max);
1017-
$fassert!(($min as $fty).round_ties_even(), $min);
1018-
$fassert!(($min_pos as $fty).round_ties_even(), 0.0);
1019-
$fassert!((-$min_pos as $fty).round_ties_even(), 0.0);
1020-
$fassert!(($nan as $fty).round_ties_even().is_nan());
1021-
$fassert!(($inf as $fty).round_ties_even(), $inf);
1022-
$fassert!(($neginf as $fty).round_ties_even(), $neginf);
1016+
$fassert!(<$fty>::MAX.round_ties_even(), <$fty>::MAX);
1017+
$fassert!(<$fty>::MIN.round_ties_even(), <$fty>::MIN);
1018+
$fassert!(<$fty>::MIN_POSITIVE.round_ties_even(), 0.0);
1019+
$fassert!((-<$fty>::MIN_POSITIVE).round_ties_even(), 0.0);
1020+
$fassert!(<$fty>::NAN.round_ties_even().is_nan());
1021+
$fassert!(<$fty>::INFINITY.round_ties_even(), <$fty>::INFINITY);
1022+
$fassert!(<$fty>::NEG_INFINITY.round_ties_even(), <$fty>::NEG_INFINITY);
10231023
}
10241024
#[test]
10251025
#[cfg(not(bootstrap))]
@@ -1032,13 +1032,13 @@ macro_rules! test_float {
10321032
$fassert!((0.5 as $fty).trunc().is_sign_positive());
10331033
$fassert!((-0.5 as $fty).trunc(), -0.0);
10341034
$fassert!((-0.5 as $fty).trunc().is_sign_negative());
1035-
$fassert!(($max as $fty).trunc(), $max);
1036-
$fassert!(($min as $fty).trunc(), $min);
1037-
$fassert!(($min_pos as $fty).trunc(), 0.0);
1038-
$fassert!((-$min_pos as $fty).trunc(), 0.0);
1039-
$fassert!(($nan as $fty).trunc().is_nan());
1040-
$fassert!(($inf as $fty).trunc(), $inf);
1041-
$fassert!(($neginf as $fty).trunc(), $neginf);
1035+
$fassert!(<$fty>::MAX.trunc(), <$fty>::MAX);
1036+
$fassert!(<$fty>::MIN.trunc(), <$fty>::MIN);
1037+
$fassert!(<$fty>::MIN_POSITIVE.trunc(), 0.0);
1038+
$fassert!((-<$fty>::MIN_POSITIVE).trunc(), 0.0);
1039+
$fassert!(<$fty>::NAN.trunc().is_nan());
1040+
$fassert!(<$fty>::INFINITY.trunc(), <$fty>::INFINITY);
1041+
$fassert!(<$fty>::NEG_INFINITY.trunc(), <$fty>::NEG_INFINITY);
10421042
}
10431043
#[test]
10441044
#[cfg(not(bootstrap))]
@@ -1051,15 +1051,15 @@ macro_rules! test_float {
10511051
$fassert!((0.5 as $fty).fract().is_sign_positive());
10521052
$fassert!((-0.5 as $fty).fract(), -0.5);
10531053
$fassert!((-0.5 as $fty).fract().is_sign_negative());
1054-
$fassert!(($max as $fty).fract(), 0.0);
1055-
$fassert!(($min as $fty).fract(), 0.0);
1056-
$fassert!(($min_pos as $fty).fract(), $min_pos);
1057-
$fassert!(($min_pos as $fty).fract().is_sign_positive());
1058-
$fassert!((-$min_pos as $fty).fract(), -$min_pos);
1059-
$fassert!((-$min_pos as $fty).fract().is_sign_negative());
1060-
$fassert!(($nan as $fty).fract().is_nan());
1061-
$fassert!(($inf as $fty).fract().is_nan());
1062-
$fassert!(($neginf as $fty).fract().is_nan());
1054+
$fassert!(<$fty>::MAX.fract(), 0.0);
1055+
$fassert!(<$fty>::MIN.fract(), 0.0);
1056+
$fassert!(<$fty>::MIN_POSITIVE.fract(), <$fty>::MIN_POSITIVE);
1057+
$fassert!(<$fty>::MIN_POSITIVE.fract().is_sign_positive());
1058+
$fassert!((-<$fty>::MIN_POSITIVE).fract(), -<$fty>::MIN_POSITIVE);
1059+
$fassert!((-<$fty>::MIN_POSITIVE).fract().is_sign_negative());
1060+
$fassert!(<$fty>::NAN.fract().is_nan());
1061+
$fassert!(<$fty>::INFINITY.fract().is_nan());
1062+
$fassert!(<$fty>::NEG_INFINITY.fract().is_nan());
10631063
}
10641064
}
10651065
};

0 commit comments

Comments
 (0)