Find workspace via workspace_root link in containing member

matklad · matklad · commit 3435414edbf3 · 2017-01-19T16:09:51.000+03:00
diff --git a/src/cargo/core/workspace.rs b/src/cargo/core/workspace.rs
@@ -230,6 +230,14 @@ impl<'cfg> Workspace<'cfg> {
     /// if some other transient error happens.
     fn find_root(&mut self, manifest_path: &Path)
                  -> CargoResult<Option<PathBuf>> {
+        fn read_root_pointer(member_manifest: &Path, root_link: &str) -> CargoResult<PathBuf> {
+            let path = member_manifest.parent().unwrap()
+                .join(root_link)
+                .join("Cargo.toml");
+            debug!("find_root - pointer {}", path.display());
+            return Ok(paths::normalize_path(&path))
+        };
+
         {
             let current = self.packages.load(&manifest_path)?;
             match *current.workspace_config() {
@@ -238,11 +246,7 @@ impl<'cfg> Workspace<'cfg> {
                     return Ok(Some(manifest_path.to_path_buf()))
                 }
                 WorkspaceConfig::Member { root: Some(ref path_to_root) } => {
-                    let path = manifest_path.parent().unwrap()
-                                            .join(path_to_root)
-                                            .join("Cargo.toml");
-                    debug!("find_root - pointer {}", path.display());
-                    return Ok(Some(paths::normalize_path(&path)))
+                    return Ok(Some(read_root_pointer(manifest_path, path_to_root)?))
                 }
                 WorkspaceConfig::Member { root: None } => {}
             }
@@ -258,6 +262,9 @@ impl<'cfg> Workspace<'cfg> {
                         debug!("find_root - found");
                         return Ok(Some(manifest))
                     }
+                    WorkspaceConfig::Member { root: Some(ref path_to_root) } => {
+                        return Ok(Some(read_root_pointer(&manifest, path_to_root)?))
+                    }
                     WorkspaceConfig::Member { .. } => {}
                 }
             }
diff --git a/tests/workspaces.rs b/tests/workspaces.rs
@@ -1227,8 +1227,7 @@ fn test_path_dependency_under_member() {
 
     assert_that(p.cargo("build").cwd(p.root().join("foo/bar")),
                 execs().with_status(0));
-    // Ideally, `foo/bar` should be a member of the workspace,
-    // because it is hierarchically under the workspace member.
-    assert_that(&p.root().join("foo/bar/Cargo.lock"), existing_file());
-    assert_that(&p.root().join("foo/bar/target"), existing_dir());
+
+    assert_that(&p.root().join("foo/bar/Cargo.lock"), is_not(existing_file()));
+    assert_that(&p.root().join("foo/bar/target"), is_not(existing_dir()));
 }

Original file line number	Diff line number	Diff line change
`@@ -230,6 +230,14 @@ impl<'cfg> Workspace<'cfg> {`
`230`	`230`	`/// if some other transient error happens.`
`231`	`231`	`fn find_root(&mut self, manifest_path: &Path)`
`232`	`232`	`-> CargoResult<Option<PathBuf>> {`
	`233`	`+ fn read_root_pointer(member_manifest: &Path, root_link: &str) -> CargoResult<PathBuf> {`
	`234`	`+ let path = member_manifest.parent().unwrap()`
	`235`	`+ .join(root_link)`
	`236`	`+ .join("Cargo.toml");`
	`237`	`+ debug!("find_root - pointer {}", path.display());`
	`238`	`+ return Ok(paths::normalize_path(&path))`
	`239`	`+ };`
	`240`	`+`
`233`	`241`	`{`
`234`	`242`	`let current = self.packages.load(&manifest_path)?;`
`235`	`243`	`match *current.workspace_config() {`
`@@ -238,11 +246,7 @@ impl<'cfg> Workspace<'cfg> {`
`238`	`246`	`return Ok(Some(manifest_path.to_path_buf()))`
`239`	`247`	`}`
`240`	`248`	`WorkspaceConfig::Member { root: Some(ref path_to_root) } => {`
`241`		`- let path = manifest_path.parent().unwrap()`
`242`		`- .join(path_to_root)`
`243`		`- .join("Cargo.toml");`
`244`		`- debug!("find_root - pointer {}", path.display());`
`245`		`- return Ok(Some(paths::normalize_path(&path)))`
	`249`	`+ return Ok(Some(read_root_pointer(manifest_path, path_to_root)?))`
`246`	`250`	`}`
`247`	`251`	`WorkspaceConfig::Member { root: None } => {}`
`248`	`252`	`}`
`@@ -258,6 +262,9 @@ impl<'cfg> Workspace<'cfg> {`
`258`	`262`	`debug!("find_root - found");`
`259`	`263`	`return Ok(Some(manifest))`
`260`	`264`	`}`
	`265`	`+ WorkspaceConfig::Member { root: Some(ref path_to_root) } => {`
	`266`	`+ return Ok(Some(read_root_pointer(&manifest, path_to_root)?))`
	`267`	`+ }`
`261`	`268`	`WorkspaceConfig::Member { .. } => {}`
`262`	`269`	`}`
`263`	`270`	`}`