From c80416245e9110903832a8352eb2618844393b90 Mon Sep 17 00:00:00 2001
From: Morilli <35152647+Morilli@users.noreply.github.com>
Date: Tue, 3 Sep 2024 07:37:18 +0200
Subject: [PATCH] specify nightly toolchain in rust-toolchain.toml

not touching whatever the fuck build-release.bat is
---
 waterbox/waterboxhost/Cargo.toml                         | 1 -
 waterbox/waterboxhost/build-debug-no-dirty-detection.bat | 2 +-
 waterbox/waterboxhost/build-debug-no-dirty-detection.sh  | 2 +-
 waterbox/waterboxhost/build-debug.bat                    | 2 +-
 waterbox/waterboxhost/build-debug.sh                     | 2 +-
 waterbox/waterboxhost/build-release.sh                   | 2 +-
 waterbox/waterboxhost/rust-toolchain.toml                | 2 ++
 7 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 waterbox/waterboxhost/rust-toolchain.toml

diff --git a/waterbox/waterboxhost/Cargo.toml b/waterbox/waterboxhost/Cargo.toml
index 6b21055d39..27856e33bc 100644
--- a/waterbox/waterboxhost/Cargo.toml
+++ b/waterbox/waterboxhost/Cargo.toml
@@ -4,7 +4,6 @@ version = "0.1.0"
 authors = ["nattthebear <goyuken@gmail.com>"]
 edition = "2018"
 publish = false
-#rust = "nightly"
 
 [features]
 no-dirty-detection = []
diff --git a/waterbox/waterboxhost/build-debug-no-dirty-detection.bat b/waterbox/waterboxhost/build-debug-no-dirty-detection.bat
index d0ee8c8960..f385b0af1d 100644
--- a/waterbox/waterboxhost/build-debug-no-dirty-detection.bat
+++ b/waterbox/waterboxhost/build-debug-no-dirty-detection.bat
@@ -1,3 +1,3 @@
-@cargo +nightly b --features "no-dirty-detection"
+@cargo b --features "no-dirty-detection"
 @copy target\debug\waterboxhost.dll ..\..\Assets\dll
 @copy target\debug\waterboxhost.dll ..\..\output\dll
diff --git a/waterbox/waterboxhost/build-debug-no-dirty-detection.sh b/waterbox/waterboxhost/build-debug-no-dirty-detection.sh
index cb187a383f..a88ce44d7e 100755
--- a/waterbox/waterboxhost/build-debug-no-dirty-detection.sh
+++ b/waterbox/waterboxhost/build-debug-no-dirty-detection.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 if [ -z "$BIZHAWKBUILD_HOME" ]; then export BIZHAWKBUILD_HOME="$(realpath "$(dirname "$0")/../..")"; fi
 
-cargo +nightly b --features "no-dirty-detection"
+cargo b --features "no-dirty-detection"
 
 cp target/debug/libwaterboxhost.so "$BIZHAWKBUILD_HOME/Assets/dll"
 if [ -e "$BIZHAWKBUILD_HOME/output" ]; then
diff --git a/waterbox/waterboxhost/build-debug.bat b/waterbox/waterboxhost/build-debug.bat
index 13d1c52f74..02e2fc82f3 100644
--- a/waterbox/waterboxhost/build-debug.bat
+++ b/waterbox/waterboxhost/build-debug.bat
@@ -1,3 +1,3 @@
-@cargo +nightly b
+@cargo b
 @copy target\debug\waterboxhost.dll ..\..\Assets\dll
 @copy target\debug\waterboxhost.dll ..\..\output\dll
diff --git a/waterbox/waterboxhost/build-debug.sh b/waterbox/waterboxhost/build-debug.sh
index 44ac1b13ff..4db6d725ab 100755
--- a/waterbox/waterboxhost/build-debug.sh
+++ b/waterbox/waterboxhost/build-debug.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 if [ -z "$BIZHAWKBUILD_HOME" ]; then export BIZHAWKBUILD_HOME="$(realpath "$(dirname "$0")/../..")"; fi
 
-cargo +nightly b
+cargo b
 
 cp target/debug/libwaterboxhost.so "$BIZHAWKBUILD_HOME/Assets/dll"
 if [ -e "$BIZHAWKBUILD_HOME/output" ]; then
diff --git a/waterbox/waterboxhost/build-release.sh b/waterbox/waterboxhost/build-release.sh
index 9a83d8b218..7940facc97 100755
--- a/waterbox/waterboxhost/build-release.sh
+++ b/waterbox/waterboxhost/build-release.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 if [ -z "$BIZHAWKBUILD_HOME" ]; then export BIZHAWKBUILD_HOME="$(realpath "$(dirname "$0")/../..")"; fi
 
-cargo +nightly b --release
+cargo b --release
 
 cp target/release/libwaterboxhost.so "$BIZHAWKBUILD_HOME/Assets/dll"
 if [ -e "$BIZHAWKBUILD_HOME/output" ]; then
diff --git a/waterbox/waterboxhost/rust-toolchain.toml b/waterbox/waterboxhost/rust-toolchain.toml
new file mode 100644
index 0000000000..5d56faf9ae
--- /dev/null
+++ b/waterbox/waterboxhost/rust-toolchain.toml
@@ -0,0 +1,2 @@
+[toolchain]
+channel = "nightly"