-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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
fix(--package
): accept ?
if it's a valid pkgid spec
#13315
Merged
Merged
Conversation
This file contains 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
Previously if a value from `--package` flag contains `?`, Cargo considered it as a glob pattern. However, staring from 12933 the Package Id Spec has been extended to accept `?` for git sources. This PR adjust accordingly to accept `?` from `--package` flag when it is a valid Package Id Spec.
r? @epage (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
the
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
label
Jan 18, 2024
@bors r+ I assume beta backport becaust |
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
Jan 18, 2024
☀️ Test successful - checks-actions |
weihanglo
pushed a commit
to weihanglo/cargo
that referenced
this pull request
Jan 18, 2024
fix(`--package`): accept `?` if it's a valid pkgid spec
bors
added a commit
that referenced
this pull request
Jan 18, 2024
[beta-1.76.0] fix(`--package`): accept `?` if it's a valid pkgid spec Beta backports: - <#13315> In order to make CI pass, the following PRs are also cherry-picked: -
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 24, 2024
Update cargo 10 commits in 1ae631085f01c1a72d05df1ec81f3759a8360042..7bb7b539558dc88bea44cee4168b6269bf8177b0 2024-01-17 17:26:41 +0000 to 2024-01-20 00:15:32 +0000 - feat: inherit jobserver from env for all kinds of runner (rust-lang/cargo#12776) - Fix static_mut_ref warning. (rust-lang/cargo#13329) - fix(trim-paths): remap common prefix only (rust-lang/cargo#13210) - fix(cargo-rustdoc): use same path by output format logic everywhere (rust-lang/cargo#13325) - chore: Make MSRV=N-2 the workspace default (rust-lang/cargo#13324) - Fix precise-prerelease tracking link. (rust-lang/cargo#13320) - test(pkgid): keep package ID format in sync (rust-lang/cargo#13322) - Improve GitHub Actions CI config (rust-lang/cargo#13317) - Go back to passing an empty `values()` when no features are declared (rust-lang/cargo#13316) - fix(`--package`): accept `?` if it's a valid pkgid spec (rust-lang/cargo#13315) r? ghost
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 24, 2024
Update cargo 10 commits in 1ae631085f01c1a72d05df1ec81f3759a8360042..7bb7b539558dc88bea44cee4168b6269bf8177b0 2024-01-17 17:26:41 +0000 to 2024-01-20 00:15:32 +0000 - feat: inherit jobserver from env for all kinds of runner (rust-lang/cargo#12776) - Fix static_mut_ref warning. (rust-lang/cargo#13329) - fix(trim-paths): remap common prefix only (rust-lang/cargo#13210) - fix(cargo-rustdoc): use same path by output format logic everywhere (rust-lang/cargo#13325) - chore: Make MSRV=N-2 the workspace default (rust-lang/cargo#13324) - Fix precise-prerelease tracking link. (rust-lang/cargo#13320) - test(pkgid): keep package ID format in sync (rust-lang/cargo#13322) - Improve GitHub Actions CI config (rust-lang/cargo#13317) - Go back to passing an empty `values()` when no features are declared (rust-lang/cargo#13316) - fix(`--package`): accept `?` if it's a valid pkgid spec (rust-lang/cargo#13315) r? ghost
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 24, 2024
Update cargo 10 commits in 1ae631085f01c1a72d05df1ec81f3759a8360042..7bb7b539558dc88bea44cee4168b6269bf8177b0 2024-01-17 17:26:41 +0000 to 2024-01-20 00:15:32 +0000 - feat: inherit jobserver from env for all kinds of runner (rust-lang/cargo#12776) - Fix static_mut_ref warning. (rust-lang/cargo#13329) - fix(trim-paths): remap common prefix only (rust-lang/cargo#13210) - fix(cargo-rustdoc): use same path by output format logic everywhere (rust-lang/cargo#13325) - chore: Make MSRV=N-2 the workspace default (rust-lang/cargo#13324) - Fix precise-prerelease tracking link. (rust-lang/cargo#13320) - test(pkgid): keep package ID format in sync (rust-lang/cargo#13322) - Improve GitHub Actions CI config (rust-lang/cargo#13317) - Go back to passing an empty `values()` when no features are declared (rust-lang/cargo#13316) - fix(`--package`): accept `?` if it's a valid pkgid spec (rust-lang/cargo#13315) r? ghost
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 24, 2024
Update cargo 10 commits in 1ae631085f01c1a72d05df1ec81f3759a8360042..7bb7b539558dc88bea44cee4168b6269bf8177b0 2024-01-17 17:26:41 +0000 to 2024-01-20 00:15:32 +0000 - feat: inherit jobserver from env for all kinds of runner (rust-lang/cargo#12776) - Fix static_mut_ref warning. (rust-lang/cargo#13329) - fix(trim-paths): remap common prefix only (rust-lang/cargo#13210) - fix(cargo-rustdoc): use same path by output format logic everywhere (rust-lang/cargo#13325) - chore: Make MSRV=N-2 the workspace default (rust-lang/cargo#13324) - Fix precise-prerelease tracking link. (rust-lang/cargo#13320) - test(pkgid): keep package ID format in sync (rust-lang/cargo#13322) - Improve GitHub Actions CI config (rust-lang/cargo#13317) - Go back to passing an empty `values()` when no features are declared (rust-lang/cargo#13316) - fix(`--package`): accept `?` if it's a valid pkgid spec (rust-lang/cargo#13315) r? ghost
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
beta-nominated
Nominated to backport to the beta branch.
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
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?
Previously if a value from
--package
flag contains?
, Cargoconsidered it as a glob pattern. However, staring from #12933 the
Package Id Spec has been extended to accept
?
for git sources.This PR adjust accordingly to accept
?
from--package
flagwhen it is a valid Package Id Spec.
How should we test and review this PR?
The first commit demonstrates the current behavior, the second fixes it.
Additional information
I'd like to propose a beta backport for this.