Skip to content

[beta] Another round of backporting PRs to beta#39750

Merged
bors merged 5 commits into
rust-lang:betafrom
alexcrichton:beta-next
Feb 16, 2017
Merged

[beta] Another round of backporting PRs to beta#39750
bors merged 5 commits into
rust-lang:betafrom
alexcrichton:beta-next

Conversation

@alexcrichton

Copy link
Copy Markdown
Member

Prevents stale artifacts from sticking around by accident!
The current manifests encode this with a dash in the name, so we should preserve
that!
Right now we just run `shasum` on an absolute path but right now the shasum
files only include filenames, so let's use `current_dir` and just the file name
to only have the file name emitted.
The previous fix contained an error where `toml::encode` returned a runtime
error, so this version just constructs a literal `toml::Value`.
@rust-highfive

Copy link
Copy Markdown
Contributor

r? @brson

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

@rust-highfive

Copy link
Copy Markdown
Contributor

warning Warning 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!

@brson

brson commented Feb 13, 2017

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Feb 13, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 78c2148 has been approved by brson

@alexcrichton

alexcrichton commented Feb 14, 2017

Copy link
Copy Markdown
Member Author

@bors: r=brson

(adding a beta version bump to this PR)

@bors

bors commented Feb 14, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit f51adf9 has been approved by brson

1 similar comment
@bors

bors commented Feb 14, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit f51adf9 has been approved by brson

@bors

bors commented Feb 15, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit f51adf9 with merge a04cc9a...

@bors

bors commented Feb 15, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@alexcrichton

Copy link
Copy Markdown
Member Author

@bors: retry

@alexcrichton

alexcrichton commented Feb 15, 2017 via email

Copy link
Copy Markdown
Member Author

@bors

bors commented Feb 15, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit f51adf9 with merge 8e248d0...

@bors

bors commented Feb 15, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@alexcrichton

alexcrichton commented Feb 15, 2017 via email

Copy link
Copy Markdown
Member Author

@bors

bors commented Feb 16, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit f51adf9 with merge bc15d52...

bors added a commit that referenced this pull request Feb 16, 2017
[beta] Another round of backporting PRs to beta

This is a backport of the following PRs:

* #39622
* #39630
* #39660
* #39676
@bors

bors commented Feb 16, 2017

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: brson
Pushing bc15d52 to beta...

@bors bors merged commit f51adf9 into rust-lang:beta Feb 16, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants