Auto merge of #7742 - jplatte:master, r=ehuss

Add a note to the error message for using --feature / --no-default-features in a virtual workspace fixes #7727
rust-lang · Dec 28, 2019 · feac578 · feac578
2 parents 5336fba + 2166db8
commit feac578
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/cargo/util/command_prelude.rs b/src/cargo/util/command_prelude.rs
@@ -289,7 +289,8 @@ pub trait ArgMatchesExt {
             for flag in &["features", "no-default-features"] {
                 if self._is_present(flag) {
                     bail!(
-                        "--{} is not allowed in the root of a virtual workspace",
+                        "--{} is not allowed in the root of a virtual workspace\n\
+                         note: while this was previously accepted, it didn't actually do anything",
                         flag
                     );
                 }

diff --git a/tests/testsuite/features.rs b/tests/testsuite/features.rs
@@ -2017,13 +2017,17 @@ fn virtual_ws_flags() {
         .build();
 
     p.cargo("build --features=f1")
-        .with_stderr("[ERROR] --features is not allowed in the root of a virtual workspace")
+        .with_stderr(
+            "[ERROR] --features is not allowed in the root of a virtual workspace\n\
+             note: while this was previously accepted, it didn't actually do anything",
+        )
         .with_status(101)
         .run();
 
     p.cargo("build --no-default-features")
         .with_stderr(
-            "[ERROR] --no-default-features is not allowed in the root of a virtual workspace",
+            "[ERROR] --no-default-features is not allowed in the root of a virtual workspace\n\
+             note: while this was previously accepted, it didn't actually do anything",
         )
         .with_status(101)
         .run();