Skip to content

[beta]: Update Cargo's submodule - #55831

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

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

Conversation

@alexcrichton

@alexcrichtonalexcrichton commented Nov 9, 2018

Copy link
Copy Markdown
Member

Hopefully a routine update to the rust-1.31.0 branch!

@rust-highfive

rust-highfive commented Nov 9, 2018

Copy link
Copy Markdown
Contributor

r? @aturon

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

@rust-highfive

rust-highfive commented Nov 9, 2018

Copy link
Copy Markdown
Contributor

⚠️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-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 9, 2018
@alexcrichton

alexcrichton commented Nov 9, 2018

Copy link
Copy Markdown
MemberAuthor

r? @Mark-Simulacrum

@ehuss

ehuss commented Nov 9, 2018

Copy link
Copy Markdown
Contributor

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

@alexcrichton

alexcrichton commented Nov 9, 2018

Copy link
Copy Markdown
MemberAuthor

er oops, yes!

@Mark-Simulacrum

Mark-Simulacrum commented Nov 9, 2018

Copy link
Copy Markdown
Member

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

alexcrichton commented Nov 10, 2018

Copy link
Copy Markdown
MemberAuthor

@bors: r+ p=1

@bors

bors commented Nov 10, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit e68d70c has been approved by alexcrichton

@borsbors 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

emilyalbini commented Nov 10, 2018

Copy link
Copy Markdown
Member

@bors r-

Rolling this up.

@borsbors 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 ofrust-lang#55831- alexcrichton:beta-cargo-update, r=a…
3b3639a
…lexcrichton
Hopefully a routine update to the rust-1.31.0 branch!
@emilyalbiniemilyalbini 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:betaNov 10, 2018
@alexcrichton
alexcrichton deleted the beta-cargo-update branch July 8, 2019 22:22
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@Mark-SimulacrumMark-Simulacrum

Labels

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