--workspace flag for locate-project to find the workspace root

[dtolnay]

/git/serde/serde_derive$ cargo locate-project
{"root":"/git/serde/serde_derive/Cargo.toml"}

/git/serde/serde_derive$ cargo locate-project --workspace
{"root":"/git/serde/Cargo.toml"}

[rust-highfive]

r? @ehuss

(rust_highfive has picked a reviewer for you, use r? to override)

[alexcrichton]

Seems reasonable to me!

FWIW cargo locate-project was probably one of the very first commands added to Cargo (I didn't even add it, it was already there when I started!) and has basically been untouched ever since then, so there's a huge amount of room for improvement I would imagine.

@rfcbot fcp merge

[rfcbot]

Team member @alexcrichton has proposed to merge this. The next step is review by the rest of the tagged team members:

• @Eh2406
• @alexcrichton
• @ehuss
• @joshtriplett

No concerns currently listed.

Once a majority of reviewers approve (and at most 2 approvals are outstanding), this will enter its final comment period. If you spot a major issue that hasn't been raised at any point in this process, please speak up!

See this document for info about what commands tagged team members can give me.

[rfcbot]

🔔 This is now entering its final comment period, as per the review above. 🔔

[ehuss]

Thanks!
@bors r+

[bors]

📌 Commit ce0cb542152c456180eaf4569110b22c9d8a3e19 has been approved by ehuss

[bors]

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

1. git checkout workspace (switch to your branch)
2. git fetch upstream master (retrieve the latest master)
3. git rebase upstream/master -p (rebase on top of it)
4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
5. git push self workspace --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging tests/testsuite/locate_project.rs
CONFLICT (content): Merge conflict in tests/testsuite/locate_project.rs
Auto-merging src/etc/man/cargo-locate-project.1
Auto-merging src/etc/cargo.bashcomp.sh
CONFLICT (content): Merge conflict in src/etc/cargo.bashcomp.sh
Auto-merging src/etc/_cargo
CONFLICT (content): Merge conflict in src/etc/_cargo
Auto-merging src/doc/src/commands/cargo-locate-project.md
Auto-merging src/doc/man/generated_txt/cargo-locate-project.txt
Auto-merging src/doc/man/cargo-locate-project.md
Auto-merging src/bin/cargo/commands/locate_project.rs
CONFLICT (content): Merge conflict in src/bin/cargo/commands/locate_project.rs
Automatic merge failed; fix conflicts and then commit the result.

[bors]

☔ The latest upstream changes (presumably #8707) made this pull request unmergeable. Please resolve the merge conflicts.

Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

[dtolnay]

• Rebased to resolve conflict with Add plain message format for locate-project #8707

[ehuss]

@bors r+

[bors]

📌 Commit 17053fc has been approved by ehuss

[bors]

⌛ Testing commit 17053fc with merge 05c611a...

[bors]

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing 05c611a to master...