From 85d0c8e4e8b5944f98ffae9bcb403ce8cae921bb Mon Sep 17 00:00:00 2001 From: Thomas Bahn Date: Tue, 30 Dec 2014 14:38:39 +0100 Subject: [PATCH] Rename FP* to FpCategory::* following std changes --- serde2/src/json/ser.rs | 4 ++-- src/json/ser.rs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/serde2/src/json/ser.rs b/serde2/src/json/ser.rs index 57fa3c3e..dae76117 100644 --- a/serde2/src/json/ser.rs +++ b/serde2/src/json/ser.rs @@ -1,6 +1,6 @@ use std::f64; use std::io::{mod, ByRefWriter, IoError}; -use std::num::{Float, FPNaN, FPInfinite}; +use std::num::{Float, FpCategory}; use std::str::Utf8Error; use ser; @@ -225,7 +225,7 @@ pub fn escape_char(wr: &mut W, value: char) -> Result<(), IoError fn fmt_f64_or_null(wr: &mut W, value: f64) -> Result<(), IoError> { match value.classify() { - FPNaN | FPInfinite => wr.write_str("null"), + FpCategory::Nan | FpCategory::Infinite => wr.write_str("null"), _ => wr.write_str(f64::to_str_digits(value, 6).as_slice()), } } diff --git a/src/json/ser.rs b/src/json/ser.rs index ac07b677..c5d56693 100644 --- a/src/json/ser.rs +++ b/src/json/ser.rs @@ -1,6 +1,6 @@ use std::f32; use std::f64; -use std::num::{Float, FPNaN, FPInfinite}; +use std::num::{Float, FpCategory}; use std::io::{IoError, IoResult}; use std::str::Utf8Error; @@ -52,14 +52,14 @@ fn escape_char(wr: &mut W, v: char) -> IoResult<()> { fn fmt_f32_or_null(wr: &mut W, v: f32) -> IoResult<()> { match v.classify() { - FPNaN | FPInfinite => wr.write_str("null"), + FpCategory::Nan | FpCategory::Infinite => wr.write_str("null"), _ => wr.write_str(f32::to_str_digits(v, 6).as_slice()), } } fn fmt_f64_or_null(wr: &mut W, v: f64) -> IoResult<()> { match v.classify() { - FPNaN | FPInfinite => wr.write_str("null"), + FpCategory::Nan | FpCategory::Infinite => wr.write_str("null"), _ => wr.write_str(f64::to_str_digits(v, 6).as_slice()), } }