From 2f2e38a8adebb456ad75390e60871f2c8ba18fa7 Mon Sep 17 00:00:00 2001
From: Seunghoon Lee <lshqqytiger@naver.com>
Date: Tue, 20 Aug 2024 15:14:08 +0900
Subject: [PATCH] Fix compilation on rust 1.80. This will discontinue support
 of rust 1.6x.

---
 Cargo.lock          | 40 ++++++++++++++++++++++++++++++++--------
 README.md           |  2 +-
 xtask/Cargo.toml    |  2 +-
 zluda/Cargo.toml    |  5 +----
 zluda_rt/Cargo.toml |  3 ---
 5 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 70cc2452..615e4bc5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -458,6 +458,16 @@ version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
 
+[[package]]
+name = "deranged"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+dependencies = [
+ "powerfmt",
+ "serde",
+]
+
 [[package]]
 name = "derivative"
 version = "2.2.0"
@@ -1196,6 +1206,12 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
 [[package]]
 name = "num-traits"
 version = "0.2.17"
@@ -1361,6 +1377,12 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
 
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
 [[package]]
 name = "ppv-lite86"
 version = "0.2.17"
@@ -1859,13 +1881,16 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.23"
+version = "0.3.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
 dependencies = [
+ "deranged",
  "itoa",
  "libc",
+ "num-conv",
  "num_threads",
+ "powerfmt",
  "serde",
  "time-core",
  "time-macros",
@@ -1873,16 +1898,17 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.10"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
 dependencies = [
+ "num-conv",
  "time-core",
 ]
 
@@ -2366,7 +2392,6 @@ dependencies = [
  "rustc-hash",
  "static_assertions",
  "tempfile",
- "time",
  "vergen",
  "winapi",
  "zluda_dark_api",
@@ -2547,7 +2572,6 @@ dependencies = [
  "serde_with",
  "sha2",
  "static_assertions",
- "time",
  "typenum",
  "vergen",
  "winapi",
diff --git a/README.md b/README.md
index 1d458333..179dfc62 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ Make sure you have the following installed:
 - Git
 - CMake
 - Python 3
-- Rust (1.66.1 or newer)
+- Rust (1.7x or newer)
 - C++ compiler
 - [ROCm](https://rocm.docs.amd.com/en/latest/deploy/linux/install_overview.html) 6.0+ (or [HIP SDK](https://rocm.docs.amd.com/projects/install-on-windows/en/latest/) on Windows)
 - (Windows only) Recent [AMD Radeon Software Adrenalin](https://www.amd.com/en/technologies/software)
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
index edc0965e..6091131a 100644
--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -12,7 +12,7 @@ cargo_metadata = "=0.17.0"
 cargo-platform = "=0.1.5"
 serde = "1.0.193"
 serde_json = "1.0.108"
-time = { version = "=0.3.23", features = ["local-offset"] }
+time = { version = "=0.3.36", features = ["local-offset"] }
 
 [target.'cfg(windows)'.dependencies]
 zip = { version = "0.6.6", features = ["deflate", "time"], default-features = false }
diff --git a/zluda/Cargo.toml b/zluda/Cargo.toml
index 448154a7..e75b56e0 100644
--- a/zluda/Cargo.toml
+++ b/zluda/Cargo.toml
@@ -46,7 +46,4 @@ gag = "1.0.0"
 libc = "0.2"
 
 [build-dependencies]
-vergen = { version = "7.5.1", default-features = false, features = ["git"] }
-# We don't use time crate, but this coerces vergen to not use newer version that requires 
-# higher minimum rust version
-time = "=0.3.23"
\ No newline at end of file
+vergen = { version = "7.5.1", default-features = false, features = ["git"] }
\ No newline at end of file
diff --git a/zluda_rt/Cargo.toml b/zluda_rt/Cargo.toml
index 263b693f..97e706c6 100644
--- a/zluda_rt/Cargo.toml
+++ b/zluda_rt/Cargo.toml
@@ -38,9 +38,6 @@ float-cmp = "0.9.0"
 
 [build-dependencies]
 vergen = { version = "7.5.1", default-features = false, features = ["git"] }
-# We don't use time crate, but this coerces vergen to not use newer version that requires 
-# higher minimum rust version
-time = "=0.3.23"
 
 [package.metadata.zluda]
 broken = true