From e1600b0ebe1a1226ed8e1e80390d266ea2fd3331 Mon Sep 17 00:00:00 2001
From: Jeremy Wall <jeremy@marzhillstudios.com>
Date: Mon, 16 Jan 2023 14:53:08 -0500
Subject: [PATCH] update base64 crate

---
 Cargo.lock         | 4 ++--
 Cargo.toml         | 2 +-
 src/convert/b64.rs | 7 ++++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e2a11ac..e5c1841 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -45,9 +45,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "base64"
-version = "0.13.1"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
 
 [[package]]
 name = "bencher"
diff --git a/Cargo.toml b/Cargo.toml
index 2dfcf7c..eb260d0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,7 +26,7 @@ simple-error = "0.2.0"
 serde_yaml = "0.8.17"
 toml = "~0.5.8"
 xml-rs = "0.8.0"
-base64 = "0.13.0"
+base64 = "0.21.0"
 regex = "1"
 dirs = "4.0.0"
 unicode-segmentation = "1.2.1"
diff --git a/src/convert/b64.rs b/src/convert/b64.rs
index cf29af4..a8a2459 100644
--- a/src/convert/b64.rs
+++ b/src/convert/b64.rs
@@ -2,7 +2,8 @@ use std::error::Error;
 use std::rc::Rc;
 use std::result::Result;
 
-use base64::{encode, encode_config, URL_SAFE};
+use base64::Engine;
+use base64::{engine::general_purpose::STANDARD, engine::general_purpose::URL_SAFE};
 
 use crate::build::Val;
 use crate::convert::traits::Importer;
@@ -14,9 +15,9 @@ pub struct Base64Importer {
 impl Importer for Base64Importer {
     fn import(&self, bytes: &[u8]) -> Result<Rc<Val>, Box<dyn Error>> {
         return if self.url_safe {
-            Ok(Rc::new(Val::Str(encode(bytes))))
+            Ok(Rc::new(Val::Str(STANDARD.encode(bytes))))
         } else {
-            Ok(Rc::new(Val::Str(encode_config(bytes, URL_SAFE))))
+            Ok(Rc::new(Val::Str(URL_SAFE.encode(bytes))))
         };
     }
 }