Browse Source

Make ctru-rs compile again

pull/10/head
Cristian Carlesso 8 years ago
parent
commit
e617cba567
  1. 2
      ctr-std/src/collections/hash/table.rs
  2. 34
      ctr-std/src/f32.rs
  3. 30
      ctr-std/src/f64.rs
  4. 3
      ctr-std/src/lib.rs
  5. 4
      ctr-std/src/num.rs
  6. 2
      ctru-rs/Xargo.toml

2
ctr-std/src/collections/hash/table.rs

@ -975,7 +975,7 @@ impl<'a, K, V> Iterator for Drain<'a, K, V> {
fn next(&mut self) -> Option<(SafeHash, K, V)> { fn next(&mut self) -> Option<(SafeHash, K, V)> {
self.iter.next().map(|bucket| { self.iter.next().map(|bucket| {
unsafe { unsafe {
(**self.table).size -= 1; (*self.table.as_mut_ptr()).size -= 1;
let (k, v) = ptr::read(bucket.pair); let (k, v) = ptr::read(bucket.pair);
(SafeHash { hash: ptr::replace(bucket.hash, EMPTY_BUCKET) }, k, v) (SafeHash { hash: ptr::replace(bucket.hash, EMPTY_BUCKET) }, k, v)
} }

34
ctr-std/src/f32.rs

@ -242,40 +242,6 @@ impl f32 {
#[inline] #[inline]
pub fn classify(self) -> FpCategory { num::Float::classify(self) } pub fn classify(self) -> FpCategory { num::Float::classify(self) }
/// Returns the mantissa, base 2 exponent, and sign as integers, respectively.
/// The original number can be recovered by `sign * mantissa * 2 ^ exponent`.
/// The floating point encoding is documented in the [Reference][floating-point].
///
/// ```
/// #![feature(float_extras)]
///
/// use std::f32;
///
/// let num = 2.0f32;
///
/// // (8388608, -22, 1)
/// let (mantissa, exponent, sign) = num.integer_decode();
/// let sign_f = sign as f32;
/// let mantissa_f = mantissa as f32;
/// let exponent_f = num.powf(exponent as f32);
///
/// // 1 * 8388608 * 2^(-22) == 2
/// let abs_difference = (sign_f * mantissa_f * exponent_f - num).abs();
///
/// assert!(abs_difference <= f32::EPSILON);
/// ```
/// [floating-point]: ../reference.html#machine-types
#[unstable(feature = "float_extras", reason = "signature is undecided",
issue = "27752")]
#[rustc_deprecated(since = "1.11.0",
reason = "never really came to fruition and easily \
implementable outside the standard library")]
#[inline]
#[allow(deprecated)]
pub fn integer_decode(self) -> (u64, i16, i8) {
num::Float::integer_decode(self)
}
/// Returns the largest integer less than or equal to a number. /// Returns the largest integer less than or equal to a number.
/// ///
/// ``` /// ```

30
ctr-std/src/f64.rs

@ -186,36 +186,6 @@ impl f64 {
#[inline] #[inline]
pub fn classify(self) -> FpCategory { num::Float::classify(self) } pub fn classify(self) -> FpCategory { num::Float::classify(self) }
/// Returns the mantissa, base 2 exponent, and sign as integers, respectively.
/// The original number can be recovered by `sign * mantissa * 2 ^ exponent`.
/// The floating point encoding is documented in the [Reference][floating-point].
///
/// ```
/// #![feature(float_extras)]
///
/// let num = 2.0f64;
///
/// // (8388608, -22, 1)
/// let (mantissa, exponent, sign) = num.integer_decode();
/// let sign_f = sign as f64;
/// let mantissa_f = mantissa as f64;
/// let exponent_f = num.powf(exponent as f64);
///
/// // 1 * 8388608 * 2^(-22) == 2
/// let abs_difference = (sign_f * mantissa_f * exponent_f - num).abs();
///
/// assert!(abs_difference < 1e-10);
/// ```
/// [floating-point]: ../reference.html#machine-types
#[unstable(feature = "float_extras", reason = "signature is undecided",
issue = "27752")]
#[rustc_deprecated(since = "1.11.0",
reason = "never really came to fruition and easily \
implementable outside the standard library")]
#[inline]
#[allow(deprecated)]
pub fn integer_decode(self) -> (u64, i16, i8) { num::Float::integer_decode(self) }
/// Returns the largest integer less than or equal to a number. /// Returns the largest integer less than or equal to a number.
/// ///
/// ``` /// ```

3
ctr-std/src/lib.rs

@ -4,8 +4,8 @@
#![feature(cfg_target_has_atomic)] #![feature(cfg_target_has_atomic)]
#![feature(cfg_target_thread_local)] #![feature(cfg_target_thread_local)]
#![feature(collections)] #![feature(collections)]
#![feature(collections_bound)]
#![feature(collections_range)] #![feature(collections_range)]
#![feature(core_float)]
#![feature(const_fn)] #![feature(const_fn)]
#![feature(compiler_builtins_lib)] #![feature(compiler_builtins_lib)]
#![feature(core_intrinsics)] #![feature(core_intrinsics)]
@ -44,6 +44,7 @@
#![allow(non_camel_case_types, dead_code, unused_features)] #![allow(non_camel_case_types, dead_code, unused_features)]
#![no_std] #![no_std]
#![stable(feature = "rust1", since = "1.0.0")] #![stable(feature = "rust1", since = "1.0.0")]
#[prelude_import] #[prelude_import]

4
ctr-std/src/num.rs

@ -16,11 +16,9 @@
#![stable(feature = "rust1", since = "1.0.0")] #![stable(feature = "rust1", since = "1.0.0")]
#![allow(missing_docs)] #![allow(missing_docs)]
#[stable(feature = "rust1", since = "1.0.0")]
#[allow(deprecated)]
pub use core::num::{Zero, One};
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
pub use core::num::{FpCategory, ParseIntError, ParseFloatError, TryFromIntError}; pub use core::num::{FpCategory, ParseIntError, ParseFloatError, TryFromIntError};
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
pub use core::num::Wrapping; pub use core::num::Wrapping;

2
ctru-rs/Xargo.toml

@ -1,5 +1,7 @@
[dependencies.collections] [dependencies.collections]
[dependencies.rand]
[dependencies.ctr-libc] [dependencies.ctr-libc]
path = "../ctr-libc" path = "../ctr-libc"
stage = 1 stage = 1

Loading…
Cancel
Save