Merge pull request #43 from zsiciarz/master

Update to latest rustc
This commit is contained in:
Alex Crichton 2014-12-23 11:45:00 -06:00
commit e0e63cf241
1 changed files with 4 additions and 4 deletions

View File

@ -851,7 +851,7 @@ impl BigUint {
/// Creates and initializes a `BigUint`. /// Creates and initializes a `BigUint`.
#[inline] #[inline]
pub fn parse_bytes(buf: &[u8], radix: uint) -> Option<BigUint> { pub fn parse_bytes(buf: &[u8], radix: uint) -> Option<BigUint> {
str::from_utf8(buf).and_then(|s| FromStrRadix::from_str_radix(s, radix)) str::from_utf8(buf).ok().and_then(|s| FromStrRadix::from_str_radix(s, radix))
} }
#[inline] #[inline]
@ -1535,7 +1535,7 @@ impl BigInt {
/// Creates and initializes a `BigInt`. /// Creates and initializes a `BigInt`.
#[inline] #[inline]
pub fn parse_bytes(buf: &[u8], radix: uint) -> Option<BigInt> { pub fn parse_bytes(buf: &[u8], radix: uint) -> Option<BigInt> {
str::from_utf8(buf).and_then(|s| FromStrRadix::from_str_radix(s, radix)) str::from_utf8(buf).ok().and_then(|s| FromStrRadix::from_str_radix(s, radix))
} }
@ -1580,7 +1580,7 @@ mod biguint_tests {
use super::{BigInt, RandBigInt, ToBigInt}; use super::{BigInt, RandBigInt, ToBigInt};
use super::Sign::Plus; use super::Sign::Plus;
use std::cmp::{Less, Equal, Greater}; use std::cmp::Ordering::{Less, Equal, Greater};
use std::str::FromStr; use std::str::FromStr;
use std::i64; use std::i64;
use std::num::FromStrRadix; use std::num::FromStrRadix;
@ -2446,7 +2446,7 @@ mod bigint_tests {
use super::{Sign, BigInt, RandBigInt, ToBigInt}; use super::{Sign, BigInt, RandBigInt, ToBigInt};
use super::Sign::{Minus, NoSign, Plus}; use super::Sign::{Minus, NoSign, Plus};
use std::cmp::{Less, Equal, Greater}; use std::cmp::Ordering::{Less, Equal, Greater};
use std::i64; use std::i64;
use std::num::FromStrRadix; use std::num::FromStrRadix;
use std::num::{ToPrimitive, FromPrimitive}; use std::num::{ToPrimitive, FromPrimitive};