From ae6fc0b3996ddfec9fda0953616aed5f12243528 Mon Sep 17 00:00:00 2001
From: Jonas Bushart <jonas@bushart.org>
Date: Sun, 7 Apr 2024 15:33:53 +0200
Subject: [PATCH 1/3] Update ron to v0.8.1

Gets rid of base64 v0.13
This removes one dependency of bitflags v1

bitflags v1 is still needed for redox_syscall via parking_lot. No update expected soon.
https://github.com/Amanieu/parking_lot/pull/432
---
 Cargo.lock | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b2677d20..f97a08c6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -52,12 +52,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.7"
@@ -100,6 +94,15 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
+[[package]]
+name = "bitflags"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "bumpalo"
 version = "3.14.0"
@@ -645,7 +648,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ffade02495f22453cd593159ea2f59827aae7f53fa8323f756799b670881dcf8"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "memchr",
  "unicase",
 ]
@@ -665,7 +668,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
@@ -721,13 +724,14 @@ dependencies = [
 
 [[package]]
 name = "ron"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "300a51053b1cb55c80b7a9fde4120726ddf25ca241a1cbb926626f62fb136bff"
+checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
 dependencies = [
- "base64 0.13.1",
- "bitflags",
+ "base64 0.21.7",
+ "bitflags 2.5.0",
  "serde",
+ "serde_derive",
 ]
 
 [[package]]

From 821cdae23ad2675c71eceef2691e3d2c99fbf322 Mon Sep 17 00:00:00 2001
From: Jonas Bushart <jonas@bushart.org>
Date: Sun, 7 Apr 2024 15:36:13 +0200
Subject: [PATCH 2/3] Update rustversion

---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f97a08c6..cce4a2bb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -736,9 +736,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.14"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
+checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47"
 
 [[package]]
 name = "ryu"

From b32b0dfab1d0931206d5c45bb43af188cd95dada Mon Sep 17 00:00:00 2001
From: Jonas Bushart <jonas@bushart.org>
Date: Sun, 7 Apr 2024 15:43:52 +0200
Subject: [PATCH 3/3] Remove version lock on xml-rs

---
 Cargo.lock            | 5 ++---
 serde_with/Cargo.toml | 5 -----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cce4a2bb..d08693d6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -878,7 +878,6 @@ dependencies = [
  "serde_yaml",
  "time",
  "version-sync",
- "xml-rs",
 ]
 
 [[package]]
@@ -1283,9 +1282,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "xml-rs"
-version = "0.8.14"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52839dc911083a8ef63efa4d039d1f58b5e409f923e44c80828f206f66e5541c"
+checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193"
 
 [[package]]
 name = "yansi"
diff --git a/serde_with/Cargo.toml b/serde_with/Cargo.toml
index eec5c8bf..5fda2443 100644
--- a/serde_with/Cargo.toml
+++ b/serde_with/Cargo.toml
@@ -155,11 +155,6 @@ serde_yaml = "0.9.2"
 serde-xml-rs = "0.6.0"
 version-sync = "0.9.1"
 
-# There is a change that breaks some tests, starting with 0.8.9.
-# Newer xml-rs versions are not compatible with the current MSRV.
-# https://github.com/netvl/xml-rs/issues/223
-xml-rs = "=0.8.14"
-
 [[test]]
 name = "base64"
 path = "tests/base64.rs"