From 4317ceaa5b5766a066abaa6e4746eba79bdd5087 Mon Sep 17 00:00:00 2001
From: Philip Kristoffersen <philipkristoffersen@gmail.com>
Date: Thu, 2 Feb 2023 22:32:58 +0100
Subject: [PATCH] Update all dependencies (#329)

---
 Cargo.lock               | 66 +++++++++++++++++++++++++++++++++++-----
 Cargo.toml               |  4 +--
 src/steam/collections.rs |  3 +-
 3 files changed, 63 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6a3c063..76c2125 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -204,9 +204,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "base64"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5"
+checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
 
 [[package]]
 name = "bit_field"
@@ -258,7 +258,7 @@ dependencies = [
 name = "boilr"
 version = "1.7.21"
 dependencies = [
- "base64 0.20.0",
+ "base64 0.21.0",
  "color-eyre",
  "config",
  "copypasta",
@@ -283,7 +283,7 @@ dependencies = [
  "sysinfo",
  "time",
  "tokio",
- "toml",
+ "toml 0.7.1",
  "winreg",
  "winres",
 ]
@@ -503,7 +503,7 @@ dependencies = [
  "rust-ini",
  "serde",
  "serde_json",
- "toml",
+ "toml 0.5.10",
  "yaml-rust",
 ]
 
@@ -1907,6 +1907,15 @@ dependencies = [
  "minimal-lexical",
 ]
 
+[[package]]
+name = "nom8"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "nom_locate"
 version = "4.0.0"
@@ -2287,7 +2296,7 @@ checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9"
 dependencies = [
  "once_cell",
  "thiserror",
- "toml",
+ "toml 0.5.10",
 ]
 
 [[package]]
@@ -2612,6 +2621,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_spanned"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "serde_urlencoded"
 version = "0.7.1"
@@ -3038,6 +3056,40 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "toml"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "772c1426ab886e7362aedf4abc9c0d1348a979517efedfc25862944d10137af0"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.19.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90a238ee2e6ede22fb95350acc78e21dc40da00bb66c0334bde83de4ed89424e"
+dependencies = [
+ "indexmap",
+ "nom8",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+]
+
 [[package]]
 name = "tower-service"
 version = "0.3.2"
@@ -3609,7 +3661,7 @@ version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c"
 dependencies = [
- "toml",
+ "toml 0.5.10",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 9596f76..b642b24 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,7 +4,7 @@ name = "boilr"
 version = "1.7.21"
 
 [dependencies]
-base64 = "^0.20.0"
+base64 = "^0.21.0"
 config = "^0.13.3"
 copypasta = "^0.8.1"
 flate2 = "^1.0.25"
@@ -56,7 +56,7 @@ features = ["full"]
 version = "^1.23.1"
 
 [dependencies.toml]
-version = "^0.5.10"
+version = "^0.7.1"
 [target."cfg(windows)"]
 [target."cfg(windows)".build-dependencies]
 winres = "^0.1.12"
diff --git a/src/steam/collections.rs b/src/steam/collections.rs
index 0ea3d70..8f2e443 100644
--- a/src/steam/collections.rs
+++ b/src/steam/collections.rs
@@ -324,7 +324,8 @@ fn serialize_collection_value<S: AsRef<str>>(name: S, game_ids: &[usize]) -> Str
 }
 
 fn name_to_key<S: AsRef<str>>(name: S) -> String {
-    let base64 = base64::encode(name.as_ref());
+    use base64::{Engine as _, engine::general_purpose};
+    let base64 = general_purpose::STANDARD_NO_PAD.encode(name.as_ref());
     let base64_no_end = if base64.ends_with("==") {
         base64.get(..base64.len() - 2).unwrap_or_default()
     } else {