Disallow path + toolchain options

Author: Jon Gjengset

src/config.rs

@@ -95,7 +95,15 @@ impl<'a> OverrideCfg<'a> {
         Ok(Self {
             toolchain: match (file.toolchain.channel, file.toolchain.path) {
                 (Some(name), None) => Some(Toolchain::from(cfg, &name)?),
-                (None, Some(path)) => Some(Toolchain::from_path(cfg, cfg_path, &path)?),
+                (None, Some(path)) => {
+                    if file.toolchain.targets.is_some()
+                        || file.toolchain.components.is_some()
+                        || file.toolchain.profile.is_some()
+                    {
+                        return Err(ErrorKind::CannotSpecifyPathAndOptions(path.into()).into());
+                    }
+                    Some(Toolchain::from_path(cfg, cfg_path, &path)?)
+                }
                 (Some(channel), Some(path)) => {
                     return Err(ErrorKind::CannotSpecifyChannelAndPath(channel, path.into()).into())
                 }

src/errors.rs

@@ -192,6 +192,10 @@ error_chain! {
             description("invalid toolchain path"),
             display("invalid toolchain path: '{}'", p.display())
         }
+        CannotSpecifyPathAndOptions(path: PathBuf) {
+            description("toolchain options are ignored for path toolchains"),
+            display("toolchain options are ignored for path toolchain ({})", path.display())
+        }
         CannotSpecifyChannelAndPath(channel: String, path: PathBuf) {
             description("cannot specify channel and path simultaneously"),
             display("cannot specify both channel ({}) and path ({}) simultaneously", channel, path.display())

tests/cli-rustup.rs

@@ -1478,6 +1478,54 @@ fn file_override_path_relative() {
     });
 }
 
+#[test]
+fn file_override_path_no_options() {
+    setup(&|config| {
+        // Make a plausible-looking toolchain
+        let cwd = config.current_dir();
+        let toolchain_path = cwd.join("ephemeral");
+        let toolchain_bin = toolchain_path.join("bin");
+        fs::create_dir_all(&toolchain_bin).unwrap();
+
+        let toolchain_file = cwd.join("rust-toolchain.toml");
+        raw::write_file(
+            &toolchain_file,
+            "[toolchain]\npath=\"ephemeral\"\ntargets=[\"dummy\"]",
+        )
+        .unwrap();
+
+        expect_err(
+            config,
+            &["rustc", "--version"],
+            "toolchain options are ignored for path toolchain (ephemeral)",
+        );
+
+        raw::write_file(
+            &toolchain_file,
+            "[toolchain]\npath=\"ephemeral\"\ncomponents=[\"dummy\"]",
+        )
+        .unwrap();
+
+        expect_err(
+            config,
+            &["rustc", "--version"],
+            "toolchain options are ignored for path toolchain (ephemeral)",
+        );
+
+        raw::write_file(
+            &toolchain_file,
+            "[toolchain]\npath=\"ephemeral\"\nprofile=\"minimal\"",
+        )
+        .unwrap();
+
+        expect_err(
+            config,
+            &["rustc", "--version"],
+            "toolchain options are ignored for path toolchain (ephemeral)",
+        );
+    });
+}
+
 #[test]
 fn file_override_path_xor_channel() {
     setup(&|config| {