From 233c02030d8982637cca637b3843955e9cbff6c3 Mon Sep 17 00:00:00 2001 From: gifnksm Date: Tue, 18 Nov 2014 21:09:53 +0900 Subject: [PATCH] Fix for namespaced enums. --- src/bigint.rs | 7 +++++-- src/rational.rs | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/bigint.rs b/src/bigint.rs index f895198..b5d4845 100644 --- a/src/bigint.rs +++ b/src/bigint.rs @@ -67,6 +67,7 @@ use std::str::{mod, FromStr}; use std::{i64, u64}; use {Num, Unsigned, CheckedAdd, CheckedSub, CheckedMul, CheckedDiv, Signed, Zero, One}; +use self::Sign::{Minus, NoSign, Plus}; /// A `BigDigit` is a `BigUint`'s composing element. pub type BigDigit = u32; @@ -1471,7 +1472,8 @@ impl BigInt { mod biguint_tests { use Integer; use super::{BigDigit, BigUint, ToBigUint, to_str_radix}; - use super::{Plus, BigInt, RandBigInt, ToBigInt}; + use super::{BigInt, RandBigInt, ToBigInt}; + use super::Sign::Plus; use std::cmp::{Less, Equal, Greater}; use std::str::FromStr; @@ -2335,7 +2337,8 @@ mod biguint_tests { mod bigint_tests { use Integer; use super::{BigDigit, BigUint, ToBigUint}; - use super::{Sign, Minus, NoSign, Plus, BigInt, RandBigInt, ToBigInt}; + use super::{Sign, BigInt, RandBigInt, ToBigInt}; + use super::Sign::{Minus, NoSign, Plus}; use std::cmp::{Less, Equal, Greater}; use std::i64; diff --git a/src/rational.rs b/src/rational.rs index e5875ad..14831c5 100644 --- a/src/rational.rs +++ b/src/rational.rs @@ -18,7 +18,7 @@ use std::str::FromStr; use std::num::{FromStrRadix, Float}; use std::iter::{AdditiveIterator, MultiplicativeIterator}; -use bigint::{BigInt, BigUint, Sign, Plus, Minus}; +use bigint::{BigInt, BigUint, Sign}; use {Num, Signed, Zero, One}; /// Represents the ratio between 2 numbers. @@ -186,7 +186,7 @@ impl Ratio { return None; } let (mantissa, exponent, sign) = f.integer_decode(); - let bigint_sign: Sign = if sign == 1 { Plus } else { Minus }; + let bigint_sign = if sign == 1 { Sign::Plus } else { Sign::Minus }; if exponent < 0 { let one: BigInt = One::one(); let denom: BigInt = one << ((-exponent) as uint);