Update base64 dependency (#515)

---------

Co-authored-by: Marek Barvíř <[email protected]>
Co-authored-by: Isabel Atkinson <[email protected]>

Author: 3 people

Cargo.toml

@@ -63,7 +63,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0", features = ["preserve_order"] }
 indexmap = "2.1.0"
 hex = "0.4.2"
-base64 = "0.13.0"
+base64 = "0.22.1"
 once_cell = "1.5.1"
 uuid-0_8 = { package = "uuid", version = "0.8.1", features = ["serde", "v4"], optional = true }
 uuid = { version = "1.1.2", features = ["serde", "v4"] }

src/base64.rs

@@ -0,0 +1,9 @@
+use base64::{engine::general_purpose::STANDARD, DecodeError, Engine};
+
+pub fn decode<T: AsRef<[u8]>>(input: T) -> Result<Vec<u8>, DecodeError> {
+    STANDARD.decode(input)
+}
+
+pub fn encode<T: AsRef<[u8]>>(input: T) -> String {
+    STANDARD.encode(input)
+}

src/binary.rs

@@ -2,7 +2,7 @@
 
 mod vector;
 
-use crate::{spec::BinarySubtype, Document, RawBinaryRef};
+use crate::{base64, spec::BinarySubtype, Document, RawBinaryRef};
 use std::{
     convert::TryFrom,
     error,

src/bson.rs

@@ -32,6 +32,7 @@ use serde_json::{json, Value};
 
 pub use crate::document::Document;
 use crate::{
+    base64,
     oid::{self, ObjectId},
     spec::{BinarySubtype, ElementType},
     Binary,

src/de/raw.rs

@@ -7,6 +7,7 @@ use serde::{
 };
 
 use crate::{
+    base64,
     oid::ObjectId,
     raw::{
         RawBinaryRef,

src/extjson/models.rs

@@ -7,7 +7,7 @@ use serde::{
 };
 use std::borrow::Cow;
 
-use crate::{extjson, oid, raw::serde::CowStr, spec::BinarySubtype, Bson};
+use crate::{base64, extjson, oid, raw::serde::CowStr, spec::BinarySubtype, Bson};
 
 #[derive(Deserialize)]
 #[serde(deny_unknown_fields)]

src/lib.rs

@@ -331,6 +331,7 @@ pub use self::de::{from_reader_utf8_lossy, from_slice_utf8_lossy};
 
 #[macro_use]
 mod macros;
+mod base64;
 pub mod binary;
 mod bson;
 pub mod datetime;

src/raw/bson_ref.rs

@@ -12,6 +12,7 @@ use super::{
     Result,
 };
 use crate::{
+    base64,
     extjson,
     oid::{self, ObjectId},
     raw::{RawJavaScriptCodeWithScope, RAW_BSON_NEWTYPE},

src/ser/raw/value_serializer.rs

@@ -6,6 +6,7 @@ use serde::{
 };
 
 use crate::{
+    base64,
     oid::ObjectId,
     raw::RAW_DOCUMENT_NEWTYPE,
     ser::{write_binary, write_cstring, write_i32, write_i64, write_string, Error, Result},

src/ser/serde.rs

@@ -12,6 +12,7 @@ use serde::ser::{
 };
 
 use crate::{
+    base64,
     bson::{Array, Bson, DbPointer, Document, JavaScriptCodeWithScope, Regex, Timestamp},
     datetime::DateTime,
     extjson,

src/tests/modules/binary.rs

@@ -1,4 +1,4 @@
-use crate::{spec::BinarySubtype, tests::LOCK, Binary};
+use crate::{base64, spec::BinarySubtype, tests::LOCK, Binary};
 
 #[test]
 fn binary_from_base64() {

src/tests/modules/bson.rs

@@ -4,6 +4,7 @@ use std::{
 };
 
 use crate::{
+    base64,
     doc,
     oid::ObjectId,
     spec::BinarySubtype,

src/tests/modules/macros.rs

@@ -1,4 +1,5 @@
 use crate::{
+    base64,
     doc,
     oid::ObjectId,
     spec::BinarySubtype,