From 62d310240e3ddbe6034be774d4c0b7b8c2ac1809 Mon Sep 17 00:00:00 2001
From: Cameron Pickett <pickett@meta.com>
Date: Wed, 28 Aug 2024 11:18:04 -0700
Subject: [PATCH] Upgrade base64 to 0.21 (#123)

Summary: Pull Request resolved: https://github.com/facebookresearch/Private-ID/pull/123

Reviewed By: zertosh

Differential Revision: D61737689

fbshipit-source-id: dc98887dd6b346f11d8efe7ffa085311f6110c37
---
 Cargo.toml                       | 2 +-
 app/buck2_explain/src/lib.rs     | 4 +++-
 shim/third-party/rust/Cargo.toml | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index e8ada1d24513..76d27195bfe3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -130,7 +130,7 @@ async-scoped = { version = "0.9", features = ["use-tokio"] }
 async-trait = "0.1.24"
 atomic = "0.5.1"
 backtrace = "0.3.51"
-base64 = "0.13.0"
+base64 = "0.21.7"
 bincode = "1.3.3"
 blake3 = { version = "1.3.1", features = ["default", "digest", "rayon", "std", "traits-preview"] }
 bumpalo = "3.11.1"
diff --git a/app/buck2_explain/src/lib.rs b/app/buck2_explain/src/lib.rs
index 02fa2ed6b94b..f29f3937f5b3 100644
--- a/app/buck2_explain/src/lib.rs
+++ b/app/buck2_explain/src/lib.rs
@@ -10,6 +10,8 @@
 use std::fs;
 use std::io::Cursor;
 
+use base64::engine::general_purpose::STANDARD;
+use base64::Engine;
 use buck2_core::fs::paths::abs_path::AbsPathBuf;
 
 #[allow(unused_imports)]
@@ -33,7 +35,7 @@ pub async fn main(
     let fbs = flatbuffers::gen_fbs(data)?;
 
     let fbs = fbs.finished_data();
-    let base64 = base64::encode(&fbs);
+    let base64 = STANDARD.encode(&fbs);
 
     // For dev purposes, dump the base64 encoded flatbuffer to a file
     if let Some(fbs_dump) = fbs_dump {
diff --git a/shim/third-party/rust/Cargo.toml b/shim/third-party/rust/Cargo.toml
index 828f66d04909..903e5fcb1c36 100644
--- a/shim/third-party/rust/Cargo.toml
+++ b/shim/third-party/rust/Cargo.toml
@@ -38,7 +38,7 @@ async-scoped = { version = "0.8", features = ["use-tokio"] }
 async-trait = "0.1.24"
 atomic = "0.5.1"
 backtrace = "0.3.51"
-base64 = "0.13.0"
+base64 = "0.21.7"
 bincode = "1.3.3"
 bitflags = "2.4"
 blake3 = { version = "1.3.1", features = [ "default", "digest", "rayon", "std", "traits-preview" ] }