Skip to content

[beta] Update the cargo submodule - #43208

Closed
alexcrichton wants to merge 3 commits into
rust-lang:betafrom
alexcrichton:update-cargo2
Closed

[beta] Update the cargo submodule#43208
alexcrichton wants to merge 3 commits into
rust-lang:betafrom
alexcrichton:update-cargo2

Conversation

@alexcrichton

@alexcrichtonalexcrichton commented Jul 13, 2017

Copy link
Copy Markdown
Member

Notably pull in an update to the jobserver crate to have Cargo set the
CARGO_MAKEFLAGS environment variable instead of the MAKEFLAGS environment
variable.

@rust-highfive

rust-highfive commented Jul 13, 2017

Copy link
Copy Markdown
Contributor

r? @brson

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

@alexcrichtonalexcrichton mentioned this pull request Jul 13, 2017
Closed
@Mark-Simulacrum

Mark-Simulacrum commented Jul 13, 2017

Copy link
Copy Markdown
Member

@bors r+ p=50

@bors

bors commented Jul 13, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 451fa08 has been approved by Mark-Simulacrum

@Mark-Simulacrum

Mark-Simulacrum commented Jul 13, 2017

Copy link
Copy Markdown
Member

@bors r- No point landing this without #43198 -- I'll prepare a patch

@Mark-Simulacrum

Mark-Simulacrum commented Jul 13, 2017

Copy link
Copy Markdown
Member

Included the patch in #43114, once that lands this can as well.

@alexcrichton

alexcrichton commented Jul 13, 2017

Copy link
Copy Markdown
MemberAuthor

@bors: r+

(behind the queue of #43114)

@bors

bors commented Jul 13, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 451fa08 has been approved by alexcrichton

@alexcrichtonalexcrichton added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 13, 2017
@alexcrichton
Update the cargo submodule
8734aaa
Notably pull in an update to the `jobserver` crate to have Cargo set the
`CARGO_MAKEFLAGS` environment variable instead of the `MAKEFLAGS` environment
variable.
@alexcrichton

alexcrichton commented Jul 13, 2017

Copy link
Copy Markdown
MemberAuthor

@bors: r=Mark-Simulacrum

@bors

bors commented Jul 13, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 8734aaa has been approved by Mark-Simulacrum

@bors

bors commented Jul 13, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 8734aaa with merge d7d343aee37d9123629dd64a732f9eaffda75b43...

@alexcrichton

alexcrichton commented Jul 13, 2017

Copy link
Copy Markdown
MemberAuthor

@bors: retry

prioritizing #43114

@bors

bors commented Jul 13, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 8734aaa with merge aeebab70759c83b5abc58cf04ea1437232cdea0c...

@borsbors mentioned this pull request Jul 13, 2017
Merged
@alexcrichton

alexcrichton commented Jul 13, 2017

Copy link
Copy Markdown
MemberAuthor

@bors: retry

@bors

bors commented Jul 13, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 8734aaa with merge 62015ef4dcc0ac52021aa06a90686df6af10cedd...

@alexcrichton

alexcrichton commented Jul 13, 2017

Copy link
Copy Markdown
MemberAuthor

@bors: retry

@brsonbrson mentioned this pull request Jul 13, 2017
Closed
cuviperand others added 2 commits July 13, 2017 12:30
@cuviper@alexcrichton
[beta] Remove rls from the workspace and extended builds
b052eed
Its git dependencies don't work when building with vendored crates,
so for now it will just be removed from the workspace and disabled in
the rustbuild rules.
cc rust-lang#42719
@brson@alexcrichton
Bump 1.19 prerelease to .4
a3a9164
@alexcrichton

alexcrichton commented Jul 13, 2017

Copy link
Copy Markdown
MemberAuthor

@bors: r=Mark-Simulacrum

@bors

bors commented Jul 13, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit a3a9164 has been approved by Mark-Simulacrum

@alexcrichtonalexcrichton mentioned this pull request Jul 13, 2017
Closed
@bors

bors commented Jul 13, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit a3a9164 with merge 5f00fdf347c6ed4b62e2eabcc360c299ae6e5c91...

@alexcrichton

alexcrichton commented Jul 13, 2017

Copy link
Copy Markdown
MemberAuthor

@bors: retry

@alexcrichton

alexcrichton commented Jul 13, 2017

Copy link
Copy Markdown
MemberAuthor

I've now folded this all into #43114 (comment)

@alexcrichton
alexcrichton deleted the update-cargo2 branch July 13, 2017 20:32
@brsonbrson mentioned this pull request Jul 14, 2017
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@brsonbrson

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.

6 participants

@alexcrichton@rust-highfive@Mark-Simulacrum@bors@brson@cuviper