Fix deprecated use of base64::en/decode (#1216)

Change: base64endecode

Author: LMG

hyper_cgi/src/bin/hyper-cgi-test-server.rs

@@ -9,6 +9,11 @@ use futures::FutureExt;
 
 use hyper::server::Server;
 
+// Import the base64 crate Engine trait anonymously so we can
+// call its methods without adding to the namespace.
+use base64::engine::general_purpose::STANDARD as BASE64;
+use base64::engine::Engine as _;
+
 #[macro_export]
 macro_rules! some_or {
     ($e:expr, $b:block) => {
@@ -51,7 +56,7 @@ pub fn parse_auth(req: &hyper::Request<hyper::Body>) -> Option<(String, String)>
     let u = ok_or!(String::from_utf8(line[6..].to_vec()), {
         return None;
     });
-    let decoded = ok_or!(base64::decode(&u), {
+    let decoded = ok_or!(BASE64.decode(&u), {
         return None;
     });
     let s = ok_or!(String::from_utf8(decoded), {

josh-proxy/src/auth.rs

@@ -1,3 +1,8 @@
+// Import the base64 crate Engine trait anonymously so we can
+// call its methods without adding to the namespace.
+use base64::engine::general_purpose::STANDARD as BASE64;
+use base64::engine::Engine as _;
+
 lazy_static! {
     static ref AUTH: std::sync::Mutex<std::collections::HashMap<Handle, Header>> =
         std::sync::Mutex::new(std::collections::HashMap::new());
@@ -42,7 +47,7 @@ impl Handle {
         let u = josh::ok_or!(String::from_utf8(line[6..].to_vec()), {
             return Ok(("".to_string(), "".to_string()));
         });
-        let decoded = josh::ok_or!(base64::decode(u), {
+        let decoded = josh::ok_or!(BASE64.decode(u), {
             return Ok(("".to_string(), "".to_string()));
         });
         let s = josh::ok_or!(String::from_utf8(decoded), {
@@ -54,7 +59,7 @@ impl Handle {
 }
 
 pub fn add_auth(token: &str) -> josh::JoshResult<Handle> {
-    let header = hyper::header::HeaderValue::from_str(&format!("Basic {}", base64::encode(token)))?;
+    let header = hyper::header::HeaderValue::from_str(&format!("Basic {}", BASE64.encode(token)))?;
     let hp = Handle {
         hash: format!(
             "{:?}",