feat: Add custom completer for completing target triple by shannmu · Pull Request #14535 · rust-lang/cargo (original) (raw)

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 andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Conversation13 Commits1 Checks21 Files changed

Conversation

This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters

[ Show hidden characters]({{ revealButtonHref }})

shannmu

What does this PR try to resolve?

Tracking issue #14520

Add custom completer for cargo build --target=<TAB>

@rustbot

r? @ehuss

rustbot has assigned @ehuss.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added A-cli

Area: Command-line interface, option parsing, etc.

S-waiting-on-review

Status: Awaiting review from the assignee but also interested parties.

labels

Sep 11, 2024

@shannmu

epage

epage

epage

@bors

@epage

@bors

📌 Commit 63ef141 has been approved by epage

It is now in the queue for this repository.

@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 17, 2024

@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 _cargo_target_triple (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_target_triple --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 src/cargo/util/command_prelude.rs
CONFLICT (content): Merge conflict in src/cargo/util/command_prelude.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 17, 2024

@shannmu

@epage

@bors

📌 Commit 7968f54 has been approved by epage

It is now in the queue for this repository.

@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 17, 2024

@bors

@bors

@bors bors mentioned this pull request

Sep 17, 2024

@bors bors mentioned this pull request

Sep 17, 2024

@epage epage mentioned this pull request

Sep 17, 2024

30 tasks

bors added a commit to rust-lang-ci/rust that referenced this pull request

Sep 20, 2024

@bors

RalfJung pushed a commit to RalfJung/miri that referenced this pull request

Sep 21, 2024

@bors

Labels

A-cli

Area: Command-line interface, option parsing, etc.

S-waiting-on-bors

Status: Waiting on bors to run and complete tests. Bors will change the label on completion.