From: bors <bors@rust-lang.org>
Date: Sat, 13 Jan 2018 23:59:50 +0000 (+0000)
Subject: Auto merge of #4938 - ehuss:ws-meta, r=alexcrichton
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~3^2~42
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6a8eb71f6d226f9ac869dbacd5ff6aa76deef1c4;p=cargo.git

Auto merge of #4938 - ehuss:ws-meta, r=alexcrichton

Add workspace root to metadata command.

Fixes #4933

@alexcrichton, you mentioned using `"workspace_manifest"`, but the `Workspace.root` function already strips off `Cargo.toml`.  It would be easy to append it back, though I'm uncertain if that's really necessary since I think for most use cases it will just need to be stripped off again.  Also, I feel like it might be confusing for non-workspace packages since `workspace_manifest` would be the same as the package `manifest_path` (and in that case it isn't really a workspace manifest).  I can easily change it, just let me know.
---

6a8eb71f6d226f9ac869dbacd5ff6aa76deef1c4