Merge pull request #16 from epage/ignore-rust-toolchain-files

Always specify cargo toolchain

.github/workflows/ci.yml

@@ -32,6 +32,7 @@ jobs:
         # Run twice to test problem with expression caching
         ./tests/scripts/test-runner.sh
         ./tests/scripts/test-runner.sh
+        (cd tests/scripts/ignores-rust-toolchain && ../../../target/debug/rust-script test.rs)
 
   check-format:
     runs-on: ubuntu-latest

src/main.rs

@@ -52,10 +52,8 @@ struct Args {
     build_kind: BuildKind,
     template: Option<String>,
     list_templates: bool,
-    // This is a String instead of an
-    // enum since one can have custom
-    // toolchains (ex. a rustc developer
-    // will probably have `stage1`).
+    // This is a String instead of an enum since one can have custom
+    // toolchains (ex. a rustc developer will probably have `stage1`):
     toolchain_version: Option<String>,
 
     #[cfg(windows)]
@@ -1153,15 +1151,16 @@ Constructs a Cargo command that runs on the script package.
 fn cargo(
     cmd_name: &str,
     manifest: &str,
-    maybe_toolchain_version: Option<&str>,
+    toolchain_version: Option<&str>,
     meta: &PackageMetadata,
     script_args: &[String],
     run_quietly: bool,
 ) -> MainResult<Command> {
     let mut cmd = Command::new("cargo");
-    if let Some(toolchain_version) = maybe_toolchain_version {
-        cmd.arg(format!("+{}", toolchain_version));
-    }
+
+    // Always specify a toolchain to avoid being affected by rust-version(.toml) files:
+    cmd.arg(format!("+{}", toolchain_version.unwrap_or("stable")));
+
     cmd.arg(cmd_name);
 
     if cmd_name == "run" && run_quietly {

tests/scripts/ignores-rust-toolchain/rust-toolchain

@@ -0,0 +1 @@
+invalid-rust-version

tests/scripts/ignores-rust-toolchain/test.rs

@@ -0,0 +1 @@
+std::process::exit(0);