diff options
| author | bors <bors@rust-lang.org> | 2013-10-22 09:24:48 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-10-22 09:24:48 -0700 |
| commit | fd2c0128a7dd3cb19eda253acd01cd7905d1c7dc (patch) | |
| tree | 5e61220d514b0e59df849455008695490b2e4f42 /src/libstd/num | |
| parent | cd8c7cf61239d4f23868b8765207026f602a79db (diff) | |
| parent | 3ed18bdd42e10f57890befe015f6861d52429e12 (diff) | |
| download | rust-fd2c0128a7dd3cb19eda253acd01cd7905d1c7dc.tar.gz rust-fd2c0128a7dd3cb19eda253acd01cd7905d1c7dc.zip | |
auto merge of #10006 : alexcrichton/rust/another-massive-rename, r=brson
Drop the `2` suffix on all of them, updating all code in the process of doing so. This is a completely automated change, and it's dependent on the snapshots going through.
Diffstat (limited to 'src/libstd/num')
| -rw-r--r-- | src/libstd/num/f32.rs | 2 | ||||
| -rw-r--r-- | src/libstd/num/f64.rs | 2 | ||||
| -rw-r--r-- | src/libstd/num/strconv.rs | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/libstd/num/f32.rs b/src/libstd/num/f32.rs index e99dcd6b2eb..3103731a52f 100644 --- a/src/libstd/num/f32.rs +++ b/src/libstd/num/f32.rs @@ -820,7 +820,7 @@ impl num::ToStrRadix for f32 { fn to_str_radix(&self, rdx: uint) -> ~str { let (r, special) = strconv::float_to_str_common( *self, rdx, true, strconv::SignNeg, strconv::DigAll); - if special { fail2!("number has a special value, \ + if special { fail!("number has a special value, \ try to_str_radix_special() if those are expected") } r } diff --git a/src/libstd/num/f64.rs b/src/libstd/num/f64.rs index f367de376d4..da8270703d7 100644 --- a/src/libstd/num/f64.rs +++ b/src/libstd/num/f64.rs @@ -868,7 +868,7 @@ impl num::ToStrRadix for f64 { fn to_str_radix(&self, rdx: uint) -> ~str { let (r, special) = strconv::float_to_str_common( *self, rdx, true, strconv::SignNeg, strconv::DigAll); - if special { fail2!("number has a special value, \ + if special { fail!("number has a special value, \ try to_str_radix_special() if those are expected") } r } diff --git a/src/libstd/num/strconv.rs b/src/libstd/num/strconv.rs index 0f253a26ccf..d17c947ab56 100644 --- a/src/libstd/num/strconv.rs +++ b/src/libstd/num/strconv.rs @@ -473,19 +473,19 @@ pub fn from_str_bytes_common<T:NumCast+Zero+One+Eq+Ord+Div<T,T>+ ) -> Option<T> { match exponent { ExpDec if radix >= DIGIT_E_RADIX // decimal exponent 'e' - => fail2!("from_str_bytes_common: radix {:?} incompatible with \ + => fail!("from_str_bytes_common: radix {:?} incompatible with \ use of 'e' as decimal exponent", radix), ExpBin if radix >= DIGIT_P_RADIX // binary exponent 'p' - => fail2!("from_str_bytes_common: radix {:?} incompatible with \ + => fail!("from_str_bytes_common: radix {:?} incompatible with \ use of 'p' as binary exponent", radix), _ if special && radix >= DIGIT_I_RADIX // first digit of 'inf' - => fail2!("from_str_bytes_common: radix {:?} incompatible with \ + => fail!("from_str_bytes_common: radix {:?} incompatible with \ special values 'inf' and 'NaN'", radix), _ if (radix as int) < 2 - => fail2!("from_str_bytes_common: radix {:?} to low, \ + => fail!("from_str_bytes_common: radix {:?} to low, \ must lie in the range [2, 36]", radix), _ if (radix as int) > 36 - => fail2!("from_str_bytes_common: radix {:?} to high, \ + => fail!("from_str_bytes_common: radix {:?} to high, \ must lie in the range [2, 36]", radix), _ => () } |