Auto merge of #3409 - matklad:workspace-manifest-error, r=alexcrichton

bors · bors · commit 65063c5c828f · 2016-12-15T19:04:28.000Z
Don't ignore errors in workspace manifest Closes #3407 If we find `Cargo.toml` during an up tree traversal, we'd better not to ignore errors within it!
diff --git a/src/cargo/core/workspace.rs b/src/cargo/core/workspace.rs
@@ -242,8 +242,8 @@ impl<'cfg> Workspace<'cfg> {
         while let Some(path) = cur {
             let manifest = path.join("Cargo.toml");
             debug!("find_root - trying {}", manifest.display());
-            if let Ok(pkg) = self.packages.load(&manifest) {
-                match *pkg.workspace_config() {
+            if manifest.exists() {
+                match *self.packages.load(&manifest)?.workspace_config() {
                     WorkspaceConfig::Root { .. } => {
                         debug!("find_root - found");
                         return Ok(Some(manifest))
diff --git a/tests/workspaces.rs b/tests/workspaces.rs
@@ -1055,3 +1055,22 @@ fn workspace_with_transitive_dev_deps() {
     assert_that(p.cargo("test").args(&["-p", "bar"]),
                 execs().with_status(0));
 }
+
+#[test]
+fn error_if_parent_cargo_toml_is_invalid() {
+    let p = project("foo")
+        .file("Cargo.toml", "Totally not a TOML file")
+        .file("bar/Cargo.toml", r#"
+            [project]
+            name = "bar"
+            version = "0.1.0"
+            authors = []
+        "#)
+        .file("bar/src/main.rs", "fn main() {}");
+    p.build();
+
+    assert_that(p.cargo("build").cwd(p.root().join("bar")),
+                execs().with_status(101)
+                       .with_stderr_contains("\
+[ERROR] failed to parse manifest at `[..]`"));
+}
