Merge pull request #42 from aerospike/base64

Impl: Replace rustc_serialize::base64 with base64 crate

Cargo.toml

@@ -24,7 +24,7 @@ travis-ci = { repository = "aerospike/aerospike-client-rust" }
 log = "^0.3"
 byteorder = "^0.5"
 rust-crypto = "^0.2"
-rustc-serialize = "0.3"
+base64 = "^0.7.0"
 crossbeam = "0.2"
 rand = "0.3"
 scoped-pool = "^1.0"

src/client.rs

@@ -21,7 +21,7 @@ use std::sync::Arc;
 use std::thread;
 use std::vec::Vec;
 
-use rustc_serialize::base64::{ToBase64, FromBase64, STANDARD};
+use base64;
 use scoped_pool::Pool;
 
 use errors::*;
@@ -494,7 +494,7 @@ impl Client {
                         udf_name: &str,
                         language: UDFLang)
                         -> Result<()> {
-        let udf_body = udf_body.to_base64(STANDARD);
+        let udf_body = base64::encode(udf_body);
 
         let cmd = format!("udf-put:filename={};content={};content-len={};udf-type={};",
                           udf_name,
@@ -505,7 +505,7 @@ impl Client {
         let response = try!(node.info(policy.base_policy.timeout, &[&cmd]));
 
         if let Some(msg) = response.get("error") {
-            let msg = try!(msg.from_base64());
+            let msg = base64::decode(msg)?;
             let msg = try!(str::from_utf8(&msg));
             bail!("UDF Registration failed: {}, file: {}, line: {}, message: {}",
                   response.get("error").unwrap_or(&"-".to_string()),

src/cluster/partition_tokenizer.rs

@@ -12,16 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-extern crate rustc_serialize;
-
 use std::str;
 use std::collections::HashMap;
 use std::collections::hash_map::Entry::{Vacant, Occupied};
 use std::vec::Vec;
 use std::sync::Arc;
 
 use parking_lot::RwLock;
-use rustc_serialize::base64::FromBase64;
+use base64;
 
 use errors::*;
 use cluster::Node;
@@ -65,7 +63,7 @@ impl PartitionTokenizer {
         loop {
             match (parts.next(), parts.next()) {
                 (Some(ns), Some(part)) => {
-                    let restore_buffer = try!(part.from_base64());
+                    let restore_buffer = base64::decode(part)?;
                     match amap.entry(ns.to_string()) {
                         Vacant(entry) => {
                             entry.insert(vec![node.clone(); node::PARTITIONS]);

src/errors.rs

@@ -62,8 +62,8 @@ error_chain! {
 // Automatic conversions between this error chain and other error types not defined by the
 // `error_chain!`.
     foreign_links {
-        Base64(::rustc_serialize::base64::FromBase64Error)
-            #[doc = "Error deserializing a Base64 encoded value"];
+        Base64(::base64::DecodeError)
+            #[doc = "Error decoding Base64 encoded value"];
         InvalidUtf8(::std::str::Utf8Error)
             #[doc = "Error interpreting a sequence of u8 as a UTF-8 encoded string."];
         Io(::std::io::Error)

src/lib.rs

@@ -111,7 +111,7 @@
 extern crate log;
 extern crate byteorder;
 extern crate crypto;
-extern crate rustc_serialize;
+extern crate base64;
 extern crate crossbeam;
 extern crate rand;
 extern crate pwhash;