Use rustup run nightly instead of cargo +nightly

taiki-e · Oct 25, 2022 · 84848e3 · 84848e3
1 parent 2cf3306
commit 84848e3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,8 @@ Note: In this file, do not use the hard wrap in the middle of a sentence for com
 
 ## [Unreleased]
 
+- Work around a rustup bug ([rust-lang/rustup#3036](https://github.com/rust-lang/rustup/issues/3036)) on Windows.
+
 ## [0.1.6] - 2022-10-25
 
 - Update `toml_edit` to 0.15.

diff --git a/src/cargo.rs b/src/cargo.rs
@@ -36,7 +36,8 @@ impl Workspace {
         if self.nightly {
             self.cargo()
         } else {
-            cmd!("cargo", "+nightly")
+            // Do not use `cargo +nightly` due to a rustup bug: https://github.com/rust-lang/rustup/issues/3036
+            cmd!("rustup", "run", "nightly", "cargo")
         }
     }
 }