Merge branch 'update-rust-setup'

Author: dlon

scripts/setup-rust

@@ -16,7 +16,7 @@ ANDROID_COMPONENTS="rust-analyzer"
 IOS_TARGETS="aarch64-apple-ios-sim aarch64-apple-ios x86_64-apple-ios"
 IOS_COMPONENTS="rust-analyzer"
 
-WINDOWS_TARGETS="x86_64-pc-windows-msvc x86_64-pc-windows-gnu i686-pc-windows-msvc"
+WINDOWS_TARGETS="x86_64-pc-windows-msvc aarch64-pc-windows-msvc i686-pc-windows-msvc"
 WINDOWS_COMPONENTS="rust-analyzer"
 
 LINUX_TARGETS="aarch64-unknown-linux-gnu x86_64-unknown-linux-gnu"

scripts/setup-rust-post-checkout

@@ -13,10 +13,17 @@ if [[ ! -f "$SETUP_RUST_SCRIPT" ]]; then
     exit 0
 fi
 
-if [[ -z ${MULLVAD_SETUP_PLATFORM+x} ]]; then
-    echo "MULLVAD_SETUP_PLATFORM is not set, must be set to one of the following: " >&2
-    echo "\`android\`, \`ios\`, \`windows\`, \`linux\`, \`macos\`" >&2
-    exit 1
+if [[ -z "$MULLVAD_SETUP_PLATFORM" ]]; then
+    case "$(uname -s)" in
+        Linux) MULLVAD_SETUP_PLATFORM="linux" ;;
+        Darwin) MULLVAD_SETUP_PLATFORM="macos" ;;
+        MINGW*|CYGWIN*|MSYS*) MULLVAD_SETUP_PLATFORM="windows" ;;
+        *)
+            echo "Unable to detect current platform, MULLVAD_SETUP_PLATFORM must be set to one of: " >&2
+            echo "\`android\`, \`ios\`, \`windows\`, \`linux\`, \`macos\`" >&2
+            exit 1
+            ;;
+    esac
 fi
 
 git diff-tree --exit-code "$1".."$2" --quiet -- rust-toolchain.toml