Tab completion for --target uses rustup but fallsback to rustc#12606
Merged
bors merged 2 commits intorust-lang:masterfrom Aug 31, 2023
Angelin01:tab-completion-rustup-fallback-rustc
Merged
Tab completion for --target uses rustup but fallsback to rustc#12606bors merged 2 commits intorust-lang:masterfrom Angelin01:tab-completion-rustup-fallback-rustc
bors merged 2 commits intorust-lang:masterfrom
Angelin01:tab-completion-rustup-fallback-rustc
Conversation
Collaborator
|
r? @weihanglo (rustbot has picked a reviewer for you, use r? to override) |
weihanglo
reviewed
Aug 31, 2023
Member
weihanglo
left a comment
There was a problem hiding this comment.
Looks pretty good to me!
To whom wants to test the change, simply run:
zsh
fpath+=$PWD/src/etc
autoload -Uz compinit
compinit
cargo b --target <tab>bash
. ./src/etc/cargo.bashcomp.sh
cargo b --target <tab>
src/etc/cargo.bashcomp.sh
Outdated
| fi | ||
| done <<< "$targets" | ||
| echo "${result[@]}" | ||
| if command -v rustup >/dev/null; then |
Member
There was a problem hiding this comment.
A bit better? Though I don't thinkg command -v would output anything to stderr.
Suggested change
| if command -v rustup >/dev/null; then | |
| if command -v rustup 2>&1 /dev/null; then |
Author
There was a problem hiding this comment.
I tried really hard to make it output anything:
> command -v
> command -v blablabla
> command -v /dev/zero
> command -v ..
> command -v ../../../..
> command -v 0
> command -v x
> command -v \`
> command -v \\
> command -v 😊
> It really seems like it never outputs to stdout. BUT, I don't trust that bash may not decide to add some output, so I redirected it as well.
weihanglo
approved these changes
Aug 31, 2023
Member
|
Tested both with and without rustup in bash and zsh. Everything goes well on my side. Thank you for the contribution :) @bors r+ |
Contributor
Contributor
Contributor
|
☀️ Test successful - checks-actions |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 6, 2023
Update cargo 21 commits in 96fe1c9e1aecd8f57063e3753969bb6418fd2fd5..d14c85f4e6e7671673b1a1bc87231ff7164761e1 2023-08-29 20:10:34 +0000 to 2023-09-05 22:28:10 +0000 - fix(resolver): Make resolver behavior independent of package order (rust-lang/cargo#12602) - cargo-credential: change serialization of cache expiration (rust-lang/cargo#12622) - Update registry-web-api.md yank/unyank comments (rust-lang/cargo#12619) - test: new options of debuginfo are no longer unstable (rust-lang/cargo#12618) - use split_once for cleaner code (rust-lang/cargo#12615) - stop using lazy_static (rust-lang/cargo#12616) - doc: adjust all doc headings one level up (rust-lang/cargo#12595) - chore(deps): update compatible (rust-lang/cargo#12609) - chore(deps): update rust crate cargo_metadata to 0.17.0 (rust-lang/cargo#12610) - Prepare for partial-version package specs (rust-lang/cargo#12591) - refactor: Use more serde_untagged (rust-lang/cargo#12581) - fix(cli): Help users know possible `--target` values (rust-lang/cargo#12607) - Tab completion for --target uses rustup but fallsback to rustc (rust-lang/cargo#12606) - Fewer temporary needless strings (rust-lang/cargo#12604) - fix(help): Provide better commands heading for styling (rust-lang/cargo#12593) - fix(update): Clarify meaning of --aggressive as --recursive (rust-lang/cargo#12544) - docs(changelog): Clarify language for Cargo.lock policy (rust-lang/cargo#12601) - fix typo: "default branch branch" -> "default branch" (rust-lang/cargo#12598) - fix: add error for unsupported credential provider version (rust-lang/cargo#12590) - fix(help): Explain --explain (rust-lang/cargo#12592) - fix(help): Remove redundant information from new/init (rust-lang/cargo#12594) r? ghost
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR try to resolve?
Fixes #12585
Currently, not only is the tab completion for
--targetinconsistent between bash and zsh, it depends on rustup and rustc respectively.As discussed in the issue at hand, we'll use
rustupif it is available and fallback torustcif it is not, even if it is unfriendly.How should we test and review this PR?
Source the respective completion functions and test it out with
cargo build --target [TAB].I would appreciate if someone that regularly uses zsh would test this. I did basic testing, but since I don't use zsh commonly I am unsure if everything is as it should be.
Additional information
I switched to using
rustup target list --installedinstead of grabbing lines that contain "default" or "installed". I believe that any "default" target should be installed too, right?