Skip to content

Actually fix manifest generation #39676

New issue

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

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

Already on GitHub? # to your account

Merged
merged 1 commit into from
Feb 11, 2017
Merged

Conversation

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

r? @brson

@rust-highfive
Copy link
Contributor

r? @nikomatsakis

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

@rust-highfive rust-highfive assigned brson and unassigned nikomatsakis Feb 9, 2017
@brson
Copy link
Contributor

brson commented Feb 11, 2017

@bors r+

@bors
Copy link
Collaborator

bors commented Feb 11, 2017

📌 Commit de59d5d has been approved by brson

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

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`.
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`.
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:master Feb 11, 2017
@bors
Copy link
Collaborator

bors commented Feb 11, 2017

⌛ Testing commit de59d5d with merge bae454e...

@alexcrichton alexcrichton 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
@brson brson 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
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants