Skip to content

Commit

Permalink
Change std::fmt::{Float,LowerExp,UpperExp} to not print '-NaN' for f3…
Browse files Browse the repository at this point in the history
…2::NAN and f64::NAN
  • Loading branch information
nham committed Aug 12, 2014
1 parent 6faad3e commit 04233a1
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 3 deletions.
7 changes: 4 additions & 3 deletions src/libcore/fmt/mod.rs
Expand Up @@ -19,6 +19,7 @@ use collections::Collection;
use iter::{Iterator, range};
use kinds::Copy;
use mem;
use num::Float;
use option::{Option, Some, None};
use ops::Deref;
use result::{Ok, Err};
Expand Down Expand Up @@ -584,7 +585,7 @@ macro_rules! floating(($ty:ident) => {
float::ExpNone,
false,
|bytes| {
fmt.pad_integral(*self >= 0.0, "", bytes)
fmt.pad_integral(self.is_nan() || *self >= 0.0, "", bytes)
})
}
}
Expand All @@ -605,7 +606,7 @@ macro_rules! floating(($ty:ident) => {
float::ExpDec,
false,
|bytes| {
fmt.pad_integral(*self >= 0.0, "", bytes)
fmt.pad_integral(self.is_nan() || *self >= 0.0, "", bytes)
})
}
}
Expand All @@ -626,7 +627,7 @@ macro_rules! floating(($ty:ident) => {
float::ExpDec,
true,
|bytes| {
fmt.pad_integral(*self >= 0.0, "", bytes)
fmt.pad_integral(self.is_nan() || *self >= 0.0, "", bytes)
})
}
}
Expand Down
18 changes: 18 additions & 0 deletions src/test/run-pass/format-nan.rs
@@ -0,0 +1,18 @@
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

pub fn main() {
use std::f64;
let x = "NaN".to_string();
assert_eq!(format!("{}", f64::NAN), x);
assert_eq!(format!("{:e}", f64::NAN), x);
assert_eq!(format!("{:E}", f64::NAN), x);
}

5 comments on commit 04233a1

@bors
Copy link
Contributor

@bors bors commented on 04233a1 Aug 12, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at nham@04233a1

@bors
Copy link
Contributor

@bors bors commented on 04233a1 Aug 12, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging nham/rust/fix_nan_format = 04233a1 into auto

@bors
Copy link
Contributor

@bors bors commented on 04233a1 Aug 12, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nham/rust/fix_nan_format = 04233a1 merged ok, testing candidate = c1eaafe

@bors
Copy link
Contributor

@bors bors commented on 04233a1 Aug 12, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = c1eaafe

Please sign in to comment.