Make verify-project honour unstable features

Author: dwijnand

src/bin/cargo/commands/verify_project.rs

@@ -2,10 +2,6 @@ use command_prelude::*;
 
 use std::collections::HashMap;
 use std::process;
-use std::fs::File;
-use std::io::Read;
-
-use toml;
 
 use cargo::print_json;
 
@@ -23,19 +19,8 @@ pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
         process::exit(1)
     }
 
-    let mut contents = String::new();
-    let filename = match args.root_manifest(config) {
-        Ok(filename) => filename,
-        Err(e) => fail("invalid", &e.to_string()),
-    };
-
-    let file = File::open(&filename);
-    match file.and_then(|mut f| f.read_to_string(&mut contents)) {
-        Ok(_) => {}
-        Err(e) => fail("invalid", &format!("error reading file: {}", e)),
-    };
-    if contents.parse::<toml::Value>().is_err() {
-        fail("invalid", "invalid-format");
+    if let Err(e) = args.workspace(config) {
+        fail("invalid", &e.to_string())
     }
 
     let mut h = HashMap::new();

tests/testsuite/verify_project.rs

@@ -42,3 +42,27 @@ fn cargo_verify_project_cwd() {
         .with_stdout(verify_project_success_output())
         .run();
 }
+
+#[test]
+fn cargo_verify_project_honours_unstable_features() {
+    let p = project()
+        .file("Cargo.toml", r#"
+        cargo-features = ["test-dummy-unstable"]
+
+        [package]
+        name = "foo"
+        version = "0.0.1"
+    "#)
+        .file("src/lib.rs", "")
+        .build();
+
+    p.cargo("verify-project")
+        .masquerade_as_nightly_cargo()
+        .with_stdout(verify_project_success_output())
+        .run();
+
+    p.cargo("verify-project")
+        .with_status(1)
+        .with_stdout(r#"{"invalid":"failed to parse manifest at `[CWD]/Cargo.toml`"}"#)
+        .run();
+}