Skip to content

[beta] Update cargo on beta. - #47431

Closed
ehuss wants to merge 1 commit into
rust-lang:betafrom
ehuss:beta
Closed

[beta] Update cargo on beta.#47431
ehuss wants to merge 1 commit into
rust-lang:betafrom
ehuss:beta

Conversation

@ehuss

@ehussehuss commented Jan 14, 2018

Copy link
Copy Markdown
Contributor

This brings in rust-lang/cargo#4940 which adds "workspace_root" to cargo metadata so that tools can resolve the new relative paths in symbols and compiler messages.

@rust-highfive

rust-highfive commented Jan 14, 2018

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 @aturon (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.

@eddyb

eddyb commented Jan 15, 2018

Copy link
Copy Markdown
Contributor

r? @alexcrichton

@Mark-Simulacrum

Mark-Simulacrum commented Jan 15, 2018

Copy link
Copy Markdown
Member

So just to clarify, why are we backporting what seems like a simple feature? This seems unusual, and a cursory look didn't find any discussion (feel free to point me at it if it exists).

@Mark-SimulacrumMark-Simulacrum added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 15, 2018
@eddyb

eddyb commented Jan 15, 2018

Copy link
Copy Markdown
Contributor

@Mark-Simulacrum Paths in error messages and whatnot became relative to src, which broke basically everyone's workflow. However, #47280 might already include this, I'm not sure.

@alexcrichton

alexcrichton commented Jan 15, 2018

Copy link
Copy Markdown
Member

@Mark-Simulacrum yes this is a minor new features which brings in a fix for a bug on beta, and should be good to go!

@bors: r+

@bors

bors commented Jan 15, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit d3605ee has been approved by alexcrichton

@alexcrichton

alexcrichton commented Jan 15, 2018

Copy link
Copy Markdown
Member

Thanks @ehuss!

@kennytm

kennytm commented Jan 17, 2018

Copy link
Copy Markdown
Member

@bors p=5

@bors

bors commented Jan 17, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit d3605ee with merge d360d4ff50f16c6808439c7eedc7235981fc5413...

@bors

bors commented Jan 17, 2018

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@alexcrichton

alexcrichton commented Jan 17, 2018

Copy link
Copy Markdown
Member

@bors: retry

Apparently a 30 second timeout isn't always enough...

@bors

bors commented Jan 17, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit d3605ee with merge 0e722254d968c09ad2befc788ed1aaf3242e1ea8...

@bors

bors commented Jan 17, 2018

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@alexcrichton

alexcrichton commented Jan 18, 2018

Copy link
Copy Markdown
Member

@bors: retry

  • osx network issues

@bors

bors commented Jan 18, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit d3605ee with merge 8035321...

bors added a commit that referenced this pull request Jan 18, 2018
@bors
Auto merge of#47431- ehuss:beta, r=alexcrichton
8035321
Update cargo on beta.
This brings in rust-lang/cargo#4940 which adds `"workspace_root"` to `cargo metadata` so that tools can resolve the new relative paths in symbols and compiler messages.
@bors

bors commented Jan 18, 2018

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-appveyor

@alexcrichton

alexcrichton commented Jan 18, 2018

Copy link
Copy Markdown
Member

@bors: retry

@bors

bors commented Jan 18, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit d3605ee with merge 57a43b3d5704afadb5a7f028d329ae950ab54c7a...

@bors

bors commented Jan 18, 2018

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@kennytm

kennytm commented Jan 18, 2018

Copy link
Copy Markdown
Member

@bors retry #47539

@kennytmkennytm mentioned this pull request Jan 18, 2018
Closed
@alexcrichtonalexcrichton changed the title Update cargo on beta.[beta] Update cargo on beta.Jan 18, 2018
@bors

bors commented Jan 18, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit d3605ee with merge a3451b4...

bors added a commit that referenced this pull request Jan 18, 2018
@bors
Auto merge of#47431- ehuss:beta, r=alexcrichton
a3451b4
[beta] Update cargo on beta.
This brings in rust-lang/cargo#4940 which adds `"workspace_root"` to `cargo metadata` so that tools can resolve the new relative paths in symbols and compiler messages.
@bors

bors commented Jan 18, 2018

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-appveyor

@kennytm

kennytm commented Jan 18, 2018

Copy link
Copy Markdown
Member

@bors retry #46903

@alexcrichtonalexcrichton mentioned this pull request Jan 18, 2018
Merged
@alexcrichton

alexcrichton commented Jan 18, 2018

Copy link
Copy Markdown
Member

I'm gonna close in favor of #47553 as the queue's a little backed up, hopefully when we land it we won't have to land much else in beta!

bors added a commit that referenced this pull request Jan 18, 2018
@bors
Auto merge of#47553- alexcrichton:beta-next, r=alexcrichton
1262787
[beta] Rollup + backports
This is a rollup of two PRs:
* #47546
* #47431
and a backport of two PRs:
* #47505
* #47220
@ehuss
ehuss deleted the beta branch May 12, 2018 18:14
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@alexcrichtonalexcrichton

Labels

S-waiting-on-reviewStatus: Awaiting review from the assignee but also interested parties.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@ehuss@rust-highfive@eddyb@Mark-Simulacrum@alexcrichton@bors@kennytm@aturon