Fix ToStrRadix and str.to_owned() deprecations

Sadly there doesn't seem to be a replacement for ToStrRadix on user
types at the moment. See: rust-lang/rust#18301

Author: jsanders

src/lib.rs

@@ -10,7 +10,7 @@
 extern crate libc;
 
 use libc::{c_char, c_double, c_int, c_long, c_ulong, c_void, size_t};
-use std::num::{One, Zero, ToStrRadix};
+use std::num::{One, Zero};
 use std::mem::{uninitialized,size_of};
 use std::{cmp, fmt};
 use std::from_str::FromStr;
@@ -181,6 +181,29 @@ impl Mpz {
         }
     }
 
+    // TODO: fail on an invalid base
+    // FIXME: Unfortunately it isn't currently possible to use the fmt::RadixFmt
+    //        machinery for a custom type.
+    fn to_str_radix(&self, base: uint) -> String {
+        unsafe {
+            // Extra two bytes are for possible minus sign and null terminator
+            let len = __gmpz_sizeinbase(&self.mpz, base as c_int) as uint + 2;
+
+            // Allocate and write into a raw *c_char of the correct length
+            let mut vector: Vec<u8> = Vec::with_capacity(len);
+            vector.set_len(len);
+
+            let mut cstr = vector.as_slice().to_c_str_unchecked();
+
+            __gmpz_get_str(cstr.as_mut_ptr(), base as c_int, &self.mpz);
+
+            match cstr.as_str() {
+                Some(slice) => slice.to_string(),
+                None        => fail!("GMP returned invalid UTF-8!")
+            }
+        }
+    }
+
     pub fn from_str_radix(s: &str, base: uint) -> Option<Mpz> {
         unsafe {
             assert!(base == 0 || (base >= 2 && base <= 62));
@@ -540,29 +563,6 @@ impl FromStr for Mpz {
     }
 }
 
-impl ToStrRadix for Mpz {
-    // TODO: fail on an invalid base
-    fn to_str_radix(&self, base: uint) -> String {
-        unsafe {
-            // Extra two bytes are for possible minus sign and null terminator
-            let len = __gmpz_sizeinbase(&self.mpz, base as c_int) as uint + 2;
-
-            // Allocate and write into a raw *c_char of the correct length
-            let mut vector: Vec<u8> = Vec::with_capacity(len);
-            vector.set_len(len);
-
-            let mut cstr = vector.as_slice().to_c_str_unchecked();
-
-            __gmpz_get_str(cstr.as_mut_ptr(), base as c_int, &self.mpz);
-
-            match cstr.as_str() {
-                Some(slice) => slice.to_string(),
-                None        => fail!("GMP returned invalid UTF-8!")
-            }
-        }
-    }
-}
-
 impl fmt::Show for Mpz {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "{}", self.to_str_radix(10))

src/test.rs

@@ -3,7 +3,6 @@ mod mpz {
     use std::from_str::FromStr;
     use std::num::One;
     use libc::c_ulong;
-    use std::num::ToStrRadix;
 
     #[test]
     fn test_set() {
@@ -107,13 +106,13 @@ mod mpz {
     #[test]
     fn test_to_str_radix() {
         let x: Mpz = FromPrimitive::from_int(255).unwrap();
-        assert!(x.to_str_radix(16) == "ff".to_owned());
+        assert!(x.to_str_radix(16) == "ff".to_string());
     }
 
     #[test]
     fn test_to_string() {
         let x: Mpz = FromStr::from_str("1234567890").unwrap();
-        assert!(x.to_string() == "1234567890".to_owned());
+        assert!(x.to_string() == "1234567890".to_string());
     }
 
     #[test]
@@ -134,7 +133,7 @@ mod mpz {
     #[test]
     fn test_from_int() {
         let x: Mpz = FromPrimitive::from_int(150).unwrap();
-        assert!(x.to_string() == "150".to_owned());
+        assert!(x.to_string() == "150".to_string());
         assert!(x == FromStr::from_str("150").unwrap());
     }