diff --git a/src/libcore/core.rc b/src/libcore/core.rc index 146ce946e60c..21a9de756b1b 100644 --- a/src/libcore/core.rc +++ b/src/libcore/core.rc @@ -183,9 +183,7 @@ mod u64 { mod box; mod char; mod float; -#[legacy_exports] mod f32; -#[legacy_exports] mod f64; #[legacy_exports] mod str; diff --git a/src/libcore/f32.rs b/src/libcore/f32.rs index 3d3f25e7bee4..ec0e66734fa3 100644 --- a/src/libcore/f32.rs +++ b/src/libcore/f32.rs @@ -4,24 +4,9 @@ //! Operations and constants for `f32` -// PORT - pub use cmath::c_float::*; pub use cmath::c_float_targ_consts::*; -export add, sub, mul, div, rem, lt, le, eq, ne, ge, gt; -export is_positive, is_negative, is_nonpositive, is_nonnegative; -export is_zero, is_infinite, is_finite; -export NaN, is_NaN, infinity, neg_infinity; -export consts; -export logarithm; -export acos, asin, atan, atan2, cbrt, ceil, copysign, cos, cosh, floor; -export erf, erfc, exp, expm1, exp2, abs, abs_sub; -export mul_add, fmax, fmin, nextafter, frexp, hypot, ldexp; -export lgamma, ln, log_radix, ln1p, log10, log2, ilog_radix; -export modf, pow, round, sin, sinh, sqrt, tan, tanh, tgamma, trunc; -export signbit; - // These are not defined inside consts:: for consistency with // the integer types diff --git a/src/libcore/f64.rs b/src/libcore/f64.rs index 6066b6688f17..731d369649b1 100644 --- a/src/libcore/f64.rs +++ b/src/libcore/f64.rs @@ -4,39 +4,14 @@ //! Operations and constants for `f64` -// PORT +pub use cmath::c_double::*; +pub use cmath::c_double_targ_consts::*; -use cmath::c_double::*; -use cmath::c_double_targ_consts::*; +// FIXME (#1433): obtain these in a different way // These are not defined inside consts:: for consistency with // the integer types -// Even though this module exports everything defined in it, -// because it contains re-exports, we also have to explicitly -// export locally defined things. That's a bit annoying. -export add, sub, mul, div, rem, lt, le, eq, ne, ge, gt; -export is_positive, is_negative, is_nonpositive, is_nonnegative; -export is_zero, is_infinite, is_finite; -export NaN, is_NaN, infinity, neg_infinity; -export consts; -export logarithm; -export acos, asin, atan, atan2, cbrt, ceil, copysign, cos, cosh, floor; -export erf, erfc, exp, expm1, exp2, abs, abs_sub; -export mul_add, fmax, fmin, nextafter, frexp, hypot, ldexp; -export lgamma, ln, log_radix, ln1p, log10, log2, ilog_radix; -export modf, pow, round, sin, sinh, sqrt, tan, tanh, tgamma, trunc; -export signbit; -export epsilon; - -export j0, j1, jn, y0, y1, yn; - -export num; - -// PORT check per architecture - -// FIXME (#1433): obtain these in a different way - pub const radix: uint = 2u; pub const mantissa_digits: uint = 53u;