From f0254f2bceb469f27713fa73c1f6fc5ed4f638f1 Mon Sep 17 00:00:00 2001
From: Cherry <13651622+MolotovCherry@users.noreply.github.com>
Date: Mon, 9 Sep 2024 06:53:20 -0700
Subject: [PATCH] Bumped MSRV to 1.70

---
 CHANGELOG.md                | 1 +
 Cargo.lock                  | 1 -
 Cargo.toml                  | 2 +-
 pueue/Cargo.toml            | 1 -
 pueue/src/daemon/service.rs | 5 ++---
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d62cff40..2d327eeb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,6 +45,7 @@ TLDR: The new task state representation is more verbose but significantly cleane
 - **Breaking**: Remove the `--children` commandline flags, that have been deprecated and no longer serve any function since `v3.0.0`.
 - Send log output to `stderr` instead of `stdout` [#562](https://github.com/Nukesor/pueue/issues/562).
 - Change default log level from error to warning [#562](https://github.com/Nukesor/pueue/issues/562).
+- Bumped MSRV to 1.70.
 
 ### Add
 
diff --git a/Cargo.lock b/Cargo.lock
index 3153875d..086128d8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1288,7 +1288,6 @@ dependencies = [
  "handlebars",
  "interim",
  "log",
- "once_cell",
  "pest",
  "pest_derive",
  "pretty_assertions",
diff --git a/Cargo.toml b/Cargo.toml
index e316f69b..7de0ea0c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ homepage = "https://github.com/nukesor/pueue"
 repository = "https://github.com/nukesor/pueue"
 license = "MIT"
 edition = "2021"
-rust-version = "1.67"
+rust-version = "1.70"
 
 [workspace.dependencies]
 # Chrono version is hard pinned to a specific version.
diff --git a/pueue/Cargo.toml b/pueue/Cargo.toml
index 2b3ee33a..3a4305f7 100644
--- a/pueue/Cargo.toml
+++ b/pueue/Cargo.toml
@@ -26,7 +26,6 @@ ctrlc = { version = "3", features = ["termination"] }
 handlebars = { workspace = true }
 interim = { version = "0.1.2", features = ["chrono"] }
 log = { workspace = true }
-once_cell = "1.19.0"
 pest = "2.7"
 pest_derive = "2.7"
 pueue-lib = { version = "0.26.1", path = "../pueue_lib" }
diff --git a/pueue/src/daemon/service.rs b/pueue/src/daemon/service.rs
index 948c8b04..b383a42a 100644
--- a/pueue/src/daemon/service.rs
+++ b/pueue/src/daemon/service.rs
@@ -7,7 +7,7 @@ use std::{
     sync::{
         atomic::{AtomicBool, Ordering},
         mpsc::{channel, Receiver, Sender},
-        Arc, Mutex,
+        Arc, Mutex, OnceLock,
     },
     thread,
     time::Duration,
@@ -15,7 +15,6 @@ use std::{
 
 use anyhow::{anyhow, bail, Result};
 use log::{debug, error};
-use once_cell::sync::OnceCell;
 use windows::{
     core::{PCWSTR, PWSTR},
     Win32::{
@@ -58,7 +57,7 @@ struct Config {
 
 const SERVICE_NAME: &str = "pueued";
 const SERVICE_TYPE: ServiceType = ServiceType::OWN_PROCESS;
-static CONFIG: OnceCell<Config> = OnceCell::new();
+static CONFIG: OnceLock<Config> = OnceLock::new();
 
 define_windows_service!(ffi_service_main, service_main);