Skip to content

Actually fix manifest generation - #39676

Merged
bors merged 1 commit into
rust-lang:masterfrom
alexcrichton:fix-again
Feb 11, 2017
Merged

Actually fix manifest generation#39676
bors merged 1 commit into
rust-lang:masterfrom
alexcrichton:fix-again

Conversation

@alexcrichton

Copy link
Copy Markdown
Member

The previous fix contained an error where toml::encode returned a runtime
error, so this version just constructs a literal toml::Value.

The previous fix contained an error where `toml::encode` returned a runtime
error, so this version just constructs a literal `toml::Value`.
@alexcrichton

Copy link
Copy Markdown
MemberAuthor

r? @brson

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @nikomatsakis

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

@brson

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Feb 11, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit de59d5d has been approved by brson

@alexcrichtonalexcrichton added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 11, 2017
@alexcrichton

Copy link
Copy Markdown
MemberAuthor

Nominating for a beta backport

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Feb 11, 2017
Actually fix manifest generation
The previous fix contained an error where `toml::encode` returned a runtime
error, so this version just constructs a literal `toml::Value`.
@frewsxcvfrewsxcv mentioned this pull request Feb 11, 2017
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Feb 11, 2017
Actually fix manifest generation
The previous fix contained an error where `toml::encode` returned a runtime
error, so this version just constructs a literal `toml::Value`.
@frewsxcvfrewsxcv mentioned this pull request Feb 11, 2017
bors added a commit that referenced this pull request Feb 11, 2017
Rollup of 9 pull requests
- Successful merges: #39174, #39660, #39676, #39692, #39701, #39710, #39721, #39724, #39725
- Failed merges:
@bors
bors merged commit de59d5d into rust-lang:masterFeb 11, 2017
@bors

bors commented Feb 11, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit de59d5d with merge bae454e...

@alexcrichtonalexcrichton added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Feb 11, 2017
@alexcrichton
alexcrichton deleted the fix-again branch February 11, 2017 18:38
@brsonbrson removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 13, 2017
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
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@alexcrichton@rust-highfive@brson@bors@nikomatsakis