Skip to content

Commit

Permalink
Rollup merge of rust-lang#39676 - alexcrichton:fix-again, r=brson
Browse files Browse the repository at this point in the history
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`.
  • Loading branch information
frewsxcv authored Feb 11, 2017
2 parents bf75089 + de59d5d commit 4269e52
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/tools/build-manifest/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,8 @@ impl Builder {
// and wrap it up in a `Value::Table`.
let mut manifest = BTreeMap::new();
manifest.insert("manifest-version".to_string(),
toml::encode(&manifest_version));
manifest.insert("date".to_string(), toml::encode(&date));
toml::Value::String(manifest_version));
manifest.insert("date".to_string(), toml::Value::String(date));
manifest.insert("pkg".to_string(), toml::encode(&pkg));
let manifest = toml::Value::Table(manifest).to_string();

Expand Down

0 comments on commit 4269e52

Please sign in to comment.