fix: mise install rust failed on windows

jdx · Jan 7, 2025 · 69b094c · 69b094c
1 parent e93bc80
commit 69b094c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/e2e-win/go.Tests.ps1 b/e2e-win/go.Tests.ps1
@@ -1,5 +1,5 @@
 
-Describe 'node' {
+Describe 'go' {
     It 'executes go 1.23.3' {
         mise x go@1.23.3 -- where go
         mise x go@1.23.3 -- go version | Should -BeLike "go version go1.23.3 windows/*"

diff --git a/e2e-win/python.Tests.ps1 b/e2e-win/python.Tests.ps1
@@ -1,5 +1,5 @@
 
-Describe 'node' {
+Describe 'python' {
     It 'executes python 3.12.0' {
         mise x python@3.12.0 -- where python
         mise x python@3.12.0 -- python --version | Should -Be "Python 3.12.0"

diff --git a/e2e-win/rust.Tests.ps1 b/e2e-win/rust.Tests.ps1
@@ -1,5 +1,5 @@
 
-Describe 'node' {
+Describe 'rust' {
     It 'executes rust 1.82.0' {
         mise x rust@1.82.0 -- rustc -V | Should -BeLike "rustc 1.82.0*"
     }

diff --git a/src/plugins/core/rust.rs b/src/plugins/core/rust.rs
@@ -32,7 +32,7 @@ impl RustPlugin {
             return Ok(());
         }
         ctx.pr.set_message("Downloading rustup-init".into());
-        HTTP.download_file("https://sh.rustup.rs", &rustup_path(), Some(&ctx.pr))?;
+        HTTP.download_file(&rustup_url(), &rustup_path(), Some(&ctx.pr))?;
         file::make_executable(rustup_path())?;
         file::create_dir_all(rustup_home())?;
         let cmd = CmdLineRunner::new(rustup_path())
@@ -203,6 +203,17 @@ const CARGO_BIN: &str = "cargo";
 #[cfg(windows)]
 const CARGO_BIN: &str = "cargo.exe";
 
+#[cfg(unix)]
+fn rustup_url() -> String {
+    "https://sh.rustup.rs".to_string()
+}
+
+#[cfg(windows)]
+fn rustup_url() -> String {
+    let arch = &*SETTINGS.arch();
+    format!("https://win.rustup.rs/{arch}")
+}
+
 fn rustup_path() -> PathBuf {
     dirs::CACHE.join("rust").join(RUSTUP_INIT_BIN)
 }