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

Update clap #49182

Merged
merged 1 commit into from
Mar 21, 2018
Merged

Update clap #49182

merged 1 commit into from
Mar 21, 2018

Conversation

matklad
Copy link
Member

@matklad matklad commented Mar 19, 2018

This should fix a regression in Cargo after swithing to clap, when
an external subcommand was not discovered, if its name was close to
a built in command.

bug report: #48986 (comment)
fix: clap-rs/clap#1215

@rust-highfive
Copy link
Collaborator

r? @aturon

(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 Mar 19, 2018
@matklad
Copy link
Member Author

matklad commented Mar 19, 2018

r? @kennytm

@rust-highfive rust-highfive assigned kennytm and unassigned aturon Mar 19, 2018
@matklad matklad mentioned this pull request Mar 19, 2018
Closed
@kennytm
Copy link
Member

kennytm commented Mar 19, 2018

@bors r+ p=1

(Fixes regression, this p is higher)

@matklad I think cargo itself should later add a test to ensure cargo install-update will actually call the 3rd party executable though.

@bors
Copy link
Contributor

bors commented Mar 19, 2018

📌 Commit f88820e has been approved by kennytm

@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 Mar 19, 2018
@matklad
Copy link
Member Author

matklad commented Mar 19, 2018

Seems most reasonable, @kennytm: rust-lang/cargo#5207!

@matklad
Copy link
Member Author

matklad commented Mar 19, 2018

@bors r-

A test in Cargo would fail with a new clap =)

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 19, 2018
@matklad
Copy link
Member Author

matklad commented Mar 20, 2018

Clap is updated in Cargo, however I want to include rust-lang/cargo#5209 as well, which fixes a much more serious regression.

@matklad
Copy link
Member Author

matklad commented Mar 20, 2018

Updated with the latest and greatest Cargo with regressions fixed!

@kennytm
Copy link
Member

kennytm commented Mar 20, 2018

@bors r+

@bors
Copy link
Contributor

bors commented Mar 20, 2018

📌 Commit 40ac331 has been approved by kennytm

@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: This is awaiting some action (such as code changes or more information) from the author. labels Mar 20, 2018
@matklad matklad mentioned this pull request Mar 20, 2018
Closed
@bors
Copy link
Contributor

bors commented Mar 20, 2018

🔒 Merge conflict

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 20, 2018
@matklad
Update Cargo to fix regression
8d97747 
This should fix regressions in Cargo after swithing to clap:

* If an external subcommand name was close to built-in one, clap
  errored (fixed by updating clap version)

* External subcomands didn't received their name as a first arg
@matklad matklad closed this Mar 20, 2018
@matklad matklad reopened this Mar 20, 2018
@bors
Copy link
Contributor

bors commented Mar 20, 2018

💔 Test failed - status-travis

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 20, 2018
@kennytm
Copy link
Member

kennytm commented Mar 20, 2018

@bors retry

travis-ci/dpl is still broken even after released 1.9.3.

/home/travis/.rvm/gems/ruby-2.2.7/gems/dpl-s3-1.9.3/lib/dpl/provider/s3.rb:108:in `rescue in deploy': uninitialized constant Aws::S3::Errors (NameError)

@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 Mar 20, 2018
@bors
Copy link
Contributor

bors commented Mar 20, 2018

⌛ Testing commit 8d97747 with merge da79a95...

bors added a commit that referenced this pull request Mar 20, 2018
@bors
Auto merge of #49182 - matklad:update-clap, r=kennytm
da79a95 
Update clap

This should fix a regression in Cargo after swithing to clap, when
an external subcommand was not discovered, if its name was close to
a built in command.

bug report: #48986 (comment)
fix: clap-rs/clap#1215
@bors
Copy link
Contributor

bors commented Mar 20, 2018

💔 Test failed - status-travis

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 20, 2018
@kennytm
Copy link
Member

kennytm commented Mar 20, 2018

@bors retry travis-ci/dpl#788

@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 Mar 20, 2018
@bors
Copy link
Contributor

bors commented Mar 20, 2018

⌛ Testing commit 8d97747 with merge a76d9c7...

bors added a commit that referenced this pull request Mar 20, 2018
@bors
Auto merge of #49182 - matklad:update-clap, r=kennytm
a76d9c7 
Update clap

This should fix a regression in Cargo after swithing to clap, when
an external subcommand was not discovered, if its name was close to
a built in command.

bug report: #48986 (comment)
fix: clap-rs/clap#1215
@bors
Copy link
Contributor

bors commented Mar 20, 2018

💔 Test failed - status-travis

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 20, 2018
@kennytm
Copy link
Member

kennytm commented Mar 20, 2018

@bors retry travis-ci/dpl#788

@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 Mar 20, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Mar 20, 2018
@kennytm
Rollup merge of rust-lang#49182 - matklad:update-clap, r=kennytm
e667660 
Update clap

This should fix a regression in Cargo after swithing to clap, when
an external subcommand was not discovered, if its name was close to
a built in command.

bug report: rust-lang#48986 (comment)
fix: clap-rs/clap#1215
@kennytm kennytm mentioned this pull request Mar 20, 2018
Merged
bors added a commit that referenced this pull request Mar 20, 2018
@bors
Auto merge of #49221 - kennytm:rollup, r=kennytm
1042053 
Rollup of 3 pull requests

- Successful merges: #49182, #49196, #49217
- Failed merges:
@Frederick888 Frederick888 mentioned this pull request Mar 21, 2018
Closed
@bors bors merged commit 8d97747 into rust-lang:master Mar 21, 2018
@matklad matklad deleted the update-clap branch March 21, 2018 08:02
@hdhoang hdhoang mentioned this pull request Mar 21, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@kennytm kennytm

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
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@matklad @rust-highfive @kennytm @bors @aturon