Proper building virtual manifest with -p flag

Author: debris

.gitignore

@@ -10,4 +10,5 @@ src/registry/Cargo.lock
 rustc
 __pycache__
 .idea/
-*.iml
+*.iml
+*.swp

src/bin/bench.rs

@@ -102,13 +102,10 @@ pub fn execute(options: Options, config: &Config) -> CliResult {
     let root = find_root_manifest_for_wd(options.flag_manifest_path, config.cwd())?;
     let ws = Workspace::new(&root, config)?;
 
-    let spec = if options.flag_all || ws.is_virtual() {
-        Packages::All
-    } else {
-        Packages::from_flags(options.flag_all,
-                            &options.flag_exclude,
-                            &options.flag_package)?
-    };
+    let spec = Packages::from_flags(ws.is_virtual(),
+                                    options.flag_all,
+                                    &options.flag_exclude,
+                                    &options.flag_package)?;
 
     let ops = ops::TestOptions {
         no_run: options.flag_no_run,

src/bin/build.rs

@@ -94,13 +94,10 @@ pub fn execute(options: Options, config: &Config) -> CliResult {
     let root = find_root_manifest_for_wd(options.flag_manifest_path, config.cwd())?;
     let ws = Workspace::new(&root, config)?;
 
-    let spec = if options.flag_all || ws.is_virtual() {
-        Packages::All
-    } else {
-    	Packages::from_flags(options.flag_all,
-                          	&options.flag_exclude,
-                          	&options.flag_package)?
-    };
+    let spec = Packages::from_flags(ws.is_virtual(),
+                                    options.flag_all,
+                                    &options.flag_exclude,
+                                    &options.flag_package)?;
 
     let opts = CompileOptions {
         config: config,

src/bin/check.rs

@@ -91,13 +91,10 @@ pub fn execute(options: Options, config: &Config) -> CliResult {
     let root = find_root_manifest_for_wd(options.flag_manifest_path, config.cwd())?;
     let ws = Workspace::new(&root, config)?;
 
-    let spec = if options.flag_all || ws.is_virtual() {
-        Packages::All
-    } else {
-    	Packages::from_flags(options.flag_all,
-                            &options.flag_exclude,
-                            &options.flag_package)?
-    };
+    let spec = Packages::from_flags(ws.is_virtual(),
+                                    options.flag_all,
+                                    &options.flag_exclude,
+                                    &options.flag_package)?;
 
     let opts = CompileOptions {
         config: config,

src/bin/doc.rs

@@ -83,7 +83,7 @@ pub fn execute(options: Options, config: &Config) -> CliResult {
     let root = find_root_manifest_for_wd(options.flag_manifest_path, config.cwd())?;
     let ws = Workspace::new(&root, config)?;
 
-    let spec = if options.flag_all || ws.is_virtual() {
+    let spec = if options.flag_all || (ws.is_virtual() && options.flag_package.is_empty()) {
         Packages::All
     } else {
         Packages::Packages(&options.flag_package)

src/bin/test.rs

@@ -138,13 +138,10 @@ pub fn execute(options: Options, config: &Config) -> CliResult {
                                          &options.flag_bench, options.flag_benches);
     }
 
-    let spec = if options.flag_all || ws.is_virtual() {
-        Packages::All
-    } else {
-    	Packages::from_flags(options.flag_all,
-                            &options.flag_exclude,
-                            &options.flag_package)?
-    };
+    let spec = Packages::from_flags(ws.is_virtual(),
+                                    options.flag_all,
+                                    &options.flag_exclude,
+                                    &options.flag_package)?;
 
     let ops = ops::TestOptions {
         no_run: options.flag_no_run,

src/cargo/ops/cargo_compile.rs

@@ -110,9 +110,11 @@ pub enum Packages<'a> {
 }
 
 impl<'a> Packages<'a> {
-    pub fn from_flags(all: bool, exclude: &'a Vec<String>, package: &'a Vec<String>)
+    pub fn from_flags(virtual_ws: bool, all: bool, exclude: &'a Vec<String>, package: &'a Vec<String>)
         -> CargoResult<Self>
     {
+        let all = all || (virtual_ws && package.is_empty());
+
         let packages = match (all, &exclude) {
             (true, exclude) if exclude.is_empty() => Packages::All,
             (true, exclude) => Packages::OptOut(exclude),