Let's not accept both, just to be safe

kivikakk · kivikakk · commit 0cbfb678e21f · 2017-10-18T17:39:11.000+11:00
diff --git a/src/bin/install.rs b/src/bin/install.rs
@@ -1,6 +1,6 @@
 use cargo::ops;
 use cargo::core::{SourceId, GitReference};
-use cargo::util::{CliResult, Config, ToUrl};
+use cargo::util::{CargoError, CliResult, Config, ToUrl};
 
 #[derive(Deserialize)]
 pub struct Options {
@@ -153,7 +153,11 @@ pub fn execute(options: Options, config: &mut Config) -> CliResult {
     };
 
     let krates = options.arg_crate.iter().map(|s| &s[..]).collect::<Vec<_>>();
-    let vers = options.flag_version.as_ref().or(options.flag_vers.as_ref()).map(|s| &s[..]);
+    let vers = match (&options.flag_vers, &options.flag_version) {
+        (&Some(_), &Some(_)) => return Err(CargoError::from("Invalid arguments.").into()),
+        (&Some(ref v), _) | (_, &Some(ref v)) => Some(v.as_ref()),
+        _ => None,
+    };
     let root = options.flag_root.as_ref().map(|s| &s[..]);
 
     if options.flag_list {
diff --git a/tests/install.rs b/tests/install.rs
@@ -933,13 +933,13 @@ fn version_too() {
 }
 
 #[test]
-fn version_preferred() {
+fn not_both_vers_and_version() {
     pkg("foo", "0.1.1");
     pkg("foo", "0.1.2");
 
     assert_that(cargo_process("install").arg("foo").arg("--version").arg("0.1.1").arg("--vers").arg("0.1.2"),
-                execs().with_status(0).with_stderr_contains("\
-                    [DOWNLOADING] foo v0.1.1 (registry [..])
+                execs().with_status(101).with_stderr_contains("\
+error: Invalid arguments.
 "));
 }
 

Original file line number	Diff line number	Diff line change
`@@ -933,13 +933,13 @@ fn version_too() {`
`933`	`933`	`}`
`934`	`934`
`935`	`935`	`#[test]`
`936`		`-fn version_preferred() {`
	`936`	`+fn not_both_vers_and_version() {`
`937`	`937`	`pkg("foo", "0.1.1");`
`938`	`938`	`pkg("foo", "0.1.2");`
`939`	`939`
`940`	`940`	`assert_that(cargo_process("install").arg("foo").arg("--version").arg("0.1.1").arg("--vers").arg("0.1.2"),`
`941`		`- execs().with_status(0).with_stderr_contains("\`
`942`		`- [DOWNLOADING] foo v0.1.1 (registry [..])`
	`941`	`+ execs().with_status(101).with_stderr_contains("\`
	`942`	`+error: Invalid arguments.`
`943`	`943`	`"));`
`944`	`944`	`}`
`945`	`945`