Skip to content

[beta]: Update Cargo's submodule#55831

Merged
bors merged 1 commit intorust-lang:betafrom
alexcrichton:beta-cargo-update
Nov 10, 2018
Merged

[beta]: Update Cargo's submodule#55831
bors merged 1 commit intorust-lang:betafrom
alexcrichton:beta-cargo-update

Conversation

@alexcrichton
Copy link
Member

@alexcrichton alexcrichton commented Nov 9, 2018

Hopefully a routine update to the rust-1.31.0 branch!

@rust-highfive
Copy link
Contributor

rust-highfive commented Nov 9, 2018

r? @aturon

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link
Contributor

rust-highfive commented Nov 9, 2018

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!
  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 9, 2018
@alexcrichton
Copy link
Member Author

alexcrichton commented Nov 9, 2018

r? @Mark-Simulacrum

@ehuss
Copy link
Contributor

ehuss commented Nov 9, 2018

Do you want to wait for rust-lang/cargo#6297 to land?

@alexcrichton
Copy link
Member Author

alexcrichton commented Nov 9, 2018

er oops, yes!

@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented Nov 9, 2018

r=me with that PR included

@alexcrichton
[beta]: Update Cargo's submodule
e68d70c 
Hopefully a routine update to the rust-1.31.0 branch!
@alexcrichton
Copy link
Member Author

alexcrichton commented Nov 10, 2018

@bors: r+ p=1

@bors
Copy link
Collaborator

bors commented Nov 10, 2018

📌 Commit e68d70c has been approved by alexcrichton

@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 Nov 10, 2018
@emilyalbini
Copy link
Member

emilyalbini commented Nov 10, 2018

@bors r-

Rolling this up.

@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 Nov 10, 2018
emilyalbini added a commit to emilyalbini/rust that referenced this pull request Nov 10, 2018
@emilyalbini
Rollup merge of rust-lang#55831 - alexcrichton:beta-cargo-update, r=a…
3b3639a 
…lexcrichton

Hopefully a routine update to the rust-1.31.0 branch!
@emilyalbini emilyalbini mentioned this pull request Nov 10, 2018
Merged
bors added a commit that referenced this pull request Nov 10, 2018
@bors
Auto merge of #55849 - pietroalbini:beta-rollup, r=pietroalbini
9142ac9 
[beta] Rollup backports

Merged and approved:

* #55831: [beta]: Update Cargo's submodule
* #55717: Bubble up an overflow error so that rustdoc can ignore it
* #55637: Do not attempt to ascribe projections out of a ty var
* #55378: rustbuild: use configured linker to build bootstrap

r? @ghost
@bors bors merged commit e68d70c into rust-lang:beta Nov 10, 2018
@alexcrichton alexcrichton deleted the beta-cargo-update branch July 8, 2019 22:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels

S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@alexcrichton @rust-highfive @ehuss @Mark-Simulacrum @bors @emilyalbini @aturon