Skip to content

Commit 2896483

Browse files
GuillaumeGomezGuillaumeGomez
authored
Rollup merge of #132439 - tgross35:f16-f128-nan-lint, r=jieyouxu
Add `f16` and `f128` to `invalid_nan_comparison` Currently `f32_nan` and `f64_nan` are used to provide the `invalid_nan_comparison` lint. Since we have `f16_nan` and `f128_nan`, hook these up so the new float types get the same lints.
2 parents c794207 + 3afbe4f commit 2896483

File tree

6 files changed

+299
-30
lines changed

6 files changed

+299
-30
lines changed

‎compiler/rustc_lint/src/types.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,10 @@ fn lint_nan<'tcx>(
204204
return false;
205205
};
206206

207-
matches!(cx.tcx.get_diagnostic_name(def_id), Some(sym::f32_nan | sym::f64_nan))
207+
matches!(
208+
cx.tcx.get_diagnostic_name(def_id),
209+
Some(sym::f16_nan | sym::f32_nan | sym::f64_nan | sym::f128_nan)
210+
)
208211
}
209212
_ => false,
210213
}

‎tests/ui/lint/invalid-nan-comparison-suggestion.fixed‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
//@ check-pass
22
//@ run-rustfix
33

4+
#![feature(f16, f128)]
5+
46
fn main() {
7+
let x = 5f16;
8+
let _ = x.is_nan();
9+
//~^ WARN incorrect NaN comparison
10+
let _ = !x.is_nan();
11+
//~^ WARN incorrect NaN comparison
12+
513
let x = 5f32;
614
let _ = x.is_nan();
715
//~^ WARN incorrect NaN comparison
@@ -14,6 +22,12 @@ fn main() {
1422
let _ = !x.is_nan();
1523
//~^ WARN incorrect NaN comparison
1624

25+
let x = 5f128;
26+
let _ = x.is_nan();
27+
//~^ WARN incorrect NaN comparison
28+
let _ = !x.is_nan();
29+
//~^ WARN incorrect NaN comparison
30+
1731
let b = &2.3f32;
1832
if !b.is_nan() {}
1933
//~^ WARN incorrect NaN comparison

‎tests/ui/lint/invalid-nan-comparison-suggestion.rs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
//@ check-pass
22
//@ run-rustfix
33

4+
#![feature(f16, f128)]
5+
46
fn main() {
7+
let x = 5f16;
8+
let _ = x == f16::NAN;
9+
//~^ WARN incorrect NaN comparison
10+
let _ = x != f16::NAN;
11+
//~^ WARN incorrect NaN comparison
12+
513
let x = 5f32;
614
let _ = x == f32::NAN;
715
//~^ WARN incorrect NaN comparison
@@ -14,6 +22,12 @@ fn main() {
1422
let _ = x != f64::NAN;
1523
//~^ WARN incorrect NaN comparison
1624

25+
let x = 5f128;
26+
let _ = x == f128::NAN;
27+
//~^ WARN incorrect NaN comparison
28+
let _ = x != f128::NAN;
29+
//~^ WARN incorrect NaN comparison
30+
1731
let b = &2.3f32;
1832
if b != &f32::NAN {}
1933
//~^ WARN incorrect NaN comparison

‎tests/ui/lint/invalid-nan-comparison-suggestion.stderr‎

Lines changed: 59 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,42 @@
11
warning: incorrect NaN comparison, NaN cannot be directly compared to itself
2-
--> $DIR/invalid-nan-comparison-suggestion.rs:6:13
2+
--> $DIR/invalid-nan-comparison-suggestion.rs:8:13
33
|
4-
LL | let _ = x == f32::NAN;
4+
LL | let _ = x == f16::NAN;
55
| ^^^^^^^^^^^^^
66
|
77
= note: `#[warn(invalid_nan_comparisons)]` on by default
88
help: use `f32::is_nan()` or `f64::is_nan()` instead
99
|
10+
LL - let _ = x == f16::NAN;
11+
LL + let _ = x.is_nan();
12+
|
13+
14+
warning: incorrect NaN comparison, NaN cannot be directly compared to itself
15+
--> $DIR/invalid-nan-comparison-suggestion.rs:10:13
16+
|
17+
LL | let _ = x != f16::NAN;
18+
| ^^^^^^^^^^^^^
19+
|
20+
help: use `f32::is_nan()` or `f64::is_nan()` instead
21+
|
22+
LL - let _ = x != f16::NAN;
23+
LL + let _ = !x.is_nan();
24+
|
25+
26+
warning: incorrect NaN comparison, NaN cannot be directly compared to itself
27+
--> $DIR/invalid-nan-comparison-suggestion.rs:14:13
28+
|
29+
LL | let _ = x == f32::NAN;
30+
| ^^^^^^^^^^^^^
31+
|
32+
help: use `f32::is_nan()` or `f64::is_nan()` instead
33+
|
1034
LL - let _ = x == f32::NAN;
1135
LL + let _ = x.is_nan();
1236
|
1337

1438
warning: incorrect NaN comparison, NaN cannot be directly compared to itself
15-
--> $DIR/invalid-nan-comparison-suggestion.rs:8:13
39+
--> $DIR/invalid-nan-comparison-suggestion.rs:16:13
1640
|
1741
LL | let _ = x != f32::NAN;
1842
| ^^^^^^^^^^^^^
@@ -24,7 +48,7 @@ LL + let _ = !x.is_nan();
2448
|
2549

2650
warning: incorrect NaN comparison, NaN cannot be directly compared to itself
27-
--> $DIR/invalid-nan-comparison-suggestion.rs:12:13
51+
--> $DIR/invalid-nan-comparison-suggestion.rs:20:13
2852
|
2953
LL | let _ = x == f64::NAN;
3054
| ^^^^^^^^^^^^^
@@ -36,7 +60,7 @@ LL + let _ = x.is_nan();
3660
|
3761

3862
warning: incorrect NaN comparison, NaN cannot be directly compared to itself
39-
--> $DIR/invalid-nan-comparison-suggestion.rs:14:13
63+
--> $DIR/invalid-nan-comparison-suggestion.rs:22:13
4064
|
4165
LL | let _ = x != f64::NAN;
4266
| ^^^^^^^^^^^^^
@@ -48,7 +72,31 @@ LL + let _ = !x.is_nan();
4872
|
4973

5074
warning: incorrect NaN comparison, NaN cannot be directly compared to itself
51-
--> $DIR/invalid-nan-comparison-suggestion.rs:18:8
75+
--> $DIR/invalid-nan-comparison-suggestion.rs:26:13
76+
|
77+
LL | let _ = x == f128::NAN;
78+
| ^^^^^^^^^^^^^^
79+
|
80+
help: use `f32::is_nan()` or `f64::is_nan()` instead
81+
|
82+
LL - let _ = x == f128::NAN;
83+
LL + let _ = x.is_nan();
84+
|
85+
86+
warning: incorrect NaN comparison, NaN cannot be directly compared to itself
87+
--> $DIR/invalid-nan-comparison-suggestion.rs:28:13
88+
|
89+
LL | let _ = x != f128::NAN;
90+
| ^^^^^^^^^^^^^^
91+
|
92+
help: use `f32::is_nan()` or `f64::is_nan()` instead
93+
|
94+
LL - let _ = x != f128::NAN;
95+
LL + let _ = !x.is_nan();
96+
|
97+
98+
warning: incorrect NaN comparison, NaN cannot be directly compared to itself
99+
--> $DIR/invalid-nan-comparison-suggestion.rs:32:8
52100
|
53101
LL | if b != &f32::NAN {}
54102
| ^^^^^^^^^^^^^^
@@ -60,7 +108,7 @@ LL + if !b.is_nan() {}
60108
|
61109

62110
warning: incorrect NaN comparison, NaN cannot be directly compared to itself
63-
--> $DIR/invalid-nan-comparison-suggestion.rs:22:8
111+
--> $DIR/invalid-nan-comparison-suggestion.rs:36:8
64112
|
65113
LL | if b != { &f32::NAN } {}
66114
| ^^^^^^^^^^^^^^^^^^
@@ -72,7 +120,7 @@ LL + if !b.is_nan() {}
72120
|
73121

74122
warning: incorrect NaN comparison, NaN cannot be directly compared to itself
75-
--> $DIR/invalid-nan-comparison-suggestion.rs:26:9
123+
--> $DIR/invalid-nan-comparison-suggestion.rs:40:9
76124
|
77125
LL | / b != {
78126
LL | |
@@ -87,7 +135,7 @@ LL + !b.is_nan();
87135
|
88136

89137
warning: incorrect NaN comparison, NaN cannot be directly compared to itself
90-
--> $DIR/invalid-nan-comparison-suggestion.rs:35:13
138+
--> $DIR/invalid-nan-comparison-suggestion.rs:49:13
91139
|
92140
LL | let _ = nan!() == number!();
93141
| ^^^^^^^^^^^^^^^^^^^
@@ -99,7 +147,7 @@ LL + let _ = number!().is_nan();
99147
|
100148

101149
warning: incorrect NaN comparison, NaN cannot be directly compared to itself
102-
--> $DIR/invalid-nan-comparison-suggestion.rs:37:13
150+
--> $DIR/invalid-nan-comparison-suggestion.rs:51:13
103151
|
104152
LL | let _ = number!() != nan!();
105153
| ^^^^^^^^^^^^^^^^^^^
@@ -110,5 +158,5 @@ LL - let _ = number!() != nan!();
110158
LL + let _ = !number!().is_nan();
111159
|
112160

113-
warning: 9 warnings emitted
161+
warning: 13 warnings emitted
114162

‎tests/ui/lint/invalid-nan-comparison.rs‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,38 @@
11
//@ check-pass
22

3+
#![feature(f16, f128)]
4+
35
fn main() {
6+
f16();
47
f32();
58
f64();
9+
f128();
610
}
711

812
const TEST: bool = 5f32 == f32::NAN;
913
//~^ WARN incorrect NaN comparison
1014

15+
fn f16() {
16+
macro_rules! number { () => { 5f16 }; }
17+
let x = number!();
18+
x == f16::NAN;
19+
//~^ WARN incorrect NaN comparison
20+
x != f16::NAN;
21+
//~^ WARN incorrect NaN comparison
22+
x < f16::NAN;
23+
//~^ WARN incorrect NaN comparison
24+
x > f16::NAN;
25+
//~^ WARN incorrect NaN comparison
26+
x <= f16::NAN;
27+
//~^ WARN incorrect NaN comparison
28+
x >= f16::NAN;
29+
//~^ WARN incorrect NaN comparison
30+
number!() == f16::NAN;
31+
//~^ WARN incorrect NaN comparison
32+
f16::NAN != number!();
33+
//~^ WARN incorrect NaN comparison
34+
}
35+
1136
fn f32() {
1237
macro_rules! number { () => { 5f32 }; }
1338
let x = number!();
@@ -49,3 +74,24 @@ fn f64() {
4974
f64::NAN != number!();
5075
//~^ WARN incorrect NaN comparison
5176
}
77+
78+
fn f128() {
79+
macro_rules! number { () => { 5f128 }; }
80+
let x = number!();
81+
x == f128::NAN;
82+
//~^ WARN incorrect NaN comparison
83+
x != f128::NAN;
84+
//~^ WARN incorrect NaN comparison
85+
x < f128::NAN;
86+
//~^ WARN incorrect NaN comparison
87+
x > f128::NAN;
88+
//~^ WARN incorrect NaN comparison
89+
x <= f128::NAN;
90+
//~^ WARN incorrect NaN comparison
91+
x >= f128::NAN;
92+
//~^ WARN incorrect NaN comparison
93+
number!() == f128::NAN;
94+
//~^ WARN incorrect NaN comparison
95+
f128::NAN != number!();
96+
//~^ WARN incorrect NaN comparison
97+
}

0 commit comments

Comments
 (0)