Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[beta] Update cargo on beta. #47431

Closed
wants to merge 1 commit into from
Closed

[beta] Update cargo on beta. #47431

wants to merge 1 commit into from

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Jan 14, 2018

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
Copy link
Collaborator

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
Copy link
Member

eddyb commented Jan 15, 2018

r? @alexcrichton

@rust-highfive rust-highfive assigned alexcrichton and unassigned aturon Jan 15, 2018
@Mark-Simulacrum
Copy link
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-Simulacrum Mark-Simulacrum added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 15, 2018
@eddyb
Copy link
Member

eddyb commented Jan 15, 2018

@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
Copy link
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
Copy link
Contributor

bors commented Jan 15, 2018

📌 Commit d3605ee has been approved by alexcrichton

@alexcrichton
Copy link
Member

Thanks @ehuss!

@kennytm
Copy link
Member

kennytm commented Jan 17, 2018

@bors p=5

@bors
Copy link
Contributor

bors commented Jan 17, 2018

⌛ Testing commit d3605ee with merge d360d4ff50f16c6808439c7eedc7235981fc5413...

@bors
Copy link
Contributor

bors commented Jan 17, 2018

💔 Test failed - status-travis

@alexcrichton
Copy link
Member

@bors: retry

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

@bors
Copy link
Contributor

bors commented Jan 17, 2018

⌛ Testing commit d3605ee with merge 0e722254d968c09ad2befc788ed1aaf3242e1ea8...

@bors
Copy link
Contributor

bors commented Jan 17, 2018

💔 Test failed - status-travis

@alexcrichton
Copy link
Member

@bors: retry

  • osx network issues

@bors
Copy link
Contributor

bors commented Jan 18, 2018

⌛ 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
Copy link
Contributor

bors commented Jan 18, 2018

💔 Test failed - status-appveyor

@alexcrichton
Copy link
Member

@bors: retry

@bors
Copy link
Contributor

bors commented Jan 18, 2018

⌛ Testing commit d3605ee with merge 57a43b3d5704afadb5a7f028d329ae950ab54c7a...

@bors
Copy link
Contributor

bors commented Jan 18, 2018

💔 Test failed - status-travis

@kennytm
Copy link
Member

kennytm commented Jan 18, 2018

@bors retry #47539

@kennytm kennytm mentioned this pull request Jan 18, 2018
Closed
@alexcrichton alexcrichton changed the title Update cargo on beta. [beta] Update cargo on beta. Jan 18, 2018
@bors
Copy link
Contributor

bors commented Jan 18, 2018

⌛ 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
Copy link
Contributor

bors commented Jan 18, 2018

💔 Test failed - status-appveyor

@kennytm
Copy link
Member

kennytm commented Jan 18, 2018

@bors retry #46903

@alexcrichton alexcrichton mentioned this pull request Jan 18, 2018
Merged
@alexcrichton
Copy link
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 free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@alexcrichton alexcrichton

Labels
S-waiting-on-review Status: 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