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.

Sign up for GitHub

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

Jump to bottom

Deduplicate entries in cargo --list #9773

Merged
merged 1 commit into from
Aug 9, 2021
Merged

Deduplicate entries in cargo --list #9773

merged 1 commit into from
Aug 9, 2021

Conversation

nipunn1313
Copy link
Contributor

Fixes #6088

@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 Aug 7, 2021
@nipunn1313 nipunn1313 mentioned this pull request Aug 7, 2021
Closed
@alexcrichton
Copy link
Member

@bors: r+

Thanks!

I suspect this will conflict with another PR I just r+'d as well, but let's see what bors says.

@bors
Copy link
Contributor

bors commented Aug 9, 2021

📌 Commit 4d7aee133fb4baadddd968a9c32e2dd21d6dd31a has been approved by alexcrichton

@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 Aug 9, 2021
@bors
Copy link
Contributor

bors commented Aug 9, 2021

🔒 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 cargo_list_dupe (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 cargo_list_dupe --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/cargo_command.rs
CONFLICT (content): Merge conflict in tests/testsuite/cargo_command.rs
Auto-merging src/cargo/util/command_prelude.rs
CONFLICT (content): Merge conflict in src/cargo/util/command_prelude.rs
Auto-merging src/bin/cargo/main.rs
CONFLICT (content): Merge conflict in src/bin/cargo/main.rs
Auto-merging src/bin/cargo/cli.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 Aug 9, 2021
@bors
Copy link
Contributor

bors commented Aug 9, 2021

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

@nipunn1313
Copy link
Contributor Author

All good. I'm familiar with the conflicting diff (I also reviewed it since I noticed it was in the same area and I had context).
Just rebased it.

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Aug 9, 2021

📌 Commit 0ab79d7 has been approved by alexcrichton

@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 Aug 9, 2021
@bors
Copy link
Contributor

bors commented Aug 9, 2021

⌛ Testing commit 0ab79d7 with merge b51439f...

@bors
Copy link
Contributor

bors commented Aug 9, 2021

☀️ Test successful - checks-actions
Approved by: alexcrichton
Pushing b51439f to master...

@bors bors merged commit b51439f into rust-lang:master Aug 9, 2021
@ehuss ehuss mentioned this pull request Aug 10, 2021
Merged
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Aug 11, 2021
@JohnTitor
Rollup merge of rust-lang#87928 - ehuss:update-cargo, r=ehuss
ec47f6e 
Update cargo

9 commits in cc17afbb0067b1f57d8882640f63b2168d5b7624..b51439fd8b505d4800a257acfecf3c69f81e35cf
2021-08-02 20:28:08 +0000 to 2021-08-09 18:40:05 +0000
- Deduplicate entries in cargo --list (rust-lang/cargo#9773)
- Include aliases with other commands (rust-lang/cargo#9764)
- Add a profile option to select the codegen backend (rust-lang/cargo#9118)
- remove useless conversions (rust-lang/cargo#9617)
- collapse nested if blocks (rust-lang/cargo#9613)
- Refactor fake_file() away from cargo_command tests (rust-lang/cargo#9767)
- Update cargo-platform to 0.1.2 (rust-lang/cargo#9762)
- Bump to the latest jobserver dependency (rust-lang/cargo#9760)
- Fix semver check for rust 1.54.0 (rust-lang/cargo#9763)
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Aug 11, 2021
@JohnTitor
Rollup merge of rust-lang#87928 - ehuss:update-cargo, r=ehuss
dd6ff48 
Update cargo

9 commits in cc17afbb0067b1f57d8882640f63b2168d5b7624..b51439fd8b505d4800a257acfecf3c69f81e35cf
2021-08-02 20:28:08 +0000 to 2021-08-09 18:40:05 +0000
- Deduplicate entries in cargo --list (rust-lang/cargo#9773)
- Include aliases with other commands (rust-lang/cargo#9764)
- Add a profile option to select the codegen backend (rust-lang/cargo#9118)
- remove useless conversions (rust-lang/cargo#9617)
- collapse nested if blocks (rust-lang/cargo#9613)
- Refactor fake_file() away from cargo_command tests (rust-lang/cargo#9767)
- Update cargo-platform to 0.1.2 (rust-lang/cargo#9762)
- Bump to the latest jobserver dependency (rust-lang/cargo#9760)
- Fix semver check for rust 1.54.0 (rust-lang/cargo#9763)
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Aug 12, 2021
@JohnTitor
Rollup merge of rust-lang#87928 - ehuss:update-cargo, r=ehuss
12117e3 
Update cargo

9 commits in cc17afbb0067b1f57d8882640f63b2168d5b7624..b51439fd8b505d4800a257acfecf3c69f81e35cf
2021-08-02 20:28:08 +0000 to 2021-08-09 18:40:05 +0000
- Deduplicate entries in cargo --list (rust-lang/cargo#9773)
- Include aliases with other commands (rust-lang/cargo#9764)
- Add a profile option to select the codegen backend (rust-lang/cargo#9118)
- remove useless conversions (rust-lang/cargo#9617)
- collapse nested if blocks (rust-lang/cargo#9613)
- Refactor fake_file() away from cargo_command tests (rust-lang/cargo#9767)
- Update cargo-platform to 0.1.2 (rust-lang/cargo#9762)
- Bump to the latest jobserver dependency (rust-lang/cargo#9760)
- Fix semver check for rust 1.54.0 (rust-lang/cargo#9763)
@nipunn1313 nipunn1313 deleted the cargo_list_dupe branch September 3, 2021 02:30
@ehuss ehuss added this to the 1.56.0 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@ehuss ehuss

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.56.0
Development

Successfully merging this pull request may close these issues.

cargo list does not de-duplicate entries
5 participants
@nipunn1313 @rust-highfive @alexcrichton @bors @ehuss