Skip to content

Update Cargo to Wed Nov 29 15:19:05 2017 +0000 - #46376

Merged
bors merged 1 commit into
rust-lang:masterfrom
SimonSapin:cargoup
Dec 2, 2017
Merged

Update Cargo to Wed Nov 29 15:19:05 2017 +0000#46376
bors merged 1 commit into
rust-lang:masterfrom
SimonSapin:cargoup

Conversation

@SimonSapin

@SimonSapinSimonSapin commented Nov 29, 2017

Copy link
Copy Markdown
Contributor

rust-lang/cargo@5bb478a

Pick up workspace.default-members support: rust-lang/cargo#4743

@rust-highfive

rust-highfive commented Nov 29, 2017

Copy link
Copy Markdown
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @nikomatsakis (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@kennytmkennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 29, 2017
@bors

bors commented Nov 30, 2017

Copy link
Copy Markdown
Collaborator

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

@SimonSapin

SimonSapin commented Nov 30, 2017

Copy link
Copy Markdown
ContributorAuthor

Rebased. (#46144 updated to just beforerust-lang/cargo#4743)

@kennytm

kennytm commented Nov 30, 2017

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Nov 30, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 2544b9f has been approved by kennytm

@kennytmkennytm 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 Nov 30, 2017
kennytm added a commit to kennytm/rust that referenced this pull request Dec 1, 2017
@kennytm
Rollup merge ofrust-lang#46376- SimonSapin:cargoup, r=kennytm
613da5c
Update Cargo to Wed Nov 29 15:19:05 2017 +0000
rust-lang/cargo@5bb478a
Pick up `workspace.default-members` support: rust-lang/cargo#4743
@kennytmkennytm mentioned this pull request Dec 1, 2017
Merged
bors added a commit that referenced this pull request Dec 1, 2017
@bors
Auto merge of#46430- kennytm:rollup, r=kennytm
7051754
Rollup of 13 pull requests
- Successful merges: #45880, #46280, #46373, #46376, #46385, #46386, #46387, #46392, #46400, #46401, #46405, #46412, #46421
- Failed merges:
@bors
bors merged commit 2544b9f into rust-lang:masterDec 2, 2017
@SimonSapin
SimonSapin deleted the cargoup branch December 2, 2017 18:12
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@nikomatsakisnikomatsakis

Labels

S-waiting-on-borsStatus: 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

@SimonSapin@rust-highfive@bors@kennytm@nikomatsakis