Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Sep 23, 2020

Conversation

dtolnay
Copy link
Member

@dtolnay dtolnay commented Sep 18, 2020

/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
Copy link

r? @ehuss

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 18, 2020
@alexcrichton alexcrichton added the T-cargo Team: Cargo label Sep 22, 2020
@alexcrichton
Copy link
Member

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
Copy link
Collaborator

rfcbot commented Sep 22, 2020

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

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 rfcbot added proposed-final-comment-period An FCP proposal has started, but not yet signed off. disposition-merge FCP with intent to merge final-comment-period FCP — a period for last comments before action is taken and removed proposed-final-comment-period An FCP proposal has started, but not yet signed off. labels Sep 22, 2020
@rfcbot
Copy link
Collaborator

rfcbot commented Sep 22, 2020

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

@ehuss
Copy link
Contributor

ehuss commented Sep 23, 2020

Thanks!
@bors r+

@bors
Copy link
Contributor

bors commented Sep 23, 2020

📌 Commit ce0cb542152c456180eaf4569110b22c9d8a3e19 has been approved by ehuss

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 23, 2020
@bors
Copy link
Contributor

bors commented Sep 23, 2020

🔒 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 bors added S-waiting-on-author Status: The marked PR is awaiting some action (such as code changes) from the PR author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 23, 2020
@bors
Copy link
Contributor

bors commented Sep 23, 2020

☔ 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
Copy link
Member Author

dtolnay commented Sep 23, 2020

@ehuss
Copy link
Contributor

ehuss commented Sep 23, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Sep 23, 2020

📌 Commit 17053fc has been approved by ehuss

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: The marked PR is awaiting some action (such as code changes) from the PR author. labels Sep 23, 2020
@bors
Copy link
Contributor

bors commented Sep 23, 2020

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

@bors
Copy link
Contributor

bors commented Sep 23, 2020

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

@bors bors merged commit 05c611a into rust-lang:master Sep 23, 2020
RalfJung added a commit to RalfJung/rust that referenced this pull request Sep 25, 2020
Update cargo

7 commits in 8777a6b1e8834899f51b7e09cc9b8d85b2417110..05c611ae3c4255b7a2bcf4fcfa65b20286a07839
2020-09-15 19:11:03 +0000 to 2020-09-23 23:10:38 +0000
- --workspace flag for locate-project to find the workspace root (rust-lang/cargo#8712)
- Remove some badges documentation. (rust-lang/cargo#8727)
- Add plain message format for locate-project (rust-lang/cargo#8707)
- Add a term option to configure the progress bar (rust-lang/cargo#8165)
- Replace d_as_f64 with as_secs_f64 (rust-lang/cargo#8721)
- Add cross check to filters_target test. (rust-lang/cargo#8713)
- Add test for whitespace behavior in env flags. (rust-lang/cargo#8706)
@rfcbot rfcbot added finished-final-comment-period FCP complete to-announce and removed final-comment-period FCP — a period for last comments before action is taken labels Oct 2, 2020
@dtolnay dtolnay deleted the workspace branch May 30, 2021 15:51
@ehuss ehuss added this to the 1.48.0 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
disposition-merge FCP with intent to merge finished-final-comment-period FCP complete S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-cargo Team: Cargo to-announce
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants