From 5e4f443e8dad33305f8a8eb071c02bd35cb8e816 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Dec 2023 10:27:55 +0100
Subject: [PATCH] build(deps): bump base64 from 0.13.1 to 0.21.5 (#102)

* build(deps): bump base64 from 0.13.1 to 0.21.5

Bumps [base64](https://github.com/marshallpierce/rust-base64) from 0.13.1 to 0.21.5.
- [Changelog](https://github.com/marshallpierce/rust-base64/blob/master/RELEASE-NOTES.md)
- [Commits](https://github.com/marshallpierce/rust-base64/compare/v0.13.1...v0.21.5)

---
updated-dependencies:
- dependency-name: base64
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* fix: don't use deprecated functions

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Matthijs Brobbel <m1brobbel@gmail.com>
---
 Cargo.lock                | 10 ++--------
 rs/Cargo.toml             |  2 +-
 rs/src/export/html/mod.rs |  3 ++-
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fbb5e20d..919d0f96 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -78,12 +78,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
-[[package]]
-name = "base64"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
 [[package]]
 name = "base64"
 version = "0.21.5"
@@ -558,7 +552,7 @@ checksum = "d4be404426c47c9b868fc9b6ddda07f84e2885d12b17066036717db2cd4e5d77"
 dependencies = [
  "ahash",
  "anyhow",
- "base64 0.21.5",
+ "base64",
  "bytecount",
  "fancy-regex",
  "fraction",
@@ -1225,7 +1219,7 @@ name = "substrait-validator"
 version = "0.0.11"
 dependencies = [
  "antlr-rust",
- "base64 0.13.1",
+ "base64",
  "chrono",
  "curl",
  "float-pretty-print",
diff --git a/rs/Cargo.toml b/rs/Cargo.toml
index 155ed7f1..531d4071 100644
--- a/rs/Cargo.toml
+++ b/rs/Cargo.toml
@@ -82,7 +82,7 @@ chrono = "0.4"
 float-pretty-print = "0.1"
 
 # Used by the HTML exporter.
-base64 = "0.13"
+base64 = "0.21"
 percent-encoding = "2.3"
 
 # Used for representing and checking Substrait versions.
diff --git a/rs/src/export/html/mod.rs b/rs/src/export/html/mod.rs
index 64b46794..8763ec75 100644
--- a/rs/src/export/html/mod.rs
+++ b/rs/src/export/html/mod.rs
@@ -9,6 +9,7 @@ use crate::output::path;
 use crate::output::tree;
 use crate::output::type_system::data;
 use crate::output::type_system::data::class::ParameterInfo;
+use base64::{engine::general_purpose, Engine as _};
 
 const HEADER1: &str = concat!(
     r#"
@@ -622,7 +623,7 @@ pub fn export<T: std::io::Write>(
     let path = path::Path::Root(root_name);
 
     // Generate and write header.
-    let font_awesome_b64 = base64::encode(FONT_AWESOME);
+    let font_awesome_b64 = general_purpose::STANDARD.encode(FONT_AWESOME);
     write!(out, "{HEADER1}{}{HEADER2}", font_awesome_b64)?;
 
     // Emit metadata.