From 51b4c240ed006a8279bd94e9b7ed5df67086c86e Mon Sep 17 00:00:00 2001
From: mo8it <mo8it@proton.me>
Date: Mon, 25 Mar 2024 00:30:01 +0100
Subject: Use `which` instead of running `rustc --version`

---
 Cargo.toml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Cargo.toml')

diff --git a/Cargo.toml b/Cargo.toml
index 218b799..de65fc6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,6 +19,7 @@ regex = "1.10.3"
 serde_json = "1.0.114"
 serde = { version = "1.0.197", features = ["derive"] }
 toml = "0.8.10"
+which = "6.0.1"
 
 [[bin]]
 name = "rustlings"
-- 
cgit v1.2.3


From 83cd91ccca22e36ed94e03cc622a88ef45e6da10 Mon Sep 17 00:00:00 2001
From: mo8it <mo8it@proton.me>
Date: Mon, 25 Mar 2024 02:35:51 +0100
Subject: Replace toml with toml_edit

---
 Cargo.lock  | 18 +++---------------
 Cargo.toml  |  2 +-
 src/main.rs |  6 ++++--
 3 files changed, 8 insertions(+), 18 deletions(-)

(limited to 'Cargo.toml')

diff --git a/Cargo.lock b/Cargo.lock
index 3950c47..52b2725 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -536,7 +536,7 @@ dependencies = [
  "regex",
  "serde",
  "serde_json",
- "toml",
+ "toml_edit",
 ]
 
 [[package]]
@@ -617,18 +617,6 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
 
-[[package]]
-name = "toml"
-version = "0.8.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit",
-]
-
 [[package]]
 name = "toml_datetime"
 version = "0.6.5"
@@ -640,9 +628,9 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.6"
+version = "0.22.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6"
+checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4"
 dependencies = [
  "indexmap",
  "serde",
diff --git a/Cargo.toml b/Cargo.toml
index 218b799..2861459 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,7 +18,7 @@ notify-debouncer-mini = "0.4.1"
 regex = "1.10.3"
 serde_json = "1.0.114"
 serde = { version = "1.0.197", features = ["derive"] }
-toml = "0.8.10"
+toml_edit = { version = "0.22.9", default-features = false, features = ["parse", "serde"] }
 
 [[bin]]
 name = "rustlings"
diff --git a/src/main.rs b/src/main.rs
index a06f0c5..8e0029d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -107,8 +107,10 @@ fn main() {
         std::process::exit(1);
     }
 
-    let toml_str = &fs::read_to_string("info.toml").unwrap();
-    let exercises = toml::from_str::<ExerciseList>(toml_str).unwrap().exercises;
+    let info_file = fs::read_to_string("info.toml").unwrap();
+    let exercises = toml_edit::de::from_str::<ExerciseList>(&info_file)
+        .unwrap()
+        .exercises;
     let verbose = args.nocapture;
 
     let command = args.command.unwrap_or_else(|| {
-- 
cgit v1.2.3


From dca3ea355ea1809318ea545f23f396405d86aa0a Mon Sep 17 00:00:00 2001
From: mo8it <mo8it@proton.me>
Date: Mon, 25 Mar 2024 14:10:51 +0100
Subject: Remove the home dependency since it is not used

---
 Cargo.lock | 10 ----------
 Cargo.toml |  1 -
 2 files changed, 11 deletions(-)

(limited to 'Cargo.toml')

diff --git a/Cargo.lock b/Cargo.lock
index 3950c47..9d8606a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -255,15 +255,6 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
-[[package]]
-name = "home"
-version = "0.5.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "indexmap"
 version = "2.2.5"
@@ -529,7 +520,6 @@ dependencies = [
  "clap",
  "console",
  "glob",
- "home",
  "indicatif",
  "notify-debouncer-mini",
  "predicates",
diff --git a/Cargo.toml b/Cargo.toml
index 218b799..2e6ab3b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,6 @@ edition = "2021"
 clap = { version = "4.5.2", features = ["derive"] }
 console = "0.15.8"
 glob = "0.3.0"
-home = "0.5.9"
 indicatif = "0.17.8"
 notify-debouncer-mini = "0.4.1"
 regex = "1.10.3"
-- 
cgit v1.2.3