Skip to content

Commit ccb80ab

Browse files
borsbors
committed
auto merge of #9321 : chris-morgan/rust/lowercase-nan-methods, r=brson
This is for consistency in naming conventions. - ``std::num::Float::NaN()`` is changed to ``nan()``; - ``std::num::Float.is_NaN()`` is changed to ``is_nan()``; and - ``std::num::strconv::NumStrConv::NaN()`` is changed to ``nan()``. Fixes #9319.
2 parents e5fdc7d + d9874c0 commit ccb80ab

File tree

8 files changed

+138
-138
lines changed

8 files changed

+138
-138
lines changed

‎src/librustc/middle/check_match.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ pub fn check_arms(cx: &MatchCheckCtxt, arms: &[Arm]) {
126126
Some(&DefStatic(did, false)) => {
127127
let const_expr = lookup_const_by_id(cx.tcx, did).unwrap();
128128
match eval_const_expr(cx.tcx, const_expr) {
129-
const_float(f) if f.is_NaN() => true,
129+
const_float(f) if f.is_nan() => true,
130130
_ => false
131131
}
132132
}
@@ -136,7 +136,7 @@ pub fn check_arms(cx: &MatchCheckCtxt, arms: &[Arm]) {
136136
do walk_pat(*pat) |p| {
137137
if pat_matches_nan(p) {
138138
cx.tcx.sess.span_warn(p.span, "unmatchable NaN in pattern, \
139-
use the is_NaN method in a guard instead");
139+
use the is_nan method in a guard instead");
140140
}
141141
true
142142
};

‎src/libstd/num/f32.rs‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,8 @@ impl Orderable for f32 {
207207
#[inline]
208208
fn min(&self, other: &f32) -> f32 {
209209
match () {
210-
_ if self.is_NaN() => *self,
211-
_ if other.is_NaN() => *other,
210+
_ if self.is_nan() => *self,
211+
_ if other.is_nan() => *other,
212212
_ if *self < *other => *self,
213213
_ => *other,
214214
}
@@ -218,8 +218,8 @@ impl Orderable for f32 {
218218
#[inline]
219219
fn max(&self, other: &f32) -> f32 {
220220
match () {
221-
_ if self.is_NaN() => *self,
222-
_ if other.is_NaN() => *other,
221+
_ if self.is_nan() => *self,
222+
_ if other.is_nan() => *other,
223223
_ if *self > *other => *self,
224224
_ => *other,
225225
}
@@ -230,7 +230,7 @@ impl Orderable for f32 {
230230
#[inline]
231231
fn clamp(&self, mn: &f32, mx: &f32) -> f32 {
232232
match () {
233-
_ if self.is_NaN() => *self,
233+
_ if self.is_nan() => *self,
234234
_ if !(*self <= *mx) => *mx,
235235
_ if !(*self >= *mn) => *mn,
236236
_ => *self,
@@ -314,7 +314,7 @@ impl Signed for f32 {
314314
///
315315
#[inline]
316316
fn signum(&self) -> f32 {
317-
if self.is_NaN() { NaN } else { copysign(1.0, *self) }
317+
if self.is_nan() { NaN } else { copysign(1.0, *self) }
318318
}
319319

320320
/// Returns `true` if the number is positive, including `+0.0` and `infinity`
@@ -471,7 +471,7 @@ impl Hyperbolic for f32 {
471471
#[inline]
472472
fn acosh(&self) -> f32 {
473473
match *self {
474-
x if x < 1.0 => Float::NaN(),
474+
x if x < 1.0 => Float::nan(),
475475
x => (x + ((x * x) - 1.0).sqrt()).ln(),
476476
}
477477
}
@@ -593,7 +593,7 @@ impl Primitive for f32 {
593593

594594
impl Float for f32 {
595595
#[inline]
596-
fn NaN() -> f32 { 0.0 / 0.0 }
596+
fn nan() -> f32 { 0.0 / 0.0 }
597597

598598
#[inline]
599599
fn infinity() -> f32 { 1.0 / 0.0 }
@@ -606,7 +606,7 @@ impl Float for f32 {
606606

607607
/// Returns `true` if the number is NaN
608608
#[inline]
609-
fn is_NaN(&self) -> bool { *self != *self }
609+
fn is_nan(&self) -> bool { *self != *self }
610610

611611
/// Returns `true` if the number is infinite
612612
#[inline]
@@ -617,7 +617,7 @@ impl Float for f32 {
617617
/// Returns `true` if the number is neither infinite or NaN
618618
#[inline]
619619
fn is_finite(&self) -> bool {
620-
!(self.is_NaN() || self.is_infinite())
620+
!(self.is_nan() || self.is_infinite())
621621
}
622622

623623
/// Returns `true` if the number is neither zero, infinite, subnormal or NaN
@@ -949,10 +949,10 @@ mod tests {
949949
assert_eq!(8f32.clamp(&2f32, &4f32), 4f32);
950950
assert_eq!(3f32.clamp(&2f32, &4f32), 3f32);
951951

952-
let nan: f32 = Float::NaN();
953-
assert!(3f32.clamp(&nan, &4f32).is_NaN());
954-
assert!(3f32.clamp(&2f32, &nan).is_NaN());
955-
assert!(nan.clamp(&2f32, &4f32).is_NaN());
952+
let nan: f32 = Float::nan();
953+
assert!(3f32.clamp(&nan, &4f32).is_nan());
954+
assert!(3f32.clamp(&2f32, &nan).is_nan());
955+
assert!(nan.clamp(&2f32, &4f32).is_nan());
956956
}
957957

958958
#[test]
@@ -1032,25 +1032,25 @@ mod tests {
10321032

10331033
let inf: f32 = Float::infinity();
10341034
let neg_inf: f32 = Float::neg_infinity();
1035-
let nan: f32 = Float::NaN();
1035+
let nan: f32 = Float::nan();
10361036
assert_eq!(inf.asinh(), inf);
10371037
assert_eq!(neg_inf.asinh(), neg_inf);
1038-
assert!(nan.asinh().is_NaN());
1038+
assert!(nan.asinh().is_nan());
10391039
assert_approx_eq!(2.0f32.asinh(), 1.443635475178810342493276740273105f32);
10401040
assert_approx_eq!((-2.0f32).asinh(), -1.443635475178810342493276740273105f32);
10411041
}
10421042

10431043
#[test]
10441044
fn test_acosh() {
10451045
assert_eq!(1.0f32.acosh(), 0.0f32);
1046-
assert!(0.999f32.acosh().is_NaN());
1046+
assert!(0.999f32.acosh().is_nan());
10471047

10481048
let inf: f32 = Float::infinity();
10491049
let neg_inf: f32 = Float::neg_infinity();
1050-
let nan: f32 = Float::NaN();
1050+
let nan: f32 = Float::nan();
10511051
assert_eq!(inf.acosh(), inf);
1052-
assert!(neg_inf.acosh().is_NaN());
1053-
assert!(nan.acosh().is_NaN());
1052+
assert!(neg_inf.acosh().is_nan());
1053+
assert!(nan.acosh().is_nan());
10541054
assert_approx_eq!(2.0f32.acosh(), 1.31695789692481670862504634730796844f32);
10551055
assert_approx_eq!(3.0f32.acosh(), 1.76274717403908605046521864995958461f32);
10561056
}
@@ -1065,15 +1065,15 @@ mod tests {
10651065
assert_eq!(1.0f32.atanh(), inf32);
10661066
assert_eq!((-1.0f32).atanh(), neg_inf32);
10671067

1068-
assert!(2f64.atanh().atanh().is_NaN());
1069-
assert!((-2f64).atanh().atanh().is_NaN());
1068+
assert!(2f64.atanh().atanh().is_nan());
1069+
assert!((-2f64).atanh().atanh().is_nan());
10701070

10711071
let inf64: f32 = Float::infinity();
10721072
let neg_inf64: f32 = Float::neg_infinity();
1073-
let nan32: f32 = Float::NaN();
1074-
assert!(inf64.atanh().is_NaN());
1075-
assert!(neg_inf64.atanh().is_NaN());
1076-
assert!(nan32.atanh().is_NaN());
1073+
let nan32: f32 = Float::nan();
1074+
assert!(inf64.atanh().is_nan());
1075+
assert!(neg_inf64.atanh().is_nan());
1076+
assert!(nan32.atanh().is_nan());
10771077

10781078
assert_approx_eq!(0.5f32.atanh(), 0.54930614433405484569762261846126285f32);
10791079
assert_approx_eq!((-0.5f32).atanh(), -0.54930614433405484569762261846126285f32);
@@ -1125,7 +1125,7 @@ mod tests {
11251125
assert_eq!((-1f32).abs(), 1f32);
11261126
assert_eq!(neg_infinity.abs(), infinity);
11271127
assert_eq!((1f32/neg_infinity).abs(), 0f32);
1128-
assert!(NaN.abs().is_NaN());
1128+
assert!(NaN.abs().is_nan());
11291129
}
11301130

11311131
#[test]
@@ -1142,8 +1142,8 @@ mod tests {
11421142

11431143
#[test] #[ignore(cfg(windows))] // FIXME #8663
11441144
fn test_abs_sub_nowin() {
1145-
assert!(NaN.abs_sub(&-1f32).is_NaN());
1146-
assert!(1f32.abs_sub(&NaN).is_NaN());
1145+
assert!(NaN.abs_sub(&-1f32).is_nan());
1146+
assert!(1f32.abs_sub(&NaN).is_nan());
11471147
}
11481148

11491149
#[test]
@@ -1155,7 +1155,7 @@ mod tests {
11551155
assert_eq!((-1f32).signum(), -1f32);
11561156
assert_eq!(neg_infinity.signum(), -1f32);
11571157
assert_eq!((1f32/neg_infinity).signum(), -1f32);
1158-
assert!(NaN.signum().is_NaN());
1158+
assert!(NaN.signum().is_nan());
11591159
}
11601160

11611161
#[test]
@@ -1200,7 +1200,7 @@ mod tests {
12001200

12011201
#[test]
12021202
fn test_is_normal() {
1203-
let nan: f32 = Float::NaN();
1203+
let nan: f32 = Float::nan();
12041204
let inf: f32 = Float::infinity();
12051205
let neg_inf: f32 = Float::neg_infinity();
12061206
let zero: f32 = Zero::zero();
@@ -1217,7 +1217,7 @@ mod tests {
12171217

12181218
#[test]
12191219
fn test_classify() {
1220-
let nan: f32 = Float::NaN();
1220+
let nan: f32 = Float::nan();
12211221
let inf: f32 = Float::infinity();
12221222
let neg_inf: f32 = Float::neg_infinity();
12231223
let zero: f32 = Zero::zero();
@@ -1246,10 +1246,10 @@ mod tests {
12461246

12471247
let inf: f32 = Float::infinity();
12481248
let neg_inf: f32 = Float::neg_infinity();
1249-
let nan: f32 = Float::NaN();
1249+
let nan: f32 = Float::nan();
12501250
assert_eq!(Float::ldexp(inf, -123), inf);
12511251
assert_eq!(Float::ldexp(neg_inf, -123), neg_inf);
1252-
assert!(Float::ldexp(nan, -123).is_NaN());
1252+
assert!(Float::ldexp(nan, -123).is_nan());
12531253
}
12541254

12551255
#[test]
@@ -1273,9 +1273,9 @@ mod tests {
12731273
fn test_frexp_nowin() {
12741274
let inf: f32 = Float::infinity();
12751275
let neg_inf: f32 = Float::neg_infinity();
1276-
let nan: f32 = Float::NaN();
1276+
let nan: f32 = Float::nan();
12771277
assert_eq!(match inf.frexp() { (x, _) => x }, inf)
12781278
assert_eq!(match neg_inf.frexp() { (x, _) => x }, neg_inf)
1279-
assert!(match nan.frexp() { (x, _) => x.is_NaN() })
1279+
assert!(match nan.frexp() { (x, _) => x.is_nan() })
12801280
}
12811281
}

0 commit comments

Comments
 (0)